diff --git a/RookieStation/CommonTools/View/WpfFamilyDockablePane.xaml b/RookieStation/CommonTools/View/WpfFamilyDockablePane.xaml
index 3684836..9cbc169 100644
--- a/RookieStation/CommonTools/View/WpfFamilyDockablePane.xaml
+++ b/RookieStation/CommonTools/View/WpfFamilyDockablePane.xaml
@@ -32,8 +32,8 @@
diff --git a/RookieStation/Drawing/ExecuteCmd/CmdAutoCreateLegend.cs b/RookieStation/Drawing/ExecuteCmd/CmdAutoCreateLegend.cs
index 65cc285..5cb1aaa 100644
--- a/RookieStation/Drawing/ExecuteCmd/CmdAutoCreateLegend.cs
+++ b/RookieStation/Drawing/ExecuteCmd/CmdAutoCreateLegend.cs
@@ -4,6 +4,7 @@ using Autodesk.Revit.UI;
using Autodesk.Revit.UI.Selection;
using RookieStation.Drawing.Model;
using RookieStation.Extension;
+using RookieStation.ProjectConfig;
using RookieStation.Utils;
using System;
using System.Collections.Generic;
@@ -68,10 +69,11 @@ namespace RookieStation.Drawing.ExecuteCmd
{
ShelfType = instance.Name,
Count = group.Count(),
- GroundArea = Math.Round(area, 2)
+ GroundArea = Math.Round(area, 2),
+ DesignOrders = UserConstant.Orders
};
shelfStatistic.LinearMetre = shelfStatistic.Count * l;
- shelfStatistic.Orders = shelfStatistic.Count * 80;
+ shelfStatistic.CapacityOrders = shelfStatistic.Count * 80;
statistics.Add(shelfStatistic);
}
return statistics;
@@ -97,7 +99,7 @@ namespace RookieStation.Drawing.ExecuteCmd
{
try
{
- newLegend.Name = string.Format("{0}{1}", "货架说明 ", i);
+ newLegend.Name = string.Format("货架说明 {0}", i);
break;
}
catch (Exception)
@@ -109,7 +111,7 @@ namespace RookieStation.Drawing.ExecuteCmd
newLegend.Scale = scale;
});
- var textNoteType = new FilteredElementCollector(doc).OfClass(typeof(TextNoteType)).Where(x => x.Name.Contains("宋")).FirstOrDefault() as TextNoteType;
+ TextNoteType textNoteType = new FilteredElementCollector(doc).OfClass(typeof(TextNoteType)).Where(x => x.Name.Contains("宋")).FirstOrDefault() as TextNoteType;
double fontSize = textNoteType.get_Parameter(BuiltInParameter.TEXT_SIZE).AsDouble();
double actualTextHeight = fontSize * 1.6;
double legendTextHeight = actualTextHeight * scale * 1.2;
@@ -119,10 +121,10 @@ namespace RookieStation.Drawing.ExecuteCmd
CurveArray curveArray = new CurveArray();
for (int i = 0; i < statistics.Count() + 2; i++)
{
- Curve line = Line.CreateBound(XYZ.Zero, XYZ.BasisX * legendTextLength * 5).CreateOffset(legendTextHeight * i, -XYZ.BasisZ);
+ Curve line = Line.CreateBound(XYZ.Zero, XYZ.BasisX * legendTextLength * 6).CreateOffset(legendTextHeight * i, -XYZ.BasisZ);
curveArray.Append(line);
}
- for (int i = 0; i < 6; i++)
+ for (int i = 0; i < 7; i++)
{
Curve line = Line.CreateBound(XYZ.Zero, XYZ.BasisY * (statistics.Count() + 1) * legendTextHeight).CreateOffset(legendTextLength * i, XYZ.BasisZ);
curveArray.Append(line);
@@ -137,8 +139,9 @@ namespace RookieStation.Drawing.ExecuteCmd
TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength + 0.5) + yElevation, statistics[i].Count.ToString(), opts);
TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength * 2 + 0.5) + yElevation,
statistics[i].LinearMetre.ToString(), opts);
- TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength * 3 + 0.5) + yElevation, statistics[i].Orders.ToString(), opts);
- TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength * 4 + 0.5) + yElevation, statistics[i].GroundArea.ToString(), opts);
+ TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength * 3 + 0.5) + yElevation, statistics[i].CapacityOrders.ToString(), opts);
+ TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength * 4 + 0.5) + yElevation, statistics[i].DesignOrders.ToString(), opts);
+ TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength * 5 + 0.5) + yElevation, statistics[i].GroundArea.ToString(), opts);
}
else
{
@@ -146,7 +149,8 @@ namespace RookieStation.Drawing.ExecuteCmd
TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength + 0.5) + yElevation, "数量", opts);
TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength * 2 + 0.5) + yElevation, "总延米", opts);
TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength * 3 + 0.5) + yElevation, "总承载单量", opts);
- TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength * 4 + 0.5) + yElevation, "场地面积", opts);
+ TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength * 4 + 0.5) + yElevation, "设计单量", opts);
+ TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (legendTextLength * 5 + 0.5) + yElevation, "场地面积", opts);
}
}
doc.Create.NewDetailCurveArray(newLegend, curveArray);
diff --git a/RookieStation/Drawing/ExecuteCmd/CmdCreateViewPlanAnnotation.cs b/RookieStation/Drawing/ExecuteCmd/CmdCreateViewPlanAnnotation.cs
index ceff0ce..be673a3 100644
--- a/RookieStation/Drawing/ExecuteCmd/CmdCreateViewPlanAnnotation.cs
+++ b/RookieStation/Drawing/ExecuteCmd/CmdCreateViewPlanAnnotation.cs
@@ -455,7 +455,6 @@ namespace RookieStation.Drawing.ExecuteCmd
FilteredElementCollector wallCol = doc.QueryByView(doc.ActiveView as ViewPlan);
FilteredElementCollector instanceCol = doc.QueryByView(doc.ActiveView);
var visableIdCol = doc.QueryByView(doc.ActiveView).ToElementIds();
- StringBuilder sb = new StringBuilder();
doc.Invoke(ts =>
{
@@ -509,6 +508,10 @@ namespace RookieStation.Drawing.ExecuteCmd
}
if (pf.FaceNormal.CrossProduct(wall.Orientation).IsAlmostEqualTo(XYZ.Zero))
{
+ if (face.Reference == null)
+ {
+ continue;
+ }
if (doc.GetElement(face.Reference).GetType() == typeof(Wall))
{
wallThickReferenceArray.Append(face.Reference);
@@ -525,26 +528,35 @@ namespace RookieStation.Drawing.ExecuteCmd
}
try
{
- var tranform = Transform.CreateTranslation(wall.Orientation * 800 / 304.8);
+ var scale = doc.ActiveView.Scale;
+ var tranform = Transform.CreateTranslation(wall.Orientation * scale * 5 / 304.8);
var wallcurve = RsRevitUtils.GetLocationCurveByElement(wall) as Line;
- Line thickLine = Line.CreateUnbound(wallcurve.Evaluate(0.5, true), wall.Orientation);
Line lengthLine = wallcurve.CreateTransformed(tranform) as Line;
+ var lengthdim = doc.Create.NewDimension(doc.ActiveView, lengthLine, wallLengthRefernceArray);
+
+ Line thickLine = Line.CreateUnbound(wallcurve.Evaluate(0.5, true), wall.Orientation);
//Line lengthLine = wallcurve.CreateOffset(500 / 304.8, -XYZ.BasisZ) as Line;
- doc.Create.NewDimension(doc.ActiveView, thickLine, wallThickReferenceArray);
- doc.Create.NewDimension(doc.ActiveView, lengthLine, wallLengthRefernceArray);
+ var thickdim = doc.Create.NewDimension(doc.ActiveView, thickLine, wallThickReferenceArray);
+ doc.Regenerate();
+ if (lengthdim.Segments.Size > 2)
+ {
+ ReferenceArray referenceArray = new ReferenceArray();
+ var refer1 = lengthdim.References.get_Item(0);
+ var refer2 = lengthdim.References.get_Item(lengthdim.References.Size - 1);
+ referenceArray.Append(refer1);
+ referenceArray.Append(refer2);
+ var tranform1 = Transform.CreateTranslation(wall.Orientation * scale * 10 / 304.8);
+ Line lengthLine1 = wallcurve.CreateTransformed(tranform1) as Line;
+
+ doc.Create.NewDimension(doc.ActiveView, lengthLine1, referenceArray);
+ }
}
- catch (Exception ex)
+ catch (Exception)
{
- sb.Append(ex.Message + wall.Id + "\r\n");
continue;
}
}
});
-
- if (sb.Length != 0)
- {
- TaskDialog.Show("失败", sb.ToString());
- }
}
public PlanarFace GetWallSideFace(Wall wall, ShellLayerType slt)
diff --git a/RookieStation/Drawing/Model/ShelfStatistic.cs b/RookieStation/Drawing/Model/ShelfStatistic.cs
index 99c77f5..aa2ccf7 100644
--- a/RookieStation/Drawing/Model/ShelfStatistic.cs
+++ b/RookieStation/Drawing/Model/ShelfStatistic.cs
@@ -11,8 +11,8 @@ namespace RookieStation.Drawing.Model
public int Count { get; set; }
public double LinearMetre { get; set; }
public string ShelfType { get; set; }
-
- public int Orders { get; set; }
+ public int CapacityOrders { get; set; }
+ public int DesignOrders { get; set; }
public double GroundArea { get; set; }
}
}
\ No newline at end of file
diff --git a/RookieStation/Finishes/ExecuteCmd/CmdPlaceFloorFinishes.cs b/RookieStation/Finishes/ExecuteCmd/CmdPlaceFloorFinishes.cs
index aa1f6ee..65c7ef3 100644
--- a/RookieStation/Finishes/ExecuteCmd/CmdPlaceFloorFinishes.cs
+++ b/RookieStation/Finishes/ExecuteCmd/CmdPlaceFloorFinishes.cs
@@ -166,9 +166,9 @@ namespace RookieStation.Finishes.ExecuteCmd
PanelType panelType = null;
MullionType mullionType = null;
- string cutainSystemTypeName = String.Format("{0}{1}{2}{3}", length, " x ", width, "mm");
+ string cutainSystemTypeName = String.Format("{0} x {1}mm", length, width);
string panelTypeName = "铺贴";
- string mullionTypeName = String.Format("{0}{1}{2}{3}", gap, " x ", thickness, "mm");
+ string mullionTypeName = String.Format("{0} x {1}mm", gap, thickness);
doc.Invoke(ts =>
{
diff --git a/RookieStation/Finishes/View/WpfWallFinishes.xaml b/RookieStation/Finishes/View/WpfWallFinishes.xaml
index 14d0acd..86ec01b 100644
--- a/RookieStation/Finishes/View/WpfWallFinishes.xaml
+++ b/RookieStation/Finishes/View/WpfWallFinishes.xaml
@@ -4,7 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
- xmlns:local="clr-namespace:RookieStation"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Width="351"
Height="116"
diff --git a/RookieStation/MailingAreaModule/ExecuteCmd/CmdPlaceReceptionArea.cs b/RookieStation/MailingAreaModule/ExecuteCmd/CmdPlaceReceptionArea.cs
index e1826e4..e7bde3f 100644
--- a/RookieStation/MailingAreaModule/ExecuteCmd/CmdPlaceReceptionArea.cs
+++ b/RookieStation/MailingAreaModule/ExecuteCmd/CmdPlaceReceptionArea.cs
@@ -96,6 +96,11 @@ namespace RookieStation.MailingAreaModule.ExecuteCmd
try
{
FamilySymbol guideSymbol = RsRevitUtils.GetGuideSymbol(doc);
+ if (guideSymbol == null)
+ {
+ TaskDialog.Show("错误", "定位族丢失");
+ return Result.Failed;
+ }
eleIdsAdded.Clear();
uiapp.Application.DocumentChanged += Application_DocumentChanged;
uidoc.PromptForFamilyInstancePlacement(guideSymbol);
diff --git a/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceEntranceGate.cs b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceEntranceGate.cs
index dd7dd8d..3f236b0 100644
--- a/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceEntranceGate.cs
+++ b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceEntranceGate.cs
@@ -46,6 +46,11 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmd
try
{
FamilySymbol guideSymbol = RsRevitUtils.GetGuideSymbol(doc);
+ if (guideSymbol == null)
+ {
+ TaskDialog.Show("错误", "定位族丢失");
+ return Result.Failed;
+ }
eleIdsAdded.Clear();
uiapp.Application.DocumentChanged += Application_DocumentChanged;
uidoc.PromptForFamilyInstancePlacement(guideSymbol);
diff --git a/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceExitGate.cs b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceExitGate.cs
index d18ec8d..f7a079d 100644
--- a/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceExitGate.cs
+++ b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceExitGate.cs
@@ -62,7 +62,11 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmd
try
{
FamilySymbol guideSymbol = RsRevitUtils.GetGuideSymbol(doc); ;
-
+ if (guideSymbol == null)
+ {
+ TaskDialog.Show("错误", "定位族丢失");
+ return Result.Failed;
+ }
eleIdsAdded.Clear();
uiapp.Application.DocumentChanged += Application_DocumentChanged;
uidoc.PromptForFamilyInstancePlacement(guideSymbol);
diff --git a/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceLamps.cs b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceLamps.cs
index 1dae8e5..3c5c6d0 100644
--- a/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceLamps.cs
+++ b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceLamps.cs
@@ -191,7 +191,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmd
{
//删除模型线
doc.Delete(modelCurveIds);
- family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Lamp\\成品吊灯.rfa");
+ family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Lamp\\筒灯.rfa");
ElementId symbolId = family.GetFamilySymbolIds().FirstOrDefault();
symbol = doc.GetElement(symbolId) as FamilySymbol;
symbol.Activate();
diff --git a/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceShelves.cs b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceShelves.cs
index 6c156c9..2395d21 100644
--- a/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceShelves.cs
+++ b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceShelves.cs
@@ -9,6 +9,8 @@ using System.Collections.ObjectModel;
using System.Linq;
using RookieStation.ParcelAreaModule.Model;
using RookieStation.ParcelAreaModule.View;
+using Autodesk.Revit.DB.Electrical;
+using Autodesk.Revit.Creation;
namespace RookieStation.ParcelAreaModule.ExecuteCmd
{
@@ -17,7 +19,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmd
internal class CmdPlaceShelves : IExternalCommand
{
///
- /// 当前编号
+ /// 编号
///
private int currentnum = 1;
@@ -40,7 +42,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmd
{
UIApplication uiapp = commandData.Application;
UIDocument uidoc = uiapp.ActiveUIDocument;
- Document doc = uidoc.Document;
+ Autodesk.Revit.DB.Document doc = uidoc.Document;
revitWindow = uiapp.MainWindowHandle;
WpfShelvesLayout placement = CommonUtils.GenerateWindow();
@@ -50,306 +52,179 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmd
}
ShelvesPlacementViewModel vm = placement.vm;
ObservableCollection shelves = vm.Data;
-
Level level = uidoc.ActiveView.GenLevel;
if (level == null)
{
return Result.Failed;
}
- return doc.InvokeGroup(tg =>
+ return doc.InvokeGroup(tg =>
{
try
{
//定位线
- FamilySymbol guide_Symbol = RsRevitUtils.GetGuideSymbol(doc);
-
+ FamilySymbol guideSymbol = RsRevitUtils.GetGuideSymbol(doc);
+ if (guideSymbol == null)
+ {
+ TaskDialog.Show("错误", "定位族丢失");
+ return Result.Failed;
+ }
eleIdsAdded.Clear();
uiapp.Application.DocumentChanged += Application_DocumentChanged;
- uidoc.PromptForFamilyInstancePlacement(guide_Symbol);
+ uidoc.PromptForFamilyInstancePlacement(guideSymbol);
uiapp.Application.DocumentChanged -= Application_DocumentChanged;
}
catch (Autodesk.Revit.Exceptions.OperationCanceledException)
{
if (eleIdsAdded.Count == 0)
{
- return Result.Cancelled;
+ return Result.Failed;
}
Line referline = RsRevitUtils.GetGuideGeometryAndDeleteGuide(doc, eleIdsAdded);
uiapp.Application.DocumentChanged -= Application_DocumentChanged;
- //始终位于左侧,Z轴朝上
- var zAxis = XYZ.BasisZ;
+
Family shelfFamily = null;
FamilySymbol shelfSymbol = null;
double shelfSpacing = vm.ShelfSpacing / 304.8;
//通道宽度
double passageWidth = vm.PassageWidth / 304.8;
+ //参考线起点平行于参考线的偏移量
double parallelReferlineOffest = vm.ParallelReferlineOffest / 304.8;
+ //参考线起点垂直于参考线的偏移量
double verticalReferlineOffest = vm.VerticalReferlineOffest / 304.8;
+ shelfFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Shelf\\单联货架.rfa");
for (int i = 0; i < shelves.Count; i++)
{
- //List all_points = new List();
- List firstRowPoints = new List();
Shelf shelf = shelves[i];
double shelfWidth = shelf.Width / 304.8;
- double lineParameter = 0.0;
- int n = 100;//循环次数
- XYZ pointOnReferline = XYZ.Zero;
-
- if (parallelReferlineOffest < 0.001)//起点无间距
- {
- for (int j = 0; j < n; j++)
- {
- if (!referline.IsInside((lineParameter + shelfWidth)))
- {
- break;
- }
-
- if (j % 2 == 0)
- {
- pointOnReferline = referline.Evaluate(lineParameter, false);
- lineParameter += shelfSpacing + shelfWidth;
- }
- else
- {
- pointOnReferline = referline.Evaluate(lineParameter, false);
- lineParameter += shelfWidth;
- }
-
- firstRowPoints.Add(pointOnReferline);
- }
- }
- else//起点有距离
- {
- lineParameter = parallelReferlineOffest;
-
- for (int j = 0; j < n; j++)
- {
- if (!referline.IsInside(lineParameter + shelfWidth))
- {
- break;
- }
- if (j % 2 == 0)
- {
- pointOnReferline = referline.Evaluate(lineParameter, false);
- lineParameter += shelfWidth;
- }
- else
- {
- pointOnReferline = referline.Evaluate(lineParameter, false);
- lineParameter += shelfSpacing + shelfWidth;
- }
-
- firstRowPoints.Add(pointOnReferline);
- }
- }
+ List referlinePoints = GetReferlineShelfSplitPoints(referline, shelfSpacing, parallelReferlineOffest, shelfWidth);
double l = shelf.Length / 304.8;
- XYZ normalVerticalOffestVector = zAxis.CrossProduct(referline.Direction).Normalize();
- List instances = new List();
-
+ shelfSymbol = GetShelfSymbol(doc, shelfFamily, shelfSymbol, shelf);
+ //偏移单位向量
+ XYZ direction = XYZ.BasisZ.CrossProduct(referline.Direction).Normalize();
+ List ShelfInstances = new List();
XYZ finalPoint = XYZ.Zero;
- doc.Invoke(ts =>
- {
- shelfFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Shelf\\单联货架.rfa");
- var shelfSymbolIds = shelfFamily.GetFamilySymbolIds();
- foreach (var id in shelfSymbolIds)
- {
- FamilySymbol tempSymbol = doc.GetElement(id) as FamilySymbol;
- if (tempSymbol.Name == shelf.SymbolName)
- {
- shelfSymbol = tempSymbol;
- break;
- }
- }
- shelfSymbol.Activate();
- }, "加载货架，激活类型");
-
switch (shelf.NumOfGroup)
{
case NumOfGroup.Single:
- for (int j = 0; j < firstRowPoints.Count; j++)
+ for (int j = 0; j < referlinePoints.Count; j++)
{
- XYZ tempPoint = firstRowPoints[j];
- XYZ offestVector = normalVerticalOffestVector * (verticalReferlineOffest + l / 2);
+ XYZ offestVector = direction * (verticalReferlineOffest + l / 2);
//垂直基准线平移 平行基准线平移
- finalPoint = tempPoint + offestVector + referline.Direction * shelfWidth / 2;
+ finalPoint = referlinePoints[j] + offestVector + referline.Direction * shelfWidth / 2;
//附加通道和（单联、多联）货架长度的偏移
if (i > 0)
{
- double totalLength = GetTotalLength(shelves, i);
+ double totalLength = GetTotalFrontShelvesLength(shelves, i);
//附加排在前面通道和所有货架的长度
- XYZ additional_dir = normalVerticalOffestVector * (i * passageWidth + totalLength);
- finalPoint += additional_dir;
+ XYZ additionalVector = direction * (i * passageWidth + totalLength);
+ finalPoint += additionalVector;
}
FamilyInstance instance = null;
- //all_points.Add(final_point);
doc.Invoke(ts =>
{
instance = doc.Create.NewFamilyInstance(finalPoint, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural);
- instances.Add(instance);
+ ShelfInstances.Add(instance);
}, "创建货架");
-
- //位于直线右侧时，需要进行左右翻转
- doc.Invoke(ts =>
- {
- if (parallelReferlineOffest < 0.001)
- {
- if (j % 2 != 0 && instance.CanFlipHand)
- {
- instance.flipHand();
- }
- }
- else
- {
- if (j % 2 == 0 && instance.CanFlipHand)
- {
- instance.flipHand();
- }
- }
- }, "翻转货架");
+ FlipHandShelfInstance(doc, parallelReferlineOffest, j, instance);
}
break;
case NumOfGroup.Double:
- for (int j = 0; j < firstRowPoints.Count; j++)
+ for (int j = 0; j < referlinePoints.Count; j++)
{
- XYZ tempPoint = firstRowPoints[j];
+ XYZ tempPoint = referlinePoints[j];
//偏移距离
- XYZ offestVector = normalVerticalOffestVector * (verticalReferlineOffest + l);
+ XYZ offestVector = direction * (verticalReferlineOffest + l);
//基础偏移距离，移动半个长度到直线的一侧，垂直基准线平移 平行基准线平移
finalPoint = tempPoint + offestVector + referline.Direction * shelfWidth / 2;
//附加通道和（单联、多联）货架长度的偏移
if (i > 0)
{
- double totallength = GetTotalLength(shelves, i);
+ double totallength = GetTotalFrontShelvesLength(shelves, i);
- XYZ additionaldir = normalVerticalOffestVector * (i * passageWidth + totallength);
+ XYZ additionaldir = direction * (i * passageWidth + totallength);
finalPoint += additionaldir;
}
FamilyInstance endInstance = null;
FamilyInstance startInstance = null;
doc.Invoke(ts =>
{
- endInstance = doc.Create.NewFamilyInstance(finalPoint + l / 2 * normalVerticalOffestVector, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural);
+ endInstance = doc.Create.NewFamilyInstance(finalPoint + l / 2 * direction, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural);
- startInstance = doc.Create.NewFamilyInstance(finalPoint - l / 2 * normalVerticalOffestVector, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural);
+ startInstance = doc.Create.NewFamilyInstance(finalPoint - l / 2 * direction, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural);
- instances.Add(startInstance);
+ ShelfInstances.Add(startInstance);
- instances.Add(endInstance);
+ ShelfInstances.Add(endInstance);
}, "创建货架");
- doc.Invoke(ts =>
- {
- if (parallelReferlineOffest < 0.001)
- {
- if (j % 2 != 0 && startInstance.CanFlipHand && endInstance.CanFlipHand)
- {
- startInstance.flipHand();
- endInstance.flipHand();
- }
- }
- else
- {
- if (j % 2 == 0 && startInstance.CanFlipHand && endInstance.CanFlipHand)
- {
- startInstance.flipHand();
- endInstance.flipHand();
- }
- }
- }, "翻转货架");
-
- //all_points.Add(final_point + l / 2 * normal_vertical_offest_vector);
- //all_points.Add(final_point - l / 2 * normal_vertical_offest_vector);
+ FlipHandShelfInstance(doc, parallelReferlineOffest, j, startInstance, endInstance);
}
break;
case NumOfGroup.Three:
- for (int j = 0; j < firstRowPoints.Count; j++)
+ for (int j = 0; j < referlinePoints.Count; j++)
{
- XYZ tempPoint = firstRowPoints[j];
- XYZ offestVector = normalVerticalOffestVector * (verticalReferlineOffest + l * 3 / 2);
+ XYZ tempPoint = referlinePoints[j];
+ XYZ offestVector = direction * (verticalReferlineOffest + l * 3 / 2);
//垂直基准线平移 平行基准线平移
finalPoint = tempPoint + offestVector + referline.Direction * shelfWidth / 2;
//附加通道和（单联、多联）货架长度的偏移
if (i > 0)
{
- double totallength = GetTotalLength(shelves, i);
- XYZ additionaldir = normalVerticalOffestVector * (i * passageWidth + totallength);
+ double totallength = GetTotalFrontShelvesLength(shelves, i);
+ XYZ additionaldir = direction * (i * passageWidth + totallength);
finalPoint += additionaldir;
}
- FamilyInstance end_instance = null;
- FamilyInstance center_instance = null;
- FamilyInstance start_instance = null;
+ FamilyInstance endInstance = null;
+ FamilyInstance centerInstance = null;
+ FamilyInstance startInstance = null;
doc.Invoke(ts =>
{
- center_instance = doc.Create.NewFamilyInstance(finalPoint, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural);
- end_instance = doc.Create.NewFamilyInstance(finalPoint + l * normalVerticalOffestVector, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural);
- start_instance = doc.Create.NewFamilyInstance(finalPoint - l * normalVerticalOffestVector, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural);
- instances.Add(center_instance);
- instances.Add(end_instance);
- instances.Add(start_instance);
+ centerInstance = doc.Create.NewFamilyInstance(finalPoint, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural);
+ endInstance = doc.Create.NewFamilyInstance(finalPoint + l * direction, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural);
+ startInstance = doc.Create.NewFamilyInstance(finalPoint - l * direction, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural);
+ ShelfInstances.Add(centerInstance);
+ ShelfInstances.Add(endInstance);
+ ShelfInstances.Add(startInstance);
}, "创建货架");
- doc.Invoke(ts =>
- {
- if (parallelReferlineOffest < 0.001)
- {
- if (j % 2 != 0 && start_instance.CanFlipHand && center_instance.CanFlipHand && end_instance.CanFlipHand)
- {
- start_instance.flipHand();
- center_instance.flipHand();
- end_instance.flipHand();
- }
- }
- else
- {
- if (j % 2 == 0 && start_instance.CanFlipHand && center_instance.CanFlipHand && end_instance.CanFlipHand)
- {
- start_instance.flipHand();
- center_instance.flipHand();
- end_instance.flipHand();
- }
- }
- }, "翻转货架");
+ FlipHandShelfInstance(doc, parallelReferlineOffest, j, startInstance, centerInstance, endInstance);
}
break;
default:
break;
}
-
- List card_instances = new List();
-
doc.Invoke(ts =>
{
- XYZ veroffestdir = zAxis.CrossProduct(referline.Direction).Normalize();
- //旋转角度
- double angle = XYZ.BasisY.AngleTo(veroffestdir);
- //判断相对于Y轴是正向角度（逆时针）还是逆向角度（顺时针）
- var z = veroffestdir.CrossProduct(XYZ.BasisY).Normalize();
- if (z.IsAlmostEqualTo(XYZ.BasisZ))
+ for (int j = 0; j < ShelfInstances.Count; j++)
{
- //逆向旋转，角度取负值
- angle = -angle;
- }
-
- for (int j = 0; j < instances.Count; j++)
- {
- FamilyInstance instance = instances[j];
- var location_XYZ = RsRevitUtils.GetLocationPointByElement(instance);
-
- Line zline = Line.CreateUnbound(location_XYZ, XYZ.BasisZ);
- //旋转，移动
- ElementTransformUtils.RotateElement(doc, instance.Id, zline, angle);
- //旋转后的
- var hand_orientationd = instance.HandOrientation;
- //货架左右切换时
- if (instance.HandFlipped)
+ XYZ veroffestdir = XYZ.BasisZ.CrossProduct(referline.Direction).Normalize();
+ //旋转角度
+ double angle = XYZ.BasisY.AngleTo(veroffestdir);
+ //判断相对于Y轴是正向角度（逆时针）还是逆向角度（顺时针）
+ var z = veroffestdir.CrossProduct(XYZ.BasisY).Normalize();
+ if (z.IsAlmostEqualTo(XYZ.BasisZ))
{
- hand_orientationd = -hand_orientationd;
+ //逆向旋转，角度取负值
+ angle = -angle;
+ }
+ FamilyInstance shelfInstance = ShelfInstances[j];
+ var loc = RsRevitUtils.GetLocationPointByElement(shelfInstance);
+
+ Line zline = Line.CreateUnbound(loc, XYZ.BasisZ);
+ //旋转，移动
+ ElementTransformUtils.RotateElement(doc, shelfInstance.Id, zline, angle);
+ //旋转后的
+ var handOrientationd = shelfInstance.HandOrientation;
+ //货架左右切换时
+ if (shelfInstance.HandFlipped)
+ {
+ handOrientationd = -handOrientationd;
}
////垂直基准线平移
//ElementTransformUtils.MoveElement(doc, fi.Id, offestdir);
@@ -361,113 +236,473 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmd
// XYZ additionaldir = zdir.CrossProduct(line.Direction).Normalize() * i * (passagewidth + l);
// ElementTransformUtils.MoveElement(doc, fi.Id, additionaldir);
//}
-
- #region 布置端牌
-
- FamilyInstance front_instance = null;
-
- Reference front_face = instance.GetReferences(FamilyInstanceReferenceType.Front).FirstOrDefault();
- PlaceCard(doc, location_XYZ, instance, hand_orientationd, front_face, out front_instance);
- if (front_instance.CanFlipWorkPlane)
- {
- front_instance.IsWorkPlaneFlipped = true;
- }
- card_instances.Add(front_instance);
-
- FamilyInstance back_instance = null;
-
- Reference back_face = instance.GetReferences(FamilyInstanceReferenceType.Back).FirstOrDefault();
-
- PlaceCard(doc, location_XYZ, instance, -hand_orientationd, back_face, out back_instance);
- card_instances.Add(back_instance);
- switch (shelf.NumOfGroup)
- {
- case NumOfGroup.Single:
-
- front_instance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}", currentnum));
- back_instance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}", currentnum));
- currentnum += 1;
- break;
-
- case NumOfGroup.Double:
- //根据组合加上组合数
- if (j % 2 == 0 && j != 0)
- {
- currentnum += 2;
- }
- front_instance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}{1}{2}", currentnum, "~", currentnum + 1));
- back_instance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}{1}{2}", currentnum, "~", currentnum + 1));
- //最后一个需要加上组合数作为下一列的开始
- if (j == instances.Count - 1)
- {
- currentnum += 2;
- }
- break;
-
- case NumOfGroup.Three:
- //根据组合加上组合数
- if (j % 3 == 0 && j != 0)
- {
- currentnum += 3;
- }
- front_instance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}{1}{2}", currentnum, "~", currentnum + 2));
- back_instance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}{1}{2}", currentnum, "~", currentnum + 2));
- //最后一个需要加上组合数作为下一列的开始
- if (j == instances.Count - 1)
- {
- currentnum += 3;
- }
- break;
-
- default:
- break;
- }
-
- #endregion 布置端牌
-
- //Reference backface = fi.GetReferences(FamilyInstanceReferenceType.Back).FirstOrDefault();
- //if (a.Contains("606:SURFACE"))
- //{
- // hand = -fi.HandOrientation;
- //}
}
- }, "调整货架角度及布置端牌");
-
- DeleteCards(doc, card_instances);
+ }, "调整货架位置");
+ if (vm.IsPlaceShelfCards == true)
+ {
+ var cardInstances = CreateAndNumberCards(doc, referline, shelf, ShelfInstances);
+ DeleteOverlapCards(doc, cardInstances);
+ }
+ }
+ if (vm.IsPlaceCableTray == true)
+ {
+ CreateCableTrays(doc, vm, referline, shelfSpacing, passageWidth, parallelReferlineOffest);
+ }
+ if (vm.IsPlaceLight == true)
+ {
+ CreateLights(doc, vm, referline, shelfSpacing, passageWidth, parallelReferlineOffest);
}
}
return Result.Succeeded;
- }, "布置货架及端牌");
+ }, "取件区布置");
+ }
+
+ private static void FlipHandShelfInstance(Autodesk.Revit.DB.Document doc, double parallelReferlineOffest, int i, params FamilyInstance[] familyInstances)
+ {
+ doc.Invoke(ts =>
+ {
+ if (parallelReferlineOffest < 0.001)//起始水平偏移量为0时
+ {
+ if (i % 2 != 0)
+ {
+ for (int j = 0; j < familyInstances.Count(); j++)
+ {
+ if (familyInstances[j].CanFlipHand)
+ {
+ familyInstances[j].flipHand();
+ }
+ }
+ }
+ }
+ else
+ {
+ if (i % 2 == 0)
+ {
+ for (int j = 0; j < familyInstances.Count(); j++)
+ {
+ if (familyInstances[j].CanFlipHand)
+ {
+ familyInstances[j].flipHand();
+ }
+ }
+ }
+ }
+ }, "翻转货架");
+ }
+
+ private static FamilySymbol GetShelfSymbol(Autodesk.Revit.DB.Document doc, Family shelfFamily, FamilySymbol shelfSymbol, Shelf shelf)
+ {
+ doc.Invoke(ts =>
+ {
+ if (shelfFamily != null)
+ {
+ var shelfSymbolIds = shelfFamily.GetFamilySymbolIds();
+ foreach (var id in shelfSymbolIds)
+ {
+ FamilySymbol tempSymbol = doc.GetElement(id) as FamilySymbol;
+ if (tempSymbol.Name == shelf.SymbolName)
+ {
+ shelfSymbol = tempSymbol;
+ break;
+ }
+ }
+ if (!shelfSymbol.IsActive)
+ {
+ shelfSymbol.Activate();
+ }
+ }
+ }, "加载货架，激活类型");
+ return shelfSymbol;
+ }
+
+ private void CreateCableTrays(Autodesk.Revit.DB.Document doc, ShelvesPlacementViewModel vm, Line referline, double shelfSpacing, double passageWidth, double parallelReferlineOffest)
+ {
+ Level level = doc.ActiveView.GenLevel;
+ List cts = new List();
+ ObservableCollection shelves = vm.Data;
+ var referlinePoints = GetReferlineCableTrayStartPoint(referline, shelfSpacing, parallelReferlineOffest, shelves.First().Width / 304.8);
+ XYZ offestVector = XYZ.BasisZ.CrossProduct(referline.Direction).Normalize();
+ var firstRowPoints = referlinePoints.ConvertAll(p => p - (offestVector * 400 / 304.8));
+ var totalLength = GetTotalFrontShelvesLength(shelves, shelves.Count) + passageWidth * (shelves.Count - 1);
+ var lastRowPoints = referlinePoints.ConvertAll(p => p + offestVector * (400 / 304.8 + totalLength));
+ doc.Invoke(ts =>
+ {
+ //var lastpoints = GetCableTrayStartPoint(referline, shelfSpacing, parallelReferlineOffest, shelves.Last().Width / 304.8);
+ var ctTypeId = new FilteredElementCollector(doc).OfCategory(BuiltInCategory.OST_CableTray).OfClass(typeof(CableTrayType)).WhereElementIsElementType().FirstElementId();
+ for (int j = 0; j < referlinePoints.Count; j++)
+ {
+ var ct = CableTray.Create(doc, ctTypeId, firstRowPoints[j], lastRowPoints[j], level.Id);
+ cts.Add(ct);
+ }
+ for (int i = 0; i < firstRowPoints.Count() - 1; i++)
+ {
+ var frontct = CableTray.Create(doc, ctTypeId, firstRowPoints[i], firstRowPoints[i + 1], level.Id);
+ cts.Add(frontct);
+ }
+ for (int i = 0; i < lastRowPoints.Count() - 1; i++)
+ {
+ var backct = CableTray.Create(doc, ctTypeId, lastRowPoints[i], lastRowPoints[i + 1], level.Id);
+ cts.Add(backct);
+ }
+ foreach (var ct in cts)
+ {
+ ct.get_Parameter(BuiltInParameter.RBS_CTC_BOTTOM_ELEVATION).Set((vm.LightHeight + 100) / 304.8);
+ ct.get_Parameter(BuiltInParameter.RBS_CABLETRAY_WIDTH_PARAM).Set(100 / 304.8);
+ ct.get_Parameter(BuiltInParameter.RBS_CABLETRAY_HEIGHT_PARAM).Set(50 / 304.8);
+ }
+ doc.Regenerate();
+ List connectors = new List();
+ connectors.AddRange(cts.ConvertAll(ct => ct.ConnectorManager.Lookup(0)));
+ connectors.AddRange(cts.ConvertAll(ct => ct.ConnectorManager.Lookup(1)));
+ var connectorGropy = connectors.GroupBy(con => new { con.Origin.X, con.Origin.Y });
+ //生成弯头三通后，会修改connector的原点，造成分组问题，所以将其重新组合成list
+ List> connectorsList = new List>();
+ for (int i = 0; i < connectorGropy.Count(); i++)
+ {
+ var g = connectorGropy.ElementAt(i).ToList();
+ connectorsList.Add(g);
+ }
+
+ for (int i = 0; i < connectorsList.Count(); i++)
+ {
+ var g = connectorsList[i];
+ try
+ {
+ if (g.Count() == 2)
+ {
+ //g.ElementAt(0).ConnectTo(g.ElementAt(1));
+ doc.Create.NewElbowFitting(g.ElementAt(0), g.ElementAt(1));
+ }
+
+ if (g.Count() == 3)
+ {
+ var line = RsRevitUtils.GetLocationCurveByElement(g.ElementAt(0).Owner) as Line;
+ var line1 = RsRevitUtils.GetLocationCurveByElement(g.ElementAt(1).Owner) as Line;
+ var line2 = RsRevitUtils.GetLocationCurveByElement(g.ElementAt(2).Owner) as Line;
+ if (line.Direction.CrossProduct(line1.Direction).IsZeroLength())
+ {
+ doc.Create.NewTeeFitting(g.ElementAt(0), g.ElementAt(1), g.ElementAt(2));
+ }
+ else if (line.Direction.CrossProduct(line2.Direction).IsZeroLength())
+ {
+ doc.Create.NewTeeFitting(g.ElementAt(0), g.ElementAt(2), g.ElementAt(1));
+ }
+ else
+ {
+ doc.Create.NewTeeFitting(g.ElementAt(1), g.ElementAt(2), g.ElementAt(0));
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Log.WriteLog(ex.Message);
+ continue;
+ }
+ }
+ }, "桥架创建");
+ }
+
+ private void CreateLights(Autodesk.Revit.DB.Document doc, ShelvesPlacementViewModel vm, Line referline, double shelfSpacing, double passageWidth, double parallelReferlineOffest)
+ {
+ ObservableCollection shelves = vm.Data;
+ var referlinePoints = GetReferlineCableTrayStartPoint(referline, shelfSpacing, parallelReferlineOffest, shelves.First().Width / 304.8);
+ XYZ offestVector = XYZ.BasisZ.CrossProduct(referline.Direction).Normalize();
+ //第一排
+ var firstRowPoints = referlinePoints.ConvertAll(p => p - (offestVector * 400 / 304.8));
+ var totalLength = GetTotalFrontShelvesLength(shelves, shelves.Count) + passageWidth * (shelves.Count - 1);
+ //最后一排
+ var lastRowPoints = referlinePoints.ConvertAll(p => p + offestVector * (400 / 304.8 + totalLength));
+ Family family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Lamp\\筒灯.rfa");
+ ElementId symbolId = family.GetFamilySymbolIds().FirstOrDefault();
+ FamilySymbol symbol = doc.GetElement(symbolId) as FamilySymbol;
+ List instanceCreationDatas = new List();
+ List locs = new List();
+ for (int i = 0; i < firstRowPoints.Count; i++)
+ {
+ Line line = Line.CreateBound(firstRowPoints[i], lastRowPoints[i]);
+
+ int n = 1000;
+ double param = 2000 / 304.8;
+ for (int j = 0; j < n; j++)
+ {
+ if (!line.IsInside(param * j))
+ {
+ locs.Add(line.GetEndPoint(1));
+ break;
+ }
+ XYZ po = line.Evaluate(param * j, false);
+ locs.Add(po);
+ }
+ }
+ doc.Invoke(ts =>
+ {
+ if (!symbol.IsActive)
+ {
+ symbol.Activate();
+ }
+
+ foreach (XYZ p in locs)
+ {
+ FamilyInstanceCreationData instanceCreationData = new FamilyInstanceCreationData(p + XYZ.BasisZ * vm.LightHeight / 304.8, symbol, doc.ActiveView.GenLevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural);
+ instanceCreationDatas.Add(instanceCreationData);
+ }
+ doc.Create.NewFamilyInstances2(instanceCreationDatas);
+ }, "创建灯具");
+ }
+
+ ///
+ /// 创建货架并编号
+ ///
+ ///
+ ///
+ ///
+ ///
+ private List CreateAndNumberCards(Autodesk.Revit.DB.Document doc, Line referline, Shelf shelf, List shelfInstances)
+ {
+ List cardInstances = new List();
+
+ doc.Invoke(ts =>
+ {
+ for (int j = 0; j < shelfInstances.Count; j++)
+ {
+ FamilyInstance instance = shelfInstances[j];
+ var loc = RsRevitUtils.GetLocationPointByElement(instance);
+
+ Line zline = Line.CreateUnbound(loc, XYZ.BasisZ);
+ //旋转后的
+ var handOrientationd = instance.HandOrientation;
+ //货架左右切换时
+ if (instance.HandFlipped)
+ {
+ handOrientationd = -handOrientationd;
+ }
+
+ #region 布置端牌
+
+ FamilyInstance frontInstance = null;
+
+ Reference frontFace = instance.GetReferences(FamilyInstanceReferenceType.Front).FirstOrDefault();
+ PlaceCard(doc, loc, instance, handOrientationd, frontFace, out frontInstance);
+ if (frontInstance.CanFlipWorkPlane)
+ {
+ frontInstance.IsWorkPlaneFlipped = true;
+ }
+ cardInstances.Add(frontInstance);
+
+ FamilyInstance backInstance = null;
+ Reference backFace = instance.GetReferences(FamilyInstanceReferenceType.Back).FirstOrDefault();
+ PlaceCard(doc, loc, instance, -handOrientationd, backFace, out backInstance);
+
+ cardInstances.Add(backInstance);
+ NumberCards(shelf, shelfInstances, j, frontInstance, backInstance);
+
+ #endregion 布置端牌
+
+ //Reference backface = fi.GetReferences(FamilyInstanceReferenceType.Back).FirstOrDefault();
+ //if (a.Contains("606:SURFACE"))
+ //{
+ // hand = -fi.HandOrientation;
+ //}
+ }
+ }, "调整货架角度及布置端牌");
+ return cardInstances;
+ }
+
+ private void NumberCards(Shelf shelf, List shelfInstances, int i, params FamilyInstance[] cardInstances)
+ {
+ switch (shelf.NumOfGroup)
+ {
+ case NumOfGroup.Single:
+ for (int j = 0; j < cardInstances.Count(); j++)
+ {
+ cardInstances[j].GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}", currentnum));
+ }
+
+ currentnum += 1;
+ break;
+
+ case NumOfGroup.Double:
+ //根据组合加上组合数
+ if (i % 2 == 0 && i != 0)
+ {
+ currentnum += 2;
+ }
+ for (int j = 0; j < cardInstances.Count(); j++)
+ {
+ cardInstances[j].GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", currentnum, currentnum + 1));
+ }
+ //最后一个需要加上组合数作为下一列的开始
+ if (i == shelfInstances.Count - 1)
+ {
+ currentnum += 2;
+ }
+ break;
+
+ case NumOfGroup.Three:
+ //根据组合加上组合数
+ if (i % 3 == 0 && i != 0)
+ {
+ currentnum += 3;
+ }
+ for (int j = 0; j < cardInstances.Count(); j++)
+ {
+ cardInstances[j].GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", currentnum, currentnum + 2));
+ }
+ //最后一个需要加上组合数作为下一列的开始
+ if (i == shelfInstances.Count - 1)
+ {
+ currentnum += 3;
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ ///
+ /// 桥架起点
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ private static List GetReferlineCableTrayStartPoint(Line referline, double shelfSpacing, double parallelReferlineOffest, double shelfWidth)
+ {
+ int n = 100;
+ double lineParameter = 0.0;
+ List firstRowPoints = new List();
+ XYZ pointOnReferline = XYZ.Zero;
+ if (parallelReferlineOffest < 0.001)//起点无间距，起始点具有货架
+ {
+ for (int i = 0; i < n; i++)
+ {
+ if (!referline.IsInside(lineParameter + 2 * shelfWidth + shelfSpacing))
+ {
+ break;
+ }
+ lineParameter = (shelfSpacing * (i + 0.5)) + (((2 * i) + 1) * shelfWidth);
+ pointOnReferline = referline.Evaluate(lineParameter, false);
+ firstRowPoints.Add(pointOnReferline);
+ }
+ }
+ else
+ {
+ for (int i = 0; i < n; i++)
+ {
+ if (!referline.IsInside(lineParameter + (2 * shelfWidth) + shelfSpacing))
+ {
+ break;
+ }
+ if (i == 0)
+ {
+ pointOnReferline = referline.Evaluate(parallelReferlineOffest / 2, false);
+ }
+ else
+ {
+ lineParameter = parallelReferlineOffest + (2 * i * shelfWidth) + shelfSpacing * (i - 0.5);
+ pointOnReferline = referline.Evaluate(lineParameter, false);
+ }
+ firstRowPoints.Add(pointOnReferline);
+ }
+ }
+
+ return firstRowPoints;
+ }
+
+ ///
+ /// 根据货架布置参数，分割参考线(货架左下角点)
+ ///
+ ///
+ /// 货架间距
+ /// 参考线起点进行水平偏移距离
+ /// 货架宽度
+ ///
+ private static List GetReferlineShelfSplitPoints(Line referline, double shelfSpacing, double parallelReferlineOffest, double shelfWidth)
+ {
+ int n = 100;//循环次数
+ List firstRowPoints = new List();
+ XYZ pointOnReferline = XYZ.Zero;
+ double lineParameter = 0.0;
+ if (parallelReferlineOffest < 0.001)//起点无间距，起始点具有货架
+ {
+ for (int j = 0; j < n; j++)
+ {
+ if (!referline.IsInside(lineParameter + shelfWidth))
+ {
+ break;
+ }
+ if (j % 2 == 0)
+ {
+ pointOnReferline = referline.Evaluate(lineParameter, false);
+ lineParameter += shelfSpacing + shelfWidth;//存在不同的间距，所以需分开增加
+ }
+ else
+ {
+ pointOnReferline = referline.Evaluate(lineParameter, false);
+ lineParameter += shelfWidth;//存在不同的间距，所以需分开增加
+ }
+
+ firstRowPoints.Add(pointOnReferline);
+ }
+ }
+ else//起点有距离，即起始点无货架
+ {
+ lineParameter = parallelReferlineOffest;
+
+ for (int j = 0; j < n; j++)
+ {
+ if (!referline.IsInside(lineParameter + shelfWidth))
+ {
+ break;
+ }
+ if (j % 2 == 0)
+ {
+ pointOnReferline = referline.Evaluate(lineParameter, false);
+ lineParameter += shelfWidth;//存在不同的间距，所以需分开增加
+ }
+ else
+ {
+ pointOnReferline = referline.Evaluate(lineParameter, false);
+ lineParameter += shelfSpacing + shelfWidth;//存在不同的间距，所以需分开增加
+ }
+
+ firstRowPoints.Add(pointOnReferline);
+ }
+ }
+
+ return firstRowPoints;
}
///
/// 删除多余端牌
///
///
- ///
- private void DeleteCards(Document doc, List card_instances)
+ ///
+ private void DeleteOverlapCards(Autodesk.Revit.DB.Document doc, List cardInstances)
{
using (Transaction ts = new Transaction(doc, "删除多余端牌"))
{
ts.Start();
- List ids_delete = new List();
+ List idsToDelete = new List();
- foreach (var ins in card_instances)
+ foreach (var ins in cardInstances)
{
var lp = RsRevitUtils.GetLocationPointByElement(ins);
- foreach (var card in card_instances)
+ foreach (var card in cardInstances)
{
var lpt = RsRevitUtils.GetLocationPointByElement(card);
if (!card.Id.Equals(ins.Id) && lp.IsAlmostEqualTo(lpt))
{
- ids_delete.Add(ins.Id);
- ids_delete.Add(card.Id);
+ idsToDelete.Add(ins.Id);
+ idsToDelete.Add(card.Id);
break;
}
}
}
- doc.Delete(ids_delete);
+ doc.Delete(idsToDelete);
ts.Commit();
}
@@ -500,8 +735,8 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmd
///
/// 左右方向
///
- ///
- private void PlaceCard(Document doc, XYZ p, FamilyInstance fi, XYZ handOrientation, Reference facereference, out FamilyInstance card_instance)
+ ///
+ private void PlaceCard(Autodesk.Revit.DB.Document doc, XYZ p, FamilyInstance fi, XYZ handOrientation, Reference facereference, out FamilyInstance cardInstance)
{
var shelfwidth = fi.Symbol.GetParameters("宽度").FirstOrDefault().AsDouble();
@@ -522,7 +757,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmd
{
cardsymbol.Activate();
}
- card_instance = doc.Create.NewFamilyInstance(facereference, p, handOrientation, cardsymbol);
+ cardInstance = doc.Create.NewFamilyInstance(facereference, p, handOrientation, cardsymbol);
}
///
@@ -531,7 +766,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmd
///
/// 行数大于1即i>0
///
- private double GetTotalLength(ObservableCollection shelves, int i)
+ private double GetTotalFrontShelvesLength(ObservableCollection shelves, int i)
{
double totallength = 0.0;
for (int j = 0; j < i; j++)
@@ -539,15 +774,15 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmd
switch (shelves[j].NumOfGroup)
{
case NumOfGroup.Single:
- totallength += shelves[j].Length;
+ totallength += shelves[j].Length / 304.8;
break;
case NumOfGroup.Double:
- totallength += shelves[j].Length * 2;
+ totallength += shelves[j].Length * 2 / 304.8;
break;
case NumOfGroup.Three:
- totallength += shelves[j].Length * 3;
+ totallength += shelves[j].Length * 3 / 304.8;
break;
default:
@@ -555,7 +790,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmd
}
}
- return totallength / 304.8;
+ return totallength;
}
}
}
\ No newline at end of file
diff --git a/RookieStation/ParcelAreaModule/Model/Shelf.cs b/RookieStation/ParcelAreaModule/Model/Shelf.cs
index 4bdab2a..c167ad0 100644
--- a/RookieStation/ParcelAreaModule/Model/Shelf.cs
+++ b/RookieStation/ParcelAreaModule/Model/Shelf.cs
@@ -35,6 +35,6 @@ namespace RookieStation.ParcelAreaModule.Model
}
}
- public string SymbolName => String.Format("{0}{1}{2}{3}", CommonUtils.GetEnumDescription(ShelfLength), "mmx", CommonUtils.GetEnumDescription(ShelfWidth), "mm");
+ public string SymbolName => String.Format("{0}mmx{1}mm", CommonUtils.GetEnumDescription(ShelfLength), CommonUtils.GetEnumDescription(ShelfWidth));
}
}
\ No newline at end of file
diff --git a/RookieStation/ParcelAreaModule/View/WpfShelfCards.xaml.cs b/RookieStation/ParcelAreaModule/View/WpfShelfCards.xaml.cs
index 6b4075e..887265a 100644
--- a/RookieStation/ParcelAreaModule/View/WpfShelfCards.xaml.cs
+++ b/RookieStation/ParcelAreaModule/View/WpfShelfCards.xaml.cs
@@ -146,7 +146,7 @@ namespace RookieStation.ParcelAreaModule.View
last_num_str = $"0{last_number}";
}
var finstance = dict_sorted.ElementAt(i).Key;
- finstance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}{1}{2}", current_num_str, "~", last_num_str));
+ finstance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", current_num_str, last_num_str));
CurrentNumber = last_number + 1;
}
}
@@ -166,7 +166,7 @@ namespace RookieStation.ParcelAreaModule.View
last_num_str = $"0{last_number}";
}
var finstance = dict_sorted.ElementAt(i).Key;
- finstance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}{1}{2}", current_num_str, "~", last_num_str));
+ finstance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", current_num_str, last_num_str));
CurrentNumber = last_number + 1;
}
}
@@ -236,9 +236,9 @@ namespace RookieStation.ParcelAreaModule.View
var back_instance = doc.Create.NewFamilyInstance(back_face, location_XYZ, -hand, symbol);
- front_instance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}{1}{2}", CurrentNumber, "~", LastNum));
+ front_instance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", CurrentNumber, LastNum));
- back_instance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}{1}{2}", CurrentNumber, "~", LastNum));
+ back_instance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", CurrentNumber, LastNum));
if (GroupNumber == 1)
{
front_instance.GetParameters("货架号").FirstOrDefault().Set(CurrentNumber.ToString());
diff --git a/RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml b/RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml
index 73bd838..ac6f462 100644
--- a/RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml
+++ b/RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml
@@ -9,7 +9,7 @@
xmlns:utils="clr-namespace:RookieStation.Utils"
Width="81"
Height="396"
- MinWidth="400"
+ MinWidth="560"
MinHeight="500"
ShowInTaskbar="False"
mc:Ignorable="d">
@@ -31,29 +31,19 @@
+
-
-
-
+
+
+
+
-
-
-
+ Header="起点平距(mm)">
+ Header="起点垂距(mm)">
+
+
+
+ Header="货架间距(mm)">
+
+
+
-
+
+
+
+
+
+
+
-
-
+ Grid.Column="5"
+ VerticalAlignment="Center">
+
+
+
+
+
+ Content="布置" />
\ No newline at end of file
diff --git a/RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml.cs b/RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml.cs
index c53485b..1594867 100644
--- a/RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml.cs
+++ b/RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml.cs
@@ -2,7 +2,9 @@
using RookieStation.ParcelAreaModule;
using RookieStation.ParcelAreaModule.Model;
using RookieStation.Utils;
+using System;
using System.Collections.Specialized;
+using System.Linq;
using System.Windows;
using System.Windows.Input;
@@ -30,17 +32,23 @@ namespace RookieStation.ParcelAreaModule.View
double parallelDistance;
double passageWidth;
double shelfSpacing;
+ double lightHeight;
bool a = double.TryParse(tbOffest.Text, out verticalDistance);
bool b = double.TryParse(tbDistance.Text, out parallelDistance);
bool c = double.TryParse(tbPassageWidth.Text, out passageWidth);
bool d = double.TryParse(tbSpacing.Text, out shelfSpacing);
+ bool f = double.TryParse(tbLightHeight.Text, out lightHeight);
+ vm.IsPlaceLight = cbLight.IsChecked;
+ vm.IsPlaceCableTray = cbCableTray.IsChecked;
+ vm.IsPlaceShelfCards = cbCards.IsChecked;
- if (a && b && c)
+ if (a && b && c && d && f)
{
vm.VerticalReferlineOffest = verticalDistance;
vm.ParallelReferlineOffest = parallelDistance;
vm.PassageWidth = passageWidth;
vm.ShelfSpacing = shelfSpacing;
+ vm.LightHeight = lightHeight;
SaveShelvesData();
DialogResult = true;
}
@@ -50,14 +58,17 @@ namespace RookieStation.ParcelAreaModule.View
}
}
+ ///
+ /// 保存datagrid中的货架信息
+ ///
private void SaveShelvesData()
{
StringCollection sc = new StringCollection();
for (int i = 0; i < vm.Data.Count; i++)
{
Shelf shelf = vm.Data[i];
- string str = string.Format("{0}{1}{2}{3}{4}"
- , CommonUtils.GetEnumDescription(shelf.NumOfGroup).ToString(), ",", CommonUtils.GetEnumDescription(shelf.ShelfLength), ",", CommonUtils.GetEnumDescription(shelf.ShelfWidth));
+ string str = string.Format("{0},{1},{2}"
+ , CommonUtils.GetEnumDescription(shelf.NumOfGroup).ToString(), CommonUtils.GetEnumDescription(shelf.ShelfLength), CommonUtils.GetEnumDescription(shelf.ShelfWidth));
sc.Add(str);
}
Properties.Settings.Default.Shelves = sc;
@@ -91,6 +102,17 @@ namespace RookieStation.ParcelAreaModule.View
vm.Data.RemoveAt(dgShelves.SelectedIndex);
SaveShelvesData();
}
+ else
+ {
+ try
+ {
+ vm.Data.Remove(vm.Data.Last());
+ SaveShelvesData();
+ }
+ catch (Exception)
+ {
+ }
+ }
}
private void tb_PreviewTextInput(object sender, TextCompositionEventArgs e)
@@ -98,5 +120,15 @@ namespace RookieStation.ParcelAreaModule.View
System.Text.RegularExpressions.Regex re = new System.Text.RegularExpressions.Regex("[^0-9]+");
e.Handled = re.IsMatch(e.Text);
}
+
+ private void btnDuplicate_Click(object sender, RoutedEventArgs e)
+ {
+ var shelf = dgShelves.SelectedItem as Shelf;
+ if (dgShelves.SelectedItem != null && shelf != null)
+ {
+ vm.Data.Add(shelf);
+ SaveShelvesData();
+ }
+ }
}
}
\ No newline at end of file
diff --git a/RookieStation/ParcelAreaModule/ViewModel/ShelvesPlacementViewModel.cs b/RookieStation/ParcelAreaModule/ViewModel/ShelvesPlacementViewModel.cs
index b8c3847..c5cc2d8 100644
--- a/RookieStation/ParcelAreaModule/ViewModel/ShelvesPlacementViewModel.cs
+++ b/RookieStation/ParcelAreaModule/ViewModel/ShelvesPlacementViewModel.cs
@@ -31,6 +31,12 @@ namespace RookieStation.ParcelAreaModule
///
public double ShelfSpacing { get; set; }
+ public double LightHeight { get; set; }
+
+ public bool? IsPlaceLight { get; set; }
+ public bool? IsPlaceShelfCards { get; set; }
+ public bool? IsPlaceCableTray { get; set; }
+
public ShelvesPlacementViewModel()
{
Data = CreateShelvesData();
diff --git a/RookieStation/ProjectConfig/UserConstant.cs b/RookieStation/ProjectConfig/UserConstant.cs
index e632eaf..f55e9e1 100644
--- a/RookieStation/ProjectConfig/UserConstant.cs
+++ b/RookieStation/ProjectConfig/UserConstant.cs
@@ -3,6 +3,7 @@ using RookieStation.RibbonMenu;
using RookieStation.Utils;
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -14,18 +15,25 @@ namespace RookieStation.ProjectConfig
private static string AddinPath = typeof(RsApp).Assembly.Location;
public static string AddinDirectory => System.IO.Path.GetDirectoryName(AddinPath);
+#if DEBUG
+
+ //调试路径
+ internal static string FamilyLibraryDirectory => AddinDirectory + "\\RsLibrary\\FamilyLibrary\\";
+
+ internal static string DocumentDirectory => AddinDirectory + "\\RsLibrary\\Document\\";
+
+ internal static string LogFolder = AddinDirectory + "\\RsLibrary\\Log\\";
+
+#else
//打包路径
internal static string FamilyLibraryDirectory => AddinDirectory + "\\FamilyLibrary\\";
- //调试路径
- //internal static string FamilyLibraryDirectory => AddinDirectory + "\\RsLibrary\\FamilyLibrary\\";
-
- //打包路径
internal static string DocumentDirectory => AddinDirectory + "\\Document\\";
- //调试路径
- //internal static string DocumentDirectory => AddinDirectory + "\\RsLibrary\\Document\\";
+ internal static string LogFolder = AddinDirectory + "Log\\";
+
+#endif
internal static ObjectSnapTypes SnapAll =>
ObjectSnapTypes.Intersections
diff --git a/RookieStation/Properties/Resources.Designer.cs b/RookieStation/Properties/Resources.Designer.cs
index e55af58..b7a50c8 100644
--- a/RookieStation/Properties/Resources.Designer.cs
+++ b/RookieStation/Properties/Resources.Designer.cs
@@ -140,6 +140,16 @@ namespace RookieStation.Properties {
}
}
+ ///
+ /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ ///
+ internal static System.Drawing.Bitmap Legend {
+ get {
+ object obj = ResourceManager.GetObject("Legend", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
///
diff --git a/RookieStation/Properties/Resources.resx b/RookieStation/Properties/Resources.resx
index f79b092..71fa3a9 100644
--- a/RookieStation/Properties/Resources.resx
+++ b/RookieStation/Properties/Resources.resx
@@ -142,6 +142,9 @@
..\resources\lamp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Legend.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\resources\logoextrusion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/RookieStation/Resources/Legend.png b/RookieStation/Resources/Legend.png
new file mode 100644
index 0000000..5c0326a
Binary files /dev/null and b/RookieStation/Resources/Legend.png differ
diff --git a/RookieStation/RookieStation.addin b/RookieStation/RookieStation.addin
index 3311594..7d2cffe 100644
--- a/RookieStation/RookieStation.addin
+++ b/RookieStation/RookieStation.addin
@@ -2,7 +2,7 @@
菜鸟驿站插件
- RsLibrary\RookieStation.dll
+ RsTools\RookieStation.dll
1aac8233-690c-4dd6-89c0-78221dd65497
RookieStation.RibbonMenu.RsApp
ADSK
diff --git a/RookieStation/RookieStation.csproj b/RookieStation/RookieStation.csproj
index 1c18e53..97f6891 100644
--- a/RookieStation/RookieStation.csproj
+++ b/RookieStation/RookieStation.csproj
@@ -19,7 +19,7 @@
full
false
bin\Debug\
- DEBUG;TRACE
+ TRACE;DEBUG
prompt
4
x64
@@ -181,6 +181,15 @@
SettingsSingleFileGenerator
Settings.Designer.cs
+
+ Always
+
+
+ Always
+
+
+ Always
+
Always
@@ -194,12 +203,18 @@
Always
+
+ Always
+
Always
Always
+
+ Always
+
Always
@@ -218,6 +233,9 @@
Always
+
+ Always
+
Always
@@ -233,6 +251,9 @@
Always
+
+ Always
+
Always
@@ -242,41 +263,33 @@
Always
+
+ Always
+
Always
+
+ Always
+
Always
Always
+
+ Always
+
Always
Always
-
-
+
Always
-
- Always
-
-
- Always
-
-
- Always
-
-
- Always
-
-
- Always
-
-
Always
@@ -287,6 +300,7 @@
ResXFileCodeGenerator
Resources.Designer.cs
+ Designer
@@ -342,6 +356,7 @@
+
diff --git a/RookieStation/RsApp.cs b/RookieStation/RsApp.cs
index 0ace774..42c7db0 100644
--- a/RookieStation/RsApp.cs
+++ b/RookieStation/RsApp.cs
@@ -36,6 +36,7 @@ namespace RookieStation.RibbonMenu
private static string ViewPlanCmdEnabled = typeof(EnableCmdInViewPlan).ToString();
private static string DrawingSheetCmdEnabled = typeof(EnableCmdInViewSheet).ToString();
+ private static string ViewSectionCmdEnabled = typeof(EnableCmdInViewSection).ToString();
private BitmapSource ConvertFromBitmap(System.Drawing.Bitmap bitmap)
{
@@ -100,7 +101,9 @@ namespace RookieStation.RibbonMenu
CreatePushButton(statisticsPanel, "工程量导出", Properties.Resources.WorkSchedule, null);
//出图面板
RibbonPanel drawingPanel = application.CreateRibbonPanel(TabName, DrawingPanelName);
- CreatePushButton(drawingPanel, "货架图例说明", Properties.Resources.ViewPlanDim, DrawingSheetCmdEnabled);
+ CreatePushButton(drawingPanel, "货架图例说明", Properties.Resources.Legend, DrawingSheetCmdEnabled);
+ CreatePushButton(drawingPanel, "平面标注", Properties.Resources.ViewPlanDim, ViewPlanCmdEnabled);
+ CreatePushButton(drawingPanel, "立面标注", Properties.Resources.ViewSectionDim, ViewSectionCmdEnabled);
//CreatePushButton(drawingPanel, "平面标注", Properties.Resources.ViewPlanDim, ViewPlanCmdEnabled);
//CreatePushButton(drawingPanel, "立面标注", Properties.Resources.ViewSectionDim, null);
//CreatePushButton(drawingPanel, "导出dwg图纸", Properties.Resources.ExportDWG, null);
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/1.5m绿动箱.rfa b/RookieStation/RsLibrary/FamilyLibrary/Furniture/1.5m绿动箱.rfa
new file mode 100644
index 0000000..6f248cf
Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/Furniture/1.5m绿动箱.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/3.0m绿动箱.rfa b/RookieStation/RsLibrary/FamilyLibrary/Furniture/3.0m绿动箱.rfa
new file mode 100644
index 0000000..647a2d7
Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/Furniture/3.0m绿动箱.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/寄件接待台-带收检台.rfa b/RookieStation/RsLibrary/FamilyLibrary/Furniture/寄件接待台-带收检台.rfa
new file mode 100644
index 0000000..1523302
Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/Furniture/寄件接待台-带收检台.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/寄件接待台.rfa b/RookieStation/RsLibrary/FamilyLibrary/Furniture/寄件接待台.rfa
index 9abbed4..7c13e69 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Furniture/寄件接待台.rfa and b/RookieStation/RsLibrary/FamilyLibrary/Furniture/寄件接待台.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/绿动箱.rfa b/RookieStation/RsLibrary/FamilyLibrary/Furniture/绿动箱.rfa
new file mode 100644
index 0000000..17f9d33
Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/Furniture/绿动箱.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/L型收检台.rfa b/RookieStation/RsLibrary/FamilyLibrary/Gate/L型收检台.rfa
index 4e07b55..3ff8526 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Gate/L型收检台.rfa and b/RookieStation/RsLibrary/FamilyLibrary/Gate/L型收检台.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-右.rfa b/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-右.rfa
index 711c12d..a320611 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-右.rfa and b/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-右.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-左.rfa b/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-左.rfa
index 4db8ce0..d1c5d43 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-左.rfa and b/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-左.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/直线形收检台.0001.rfa b/RookieStation/RsLibrary/FamilyLibrary/Gate/直线形收检台.0001.rfa
deleted file mode 100644
index afcaba7..0000000
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Gate/直线形收检台.0001.rfa and /dev/null differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/闸机.rfa b/RookieStation/RsLibrary/FamilyLibrary/Gate/闸机.rfa
index f513f0c..483a32b 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Gate/闸机.rfa and b/RookieStation/RsLibrary/FamilyLibrary/Gate/闸机.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Lamp/吊灯.rfa b/RookieStation/RsLibrary/FamilyLibrary/Lamp/吊灯.rfa
index 686ab94..2f5d1e9 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Lamp/吊灯.rfa and b/RookieStation/RsLibrary/FamilyLibrary/Lamp/吊灯.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Lamp/筒灯.0001.rfa b/RookieStation/RsLibrary/FamilyLibrary/Lamp/筒灯.0001.rfa
deleted file mode 100644
index 115d2c2..0000000
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Lamp/筒灯.0001.rfa and /dev/null differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/定位线.rfa b/RookieStation/RsLibrary/FamilyLibrary/Location/定位线.rfa
similarity index 100%
rename from RookieStation/RsLibrary/FamilyLibrary/定位线.rfa
rename to RookieStation/RsLibrary/FamilyLibrary/Location/定位线.rfa
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Shelf/单联货架.0001.rfa b/RookieStation/RsLibrary/FamilyLibrary/Shelf/单联货架.0001.rfa
deleted file mode 100644
index 5a7d9c1..0000000
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Shelf/单联货架.0001.rfa and /dev/null differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Shelf/单联货架.rfa b/RookieStation/RsLibrary/FamilyLibrary/Shelf/单联货架.rfa
index e74a9d3..2097b39 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Shelf/单联货架.rfa and b/RookieStation/RsLibrary/FamilyLibrary/Shelf/单联货架.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Shelf/货架端牌.rfa b/RookieStation/RsLibrary/FamilyLibrary/Shelf/货架端牌.rfa
index b6639ce..563d175 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Shelf/货架端牌.rfa and b/RookieStation/RsLibrary/FamilyLibrary/Shelf/货架端牌.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/侧招灯箱.rfa b/RookieStation/RsLibrary/FamilyLibrary/Sign/侧招灯箱.rfa
index 415e116..d7606b2 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Sign/侧招灯箱.rfa and b/RookieStation/RsLibrary/FamilyLibrary/Sign/侧招灯箱.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/台卡.rfa b/RookieStation/RsLibrary/FamilyLibrary/Sign/台卡.rfa
similarity index 94%
rename from RookieStation/RsLibrary/FamilyLibrary/台卡.rfa
rename to RookieStation/RsLibrary/FamilyLibrary/Sign/台卡.rfa
index 6a4eb62..afd3be6 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/台卡.rfa and b/RookieStation/RsLibrary/FamilyLibrary/Sign/台卡.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/四牌.rfa b/RookieStation/RsLibrary/FamilyLibrary/Sign/四牌.rfa
index d912e8e..e086909 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Sign/四牌.rfa and b/RookieStation/RsLibrary/FamilyLibrary/Sign/四牌.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/寄件收费标准.rfa b/RookieStation/RsLibrary/FamilyLibrary/Sign/寄件收费标准.rfa
similarity index 100%
rename from RookieStation/RsLibrary/FamilyLibrary/寄件收费标准.rfa
rename to RookieStation/RsLibrary/FamilyLibrary/Sign/寄件收费标准.rfa
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/快递指导规范.rfa b/RookieStation/RsLibrary/FamilyLibrary/Sign/快递指导规范.rfa
new file mode 100644
index 0000000..45e185f
Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/Sign/快递指导规范.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/菜鸟LOGO.rfa b/RookieStation/RsLibrary/FamilyLibrary/Sign/菜鸟LOGO.rfa
index 89c2505..cf56b13 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/Sign/菜鸟LOGO.rfa and b/RookieStation/RsLibrary/FamilyLibrary/Sign/菜鸟LOGO.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/菜鸟LOGO共99.rfa b/RookieStation/RsLibrary/FamilyLibrary/Sign/菜鸟LOGO共99.rfa
new file mode 100644
index 0000000..bd7823f
Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/Sign/菜鸟LOGO共99.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/WallFinish/校园文化墙.rfa b/RookieStation/RsLibrary/FamilyLibrary/WallFinish/校园文化墙.rfa
index 2ea580e..59ecf83 100644
Binary files a/RookieStation/RsLibrary/FamilyLibrary/WallFinish/校园文化墙.rfa and b/RookieStation/RsLibrary/FamilyLibrary/WallFinish/校园文化墙.rfa differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/背景墙.rfa b/RookieStation/RsLibrary/FamilyLibrary/WallFinish/背景墙.rfa
similarity index 100%
rename from RookieStation/RsLibrary/FamilyLibrary/背景墙.rfa
rename to RookieStation/RsLibrary/FamilyLibrary/WallFinish/背景墙.rfa
diff --git a/RookieStation/RsLibrary/FamilyLibrary/快递指导规范.rfa b/RookieStation/RsLibrary/FamilyLibrary/快递指导规范.rfa
deleted file mode 100644
index cbc0ffc..0000000
Binary files a/RookieStation/RsLibrary/FamilyLibrary/快递指导规范.rfa and /dev/null differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/绿动箱.rfa b/RookieStation/RsLibrary/FamilyLibrary/绿动箱.rfa
deleted file mode 100644
index 5b01844..0000000
Binary files a/RookieStation/RsLibrary/FamilyLibrary/绿动箱.rfa and /dev/null differ
diff --git a/RookieStation/RsLibrary/FamilyLibrary/菜鸟驿站.rte b/RookieStation/RsLibrary/FamilyLibrary/菜鸟驿站.rte
deleted file mode 100644
index 68e70df..0000000
Binary files a/RookieStation/RsLibrary/FamilyLibrary/菜鸟驿站.rte and /dev/null differ
diff --git a/RookieStation/Utils/EnableCmdInViewPlan.cs b/RookieStation/Utils/EnableCmdInViewPlan.cs
index 6539e15..8d6c898 100644
--- a/RookieStation/Utils/EnableCmdInViewPlan.cs
+++ b/RookieStation/Utils/EnableCmdInViewPlan.cs
@@ -45,19 +45,6 @@ namespace RookieStation.Utils
{
public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories)
{
- //Application revitApplication = applicationData.Application;
- //ApplicationOptions options = ApplicationOptions.Get();
-
- //switch (options.Availability)
- //{
- // case ApplicationAvailablity.ArchitectureDiscipline:
- // return revitApplication.IsArchitectureEnabled;
- // case ApplicationAvailablity.StructuralAnalysis:
- // return revitApplication.IsStructuralAnalysisEnabled;
- // case ApplicationAvailablity.MEP:
- // return revitApplication.IsSystemsEnabled;
- //}
-
if (null != applicationData.ActiveUIDocument)
{
Autodesk.Revit.DB.View view = applicationData.ActiveUIDocument.Document.ActiveView;
@@ -70,4 +57,21 @@ namespace RookieStation.Utils
return false;
}
}
+
+ internal class EnableCmdInViewSection : IExternalCommandAvailability
+ {
+ public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories)
+ {
+ if (null != applicationData.ActiveUIDocument)
+ {
+ Autodesk.Revit.DB.View view = applicationData.ActiveUIDocument.Document.ActiveView;
+ if (view.ViewType == ViewType.Section)
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+ }
}
\ No newline at end of file
diff --git a/RookieStation/Utils/Log.cs b/RookieStation/Utils/Log.cs
index 6563ff6..77c23e1 100644
--- a/RookieStation/Utils/Log.cs
+++ b/RookieStation/Utils/Log.cs
@@ -14,7 +14,7 @@ namespace RookieStation.Utils
{
try
{
- string logFolder = UserConstant.FamilyLibraryDirectory + "Log\\";
+ string logFolder = UserConstant.LogFolder;
string logFile = Path.Combine(logFolder, DateTime.Now.ToString("yyyyMMdd") + ".log");
if (!Directory.Exists(logFolder))
Directory.CreateDirectory(logFolder);
diff --git a/RookieStation/Utils/RsRevitUtils.cs b/RookieStation/Utils/RsRevitUtils.cs
index ace1f12..b21a8e9 100644
--- a/RookieStation/Utils/RsRevitUtils.cs
+++ b/RookieStation/Utils/RsRevitUtils.cs
@@ -187,7 +187,10 @@ namespace RookieStation.Utils
doc.Invoke(ts =>
{
Family lineFamily = GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "定位线.rfa");
- lineSymbol = doc.GetElement(lineFamily.GetFamilySymbolIds().FirstOrDefault()) as FamilySymbol;
+ if (lineFamily != null)
+ {
+ lineSymbol = doc.GetElement(lineFamily.GetFamilySymbolIds().FirstOrDefault()) as FamilySymbol;
+ }
}, "载入定位线并布置");
return lineSymbol;
diff --git a/RookieStationSetup/RookieStationSetup.vdproj b/RookieStationSetup/RookieStationSetup.vdproj
index 8fb3440..d0b096e 100644
--- a/RookieStationSetup/RookieStationSetup.vdproj
+++ b/RookieStationSetup/RookieStationSetup.vdproj
@@ -15,13 +15,19 @@
{
"Entry"
{
- "MsmKey" = "8:_042BEA0E74BD4C27885254B6D3140C92"
+ "MsmKey" = "8:_04396D7F9297427F80C9E06D8FD2B755"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_04396D7F9297427F80C9E06D8FD2B755"
+ "MsmKey" = "8:_0660ACCC4499404AB0F56A4F40616368"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_0B6B91DFBA194421B832C283AF273173"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -45,13 +51,13 @@
}
"Entry"
{
- "MsmKey" = "8:_14C916D9AB2346E6822F4D2C07D2D641"
+ "MsmKey" = "8:_19C34F97873F4001BE315F3995963382"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_15BF99BBBD254085A5ACA4D113B563FD"
+ "MsmKey" = "8:_1E7D869E37AA44DC81AC2C890AE68104"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -69,13 +75,13 @@
}
"Entry"
{
- "MsmKey" = "8:_24DF31FA053A4CC19CC0CD2785ED0618"
+ "MsmKey" = "8:_2ABBB4346733481187A37206130EF461"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_2CAFA745902C4CFAA56440BF91EDF385"
+ "MsmKey" = "8:_2DB1DB1D0C0A41A3B49BA21FA0EE6338"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -87,7 +93,13 @@
}
"Entry"
{
- "MsmKey" = "8:_32A958516BE643FA9AB7E7094F59F7D5"
+ "MsmKey" = "8:_2F8C378AA3F647BBACF452F5F4D68EC1"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_34084FCC261C45ACB1E9BE29AF27F16C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -99,6 +111,18 @@
}
"Entry"
{
+ "MsmKey" = "8:_3E5CDABF8FFB4A4F99AE33F0F9077795"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_3ED05085BD6E486189B74353F77595C8"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_41775BD319E34B2C88358704BB370C4B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -111,19 +135,13 @@
}
"Entry"
{
- "MsmKey" = "8:_454BF086E241425CA8136945C388E161"
+ "MsmKey" = "8:_4934194598254F9DB6A3692F12D46877"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_50DE1E55BDA84A0C903C153C330989ED"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_5A158989CC254AD68F065C2070C19A9C"
+ "MsmKey" = "8:_4A21CF3BA26B47B7829AABAC21A525D1"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -153,13 +171,13 @@
}
"Entry"
{
- "MsmKey" = "8:_5E18A3729152427D9F326D38222AF3F6"
+ "MsmKey" = "8:_6288BC0ECCE74AA5AD49D6094B6ED51E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6288BC0ECCE74AA5AD49D6094B6ED51E"
+ "MsmKey" = "8:_66B8224986B547ECB60E7AFC8977A760"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -177,25 +195,19 @@
}
"Entry"
{
- "MsmKey" = "8:_6D3A5D3D39B143E9808A4DEF979E04C5"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_715C63EFC9304A40A401B5A0146562C1"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_71787B3108634BBF9C24F1278140BD99"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_7A56ADFBE1FF4F38ADB68BE4598904AB"
+ "MsmKey" = "8:_73709D6BB93E411D8B86E32B9F4ADA61"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_77F7C420C9D0472FB7F862222E2B4DB8"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -213,12 +225,24 @@
}
"Entry"
{
+ "MsmKey" = "8:_80B120E95727426389EED39F42449083"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_80EAC70342A6486DB14DDB5E562312AD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
+ "MsmKey" = "8:_84CB69808B654CF685BB4A3F87464F4F"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_87B3C6ABBC8FF8A77BFE903B40AF6691"
"OwnerKey" = "8:_FBE461B9D4BD4603919E2821D88FB7CB"
"MsmSig" = "8:_UNDEFINED"
@@ -231,7 +255,7 @@
}
"Entry"
{
- "MsmKey" = "8:_887BFD283485451AAAF745248944B04A"
+ "MsmKey" = "8:_89CD2D66CBC1431BB4EB6907E21FFAC4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -249,12 +273,60 @@
}
"Entry"
{
+ "MsmKey" = "8:_9B193C96A36E45D8AA0AE8C850191C60"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_9D57E706186F4B89BAA1DFF557AFB722"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_9E53E94CA4C84976ACF61A45CF3C085E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
+ "MsmKey" = "8:_9F186119162048C59B774F07AD1D37E4"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_A2D16A25D1D143B3A3C2510EC5FC69FF"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_A352BCA2E3C7448292526CC241260184"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_A461F83BB9E04AA685182130A48B8B95"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_A757474C8B3E4F53A62942420CA97A1B"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_A87178FC0E8E464D83DFBDEA9F2A9C43"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_AF183B41BD2A44A48A93EEC1B9AD9B12"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -303,25 +375,19 @@
}
"Entry"
{
- "MsmKey" = "8:_B85ED978B42C460AA263E91C80B499E5"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_BBFD5F51D4DA444FA00A875B49CFA880"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_C0EC3A0D07D4490A8EB69553A7CBE2A2"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C25A20BA44AB49058A568D3BB996CBEC"
+ "MsmKey" = "8:_C13B6EFF3BDC485F995140ECE3BF976B"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_C37253C8AABD42589BAED190AE0CDE5A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -333,19 +399,13 @@
}
"Entry"
{
- "MsmKey" = "8:_C6FF377B37424855996572B5E2BEB61F"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_CAD50A370819474CAE14570A68173CEE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_CC9C60F8D461413288EC370C0920C92C"
+ "MsmKey" = "8:_CDDEB52E94FD4C9EB222CB9A0A4E5575"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -357,7 +417,13 @@
}
"Entry"
{
- "MsmKey" = "8:_D3A52CF533394306BE31BF10F64FE1D5"
+ "MsmKey" = "8:_CF02B938C86745D1927C3C5C9BBD5745"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_D0AB549F50BB4B5A8E0C7C407948585D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -369,12 +435,6 @@
}
"Entry"
{
- "MsmKey" = "8:_D8319246C8C8408EB251C395D2AE96DC"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_DAEA3EBD334748F3B1E7744F406BD951"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -387,12 +447,6 @@
}
"Entry"
{
- "MsmKey" = "8:_DDA25BAD15BC4DD9B2ADFAAACB1721F7"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_DF52769DF9554461B349B1B3AE1552FD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -411,19 +465,19 @@
}
"Entry"
{
- "MsmKey" = "8:_E610A9857548408494D641A285230C00"
+ "MsmKey" = "8:_E6F75818F7284D35A94F08B41BE960FA"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E630059FC1F74583A6D79B63068E91E8"
+ "MsmKey" = "8:_E8AFEE9E12CE427AA2AB71E7E62B6567"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_EB928E26294F4B82AED56A1B76EDB7B4"
+ "MsmKey" = "8:_EC425FC610B1482B8A054EB6074A4616"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -435,7 +489,7 @@
}
"Entry"
{
- "MsmKey" = "8:_F95CC2AEFFC7440299EAE72BBB0BDF42"
+ "MsmKey" = "8:_FA661FC2BD524B1EBF0D5EDB740D5D0B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -447,24 +501,6 @@
}
"Entry"
{
- "MsmKey" = "8:_FD377BB244054C0387D5DBE34FFBF893"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_FD45C871BDC343889EEEF3DCF7774EE5"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_FE0FD0A8D54944C0B327CF0793F46928"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_FBE461B9D4BD4603919E2821D88FB7CB"
"MsmSig" = "8:_UNDEFINED"
@@ -630,12 +666,12 @@
}
"File"
{
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_042BEA0E74BD4C27885254B6D3140C92"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_04396D7F9297427F80C9E06D8FD2B755"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\背景墙.rfa"
- "TargetName" = "8:背景墙.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\免费WiFi.png"
+ "TargetName" = "8:免费WiFi.png"
"Tag" = "8:"
- "Folder" = "8:_22185A9B5ACE495C9C8BCA26B0449D39"
+ "Folder" = "8:_F5ED04AC08DB456B83913CBF80AD223A"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -650,12 +686,32 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_04396D7F9297427F80C9E06D8FD2B755"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0660ACCC4499404AB0F56A4F40616368"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\免费WiFi.png"
- "TargetName" = "8:免费WiFi.png"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Shelf\\货架端牌.rfa"
+ "TargetName" = "8:货架端牌.rfa"
"Tag" = "8:"
- "Folder" = "8:_F5ED04AC08DB456B83913CBF80AD223A"
+ "Folder" = "8:_406EA5A50D6D43439512FD26B8E10B12"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0B6B91DFBA194421B832C283AF273173"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\WallFinish\\背景墙.rfa"
+ "TargetName" = "8:背景墙.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_B3DF628258C043A6986617245B6F0BEE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -721,12 +777,12 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_14C916D9AB2346E6822F4D2C07D2D641"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_19C34F97873F4001BE315F3995963382"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Shelf\\三联货架.rfa"
- "TargetName" = "8:三联货架.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Shelf\\双联货架.rfa"
+ "TargetName" = "8:双联货架.rfa"
"Tag" = "8:"
- "Folder" = "8:_34192A2972BB45D1A082145EEEA9773A"
+ "Folder" = "8:_406EA5A50D6D43439512FD26B8E10B12"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -741,12 +797,12 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_15BF99BBBD254085A5ACA4D113B563FD"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1E7D869E37AA44DC81AC2C890AE68104"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Gate\\L型收检台.rfa"
- "TargetName" = "8:L型收检台.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Door\\幕墙门-玻璃门.rfa"
+ "TargetName" = "8:幕墙门-玻璃门.rfa"
"Tag" = "8:"
- "Folder" = "8:_E3753D97AE3F45C1A1FADF675C057DDF"
+ "Folder" = "8:_1DCEC210457E4FB0AB7B04A6A5D03306"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -812,12 +868,12 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_24DF31FA053A4CC19CC0CD2785ED0618"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2ABBB4346733481187A37206130EF461"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\常规门头.rfa"
- "TargetName" = "8:常规门头.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Lamp\\筒灯.rfa"
+ "TargetName" = "8:筒灯.rfa"
"Tag" = "8:"
- "Folder" = "8:_C85CB0CA2C2345A0B2C9C0FF87BE8120"
+ "Folder" = "8:_BFD89CD05BEB451EA768E58E9AF9EB35"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -832,12 +888,12 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2CAFA745902C4CFAA56440BF91EDF385"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2DB1DB1D0C0A41A3B49BA21FA0EE6338"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\侧招灯箱.rfa"
- "TargetName" = "8:侧招灯箱.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\1.5m绿动箱.rfa"
+ "TargetName" = "8:1.5m绿动箱.rfa"
"Tag" = "8:"
- "Folder" = "8:_C85CB0CA2C2345A0B2C9C0FF87BE8120"
+ "Folder" = "8:_7692A4F9B7D744A3A1E5AFA9F95890CD"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -872,12 +928,32 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_32A958516BE643FA9AB7E7094F59F7D5"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2F8C378AA3F647BBACF452F5F4D68EC1"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\四牌.rfa"
- "TargetName" = "8:四牌.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\拆包桌.rfa"
+ "TargetName" = "8:拆包桌.rfa"
"Tag" = "8:"
- "Folder" = "8:_C85CB0CA2C2345A0B2C9C0FF87BE8120"
+ "Folder" = "8:_7692A4F9B7D744A3A1E5AFA9F95890CD"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_34084FCC261C45ACB1E9BE29AF27F16C"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Gate\\L型收检台.rfa"
+ "TargetName" = "8:L型收检台.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_9B75B83A53C7405E9D6020ABD06A3A14"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -912,6 +988,46 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3E5CDABF8FFB4A4F99AE33F0F9077795"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Location\\定位线.rfa"
+ "TargetName" = "8:定位线.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_CCB9CA9C12EE4E23A02C5D6A329D2A50"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3ED05085BD6E486189B74353F77595C8"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\绿动箱.rfa"
+ "TargetName" = "8:绿动箱.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_7692A4F9B7D744A3A1E5AFA9F95890CD"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_41775BD319E34B2C88358704BB370C4B"
{
"SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\寄件区-左.png"
@@ -952,52 +1068,32 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_454BF086E241425CA8136945C388E161"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Lamp\\筒灯.rfa"
- "TargetName" = "8:筒灯.rfa"
- "Tag" = "8:"
- "Folder" = "8:_4CF542DBEF2443F1ABCA34DC0C62F229"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_50DE1E55BDA84A0C903C153C330989ED"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Lamp\\吊灯.rfa"
- "TargetName" = "8:吊灯.rfa"
- "Tag" = "8:"
- "Folder" = "8:_4CF542DBEF2443F1ABCA34DC0C62F229"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5A158989CC254AD68F065C2070C19A9C"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4934194598254F9DB6A3692F12D46877"
{
"SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Gate\\简易收检台.rfa"
"TargetName" = "8:简易收检台.rfa"
"Tag" = "8:"
- "Folder" = "8:_E3753D97AE3F45C1A1FADF675C057DDF"
+ "Folder" = "8:_9B75B83A53C7405E9D6020ABD06A3A14"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4A21CF3BA26B47B7829AABAC21A525D1"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\菜鸟LOGO.rfa"
+ "TargetName" = "8:菜鸟LOGO.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1063,12 +1159,12 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5E18A3729152427D9F326D38222AF3F6"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6288BC0ECCE74AA5AD49D6094B6ED51E"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\台卡.rfa"
- "TargetName" = "8:台卡.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\邮件快件实名收寄管理办法（700mm_500mm竖版）.jpg"
+ "TargetName" = "8:邮件快件实名收寄管理办法（700mm_500mm竖版）.jpg"
"Tag" = "8:"
- "Folder" = "8:_22185A9B5ACE495C9C8BCA26B0449D39"
+ "Folder" = "8:_F5ED04AC08DB456B83913CBF80AD223A"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1083,12 +1179,12 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6288BC0ECCE74AA5AD49D6094B6ED51E"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_66B8224986B547ECB60E7AFC8977A760"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\邮件快件实名收寄管理办法（700mm_500mm竖版）.jpg"
- "TargetName" = "8:邮件快件实名收寄管理办法（700mm_500mm竖版）.jpg"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\四牌.rfa"
+ "TargetName" = "8:四牌.rfa"
"Tag" = "8:"
- "Folder" = "8:_F5ED04AC08DB456B83913CBF80AD223A"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1154,46 +1250,6 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6D3A5D3D39B143E9808A4DEF979E04C5"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\菜鸟使命.rfa"
- "TargetName" = "8:菜鸟使命.rfa"
- "Tag" = "8:"
- "Folder" = "8:_C85CB0CA2C2345A0B2C9C0FF87BE8120"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_715C63EFC9304A40A401B5A0146562C1"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\地贴.rfa"
- "TargetName" = "8:地贴.rfa"
- "Tag" = "8:"
- "Folder" = "8:_C85CB0CA2C2345A0B2C9C0FF87BE8120"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_71787B3108634BBF9C24F1278140BD99"
{
"SourcePath" = "8:..\\RookieStation\\bin\\Release\\RookieStation.dll.config"
@@ -1214,12 +1270,32 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7A56ADFBE1FF4F38ADB68BE4598904AB"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_73709D6BB93E411D8B86E32B9F4ADA61"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\拆包桌.rfa"
- "TargetName" = "8:拆包桌.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\墙贴.rfa"
+ "TargetName" = "8:墙贴.rfa"
"Tag" = "8:"
- "Folder" = "8:_25CCE212CB504A678EDDBD72886AB43A"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_77F7C420C9D0472FB7F862222E2B4DB8"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\寄件收费标准.rfa"
+ "TargetName" = "8:寄件收费标准.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1285,6 +1361,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_80B120E95727426389EED39F42449083"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\菜鸟使命.rfa"
+ "TargetName" = "8:菜鸟使命.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_80EAC70342A6486DB14DDB5E562312AD"
{
"SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\禁止寄递物品管理规定_附录禁止寄递物品指导目录（700mm_500mm竖版）.jpg"
@@ -1305,6 +1401,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_84CB69808B654CF685BB4A3F87464F4F"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\WallFinish\\校园文化墙.rfa"
+ "TargetName" = "8:校园文化墙.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_B3DF628258C043A6986617245B6F0BEE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_87B3C6ABBC8FF8A77BFE903B40AF6691"
{
"AssemblyRegister" = "3:1"
@@ -1336,12 +1452,12 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_887BFD283485451AAAF745248944B04A"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_89CD2D66CBC1431BB4EB6907E21FFAC4"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\菜鸟LOGO.rfa"
- "TargetName" = "8:菜鸟LOGO.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\寄件接待台-带收检台.rfa"
+ "TargetName" = "8:寄件接待台-带收检台.rfa"
"Tag" = "8:"
- "Folder" = "8:_C85CB0CA2C2345A0B2C9C0FF87BE8120"
+ "Folder" = "8:_7692A4F9B7D744A3A1E5AFA9F95890CD"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1387,6 +1503,46 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9B193C96A36E45D8AA0AE8C850191C60"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Lamp\\吊灯.rfa"
+ "TargetName" = "8:吊灯.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_BFD89CD05BEB451EA768E58E9AF9EB35"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9D57E706186F4B89BAA1DFF557AFB722"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\FloorFinish\\地砖.rfa"
+ "TargetName" = "8:地砖.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_18E710EDFE6E40DA8D0A6674502C62B2"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9E53E94CA4C84976ACF61A45CF3C085E"
{
"SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\菜鸟驿站寄件业务收费标准（210_297竖版）.jpg"
@@ -1407,6 +1563,126 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9F186119162048C59B774F07AD1D37E4"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\台卡.rfa"
+ "TargetName" = "8:台卡.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A2D16A25D1D143B3A3C2510EC5FC69FF"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\地贴.rfa"
+ "TargetName" = "8:地贴.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A352BCA2E3C7448292526CC241260184"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\菜鸟LOGO共99.rfa"
+ "TargetName" = "8:菜鸟LOGO共99.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A461F83BB9E04AA685182130A48B8B95"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Shelf\\单联货架.rfa"
+ "TargetName" = "8:单联货架.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_406EA5A50D6D43439512FD26B8E10B12"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A757474C8B3E4F53A62942420CA97A1B"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\寄件接待台.rfa"
+ "TargetName" = "8:寄件接待台.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_7692A4F9B7D744A3A1E5AFA9F95890CD"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A87178FC0E8E464D83DFBDEA9F2A9C43"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\3.0m绿动箱.rfa"
+ "TargetName" = "8:3.0m绿动箱.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_7692A4F9B7D744A3A1E5AFA9F95890CD"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AF183B41BD2A44A48A93EEC1B9AD9B12"
{
"SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\监控提醒.png"
@@ -1509,46 +1785,6 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B85ED978B42C460AA263E91C80B499E5"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\防撞条.rfa"
- "TargetName" = "8:防撞条.rfa"
- "Tag" = "8:"
- "Folder" = "8:_C85CB0CA2C2345A0B2C9C0FF87BE8120"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BBFD5F51D4DA444FA00A875B49CFA880"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\玻璃贴.rfa"
- "TargetName" = "8:玻璃贴.rfa"
- "Tag" = "8:"
- "Folder" = "8:_C85CB0CA2C2345A0B2C9C0FF87BE8120"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C0EC3A0D07D4490A8EB69553A7CBE2A2"
{
"SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Document\\样板工程量清单.xlsx"
@@ -1569,12 +1805,32 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C25A20BA44AB49058A568D3BB996CBEC"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C13B6EFF3BDC485F995140ECE3BF976B"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\定位线.rfa"
- "TargetName" = "8:定位线.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Gate\\直线形收检台.rfa"
+ "TargetName" = "8:直线形收检台.rfa"
"Tag" = "8:"
- "Folder" = "8:_22185A9B5ACE495C9C8BCA26B0449D39"
+ "Folder" = "8:_9B75B83A53C7405E9D6020ABD06A3A14"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C37253C8AABD42589BAED190AE0CDE5A"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\玻璃贴.rfa"
+ "TargetName" = "8:玻璃贴.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1609,26 +1865,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C6FF377B37424855996572B5E2BEB61F"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\寄件接待台.rfa"
- "TargetName" = "8:寄件接待台.rfa"
- "Tag" = "8:"
- "Folder" = "8:_25CCE212CB504A678EDDBD72886AB43A"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CAD50A370819474CAE14570A68173CEE"
{
"SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\校园文化墙.jpg"
@@ -1649,12 +1885,12 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CC9C60F8D461413288EC370C0920C92C"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CDDEB52E94FD4C9EB222CB9A0A4E5575"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Door\\幕墙门-双扇无边框.rfa"
- "TargetName" = "8:幕墙门-双扇无边框.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\防撞条.rfa"
+ "TargetName" = "8:防撞条.rfa"
"Tag" = "8:"
- "Folder" = "8:_95101E7D92A04E20B44F50DB8CB985F2"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1700,12 +1936,32 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D3A52CF533394306BE31BF10F64FE1D5"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CF02B938C86745D1927C3C5C9BBD5745"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\绿动箱.rfa"
- "TargetName" = "8:绿动箱.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\常规门头.rfa"
+ "TargetName" = "8:常规门头.rfa"
"Tag" = "8:"
- "Folder" = "8:_22185A9B5ACE495C9C8BCA26B0449D39"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D0AB549F50BB4B5A8E0C7C407948585D"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Door\\幕墙门-双扇无边框.rfa"
+ "TargetName" = "8:幕墙门-双扇无边框.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_1DCEC210457E4FB0AB7B04A6A5D03306"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1740,26 +1996,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D8319246C8C8408EB251C395D2AE96DC"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\墙贴.rfa"
- "TargetName" = "8:墙贴.rfa"
- "Tag" = "8:"
- "Folder" = "8:_C85CB0CA2C2345A0B2C9C0FF87BE8120"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DAEA3EBD334748F3B1E7744F406BD951"
{
"SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\绿动区-左.png"
@@ -1800,26 +2036,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DDA25BAD15BC4DD9B2ADFAAACB1721F7"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\寄件收费标准.rfa"
- "TargetName" = "8:寄件收费标准.rfa"
- "Tag" = "8:"
- "Folder" = "8:_22185A9B5ACE495C9C8BCA26B0449D39"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DF52769DF9554461B349B1B3AE1552FD"
{
"SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\取件区-右.png"
@@ -1880,12 +2096,12 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E610A9857548408494D641A285230C00"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E6F75818F7284D35A94F08B41BE960FA"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\FloorFinish\\地砖.rfa"
- "TargetName" = "8:地砖.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Shelf\\三联货架.rfa"
+ "TargetName" = "8:三联货架.rfa"
"Tag" = "8:"
- "Folder" = "8:_27C93A209B574E65A55E2E215127E4C3"
+ "Folder" = "8:_406EA5A50D6D43439512FD26B8E10B12"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1900,32 +2116,32 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E630059FC1F74583A6D79B63068E91E8"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Shelf\\双联货架.rfa"
- "TargetName" = "8:双联货架.rfa"
- "Tag" = "8:"
- "Folder" = "8:_34192A2972BB45D1A082145EEEA9773A"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EB928E26294F4B82AED56A1B76EDB7B4"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E8AFEE9E12CE427AA2AB71E7E62B6567"
{
"SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Gate\\闸机.rfa"
"TargetName" = "8:闸机.rfa"
"Tag" = "8:"
- "Folder" = "8:_E3753D97AE3F45C1A1FADF675C057DDF"
+ "Folder" = "8:_9B75B83A53C7405E9D6020ABD06A3A14"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC425FC610B1482B8A054EB6074A4616"
+ {
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\快递指导规范.rfa"
+ "TargetName" = "8:快递指导规范.rfa"
+ "Tag" = "8:"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1971,72 +2187,12 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F95CC2AEFFC7440299EAE72BBB0BDF42"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FA661FC2BD524B1EBF0D5EDB740D5D0B"
{
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Door\\幕墙门-玻璃门.rfa"
- "TargetName" = "8:幕墙门-玻璃门.rfa"
+ "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\侧招灯箱.rfa"
+ "TargetName" = "8:侧招灯箱.rfa"
"Tag" = "8:"
- "Folder" = "8:_95101E7D92A04E20B44F50DB8CB985F2"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FD377BB244054C0387D5DBE34FFBF893"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\快递指导规范.rfa"
- "TargetName" = "8:快递指导规范.rfa"
- "Tag" = "8:"
- "Folder" = "8:_22185A9B5ACE495C9C8BCA26B0449D39"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FD45C871BDC343889EEEF3DCF7774EE5"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Shelf\\单联货架.rfa"
- "TargetName" = "8:单联货架.rfa"
- "Tag" = "8:"
- "Folder" = "8:_34192A2972BB45D1A082145EEEA9773A"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FE0FD0A8D54944C0B327CF0793F46928"
- {
- "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Shelf\\货架端牌.rfa"
- "TargetName" = "8:货架端牌.rfa"
- "Tag" = "8:"
- "Folder" = "8:_34192A2972BB45D1A082145EEEA9773A"
+ "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2089,7 +2245,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_7C1EF99E309C4A3FB02B902F06BE7F60"
{
- "Name" = "8:RsLibrary"
+ "Name" = "8:RsTools"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -2105,79 +2261,101 @@
"Property" = "8:_0FDD8782BE3C426997F11FB8E6614478"
"Folders"
{
- "{9EF0B969-E518-4E46-987F-47570745A589}:_25CCE212CB504A678EDDBD72886AB43A"
- {
- "Name" = "8:Furniture"
- "AlwaysCreate" = "11:FALSE"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Property" = "8:_B8DD8A54EC844C38B37E6C7890862AC7"
- "Folders"
- {
- }
- }
- "{9EF0B969-E518-4E46-987F-47570745A589}:_27C93A209B574E65A55E2E215127E4C3"
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_18E710EDFE6E40DA8D0A6674502C62B2"
{
"Name" = "8:FloorFinish"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
- "Property" = "8:_FDAFD294A37242DABF1BAFBEA782F915"
+ "Property" = "8:_FB75768CD0DC42D6BE01870E9487BB45"
"Folders"
{
}
}
- "{9EF0B969-E518-4E46-987F-47570745A589}:_34192A2972BB45D1A082145EEEA9773A"
- {
- "Name" = "8:Shelf"
- "AlwaysCreate" = "11:FALSE"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Property" = "8:_C42174D1D7314D31AEF3BDB9DC651ED9"
- "Folders"
- {
- }
- }
- "{9EF0B969-E518-4E46-987F-47570745A589}:_4CF542DBEF2443F1ABCA34DC0C62F229"
- {
- "Name" = "8:Lamp"
- "AlwaysCreate" = "11:FALSE"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Property" = "8:_55A2B0297DE1400A96C0C14B97A19BC9"
- "Folders"
- {
- }
- }
- "{9EF0B969-E518-4E46-987F-47570745A589}:_95101E7D92A04E20B44F50DB8CB985F2"
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_1DCEC210457E4FB0AB7B04A6A5D03306"
{
"Name" = "8:Door"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
- "Property" = "8:_80A2C1CB96D94D66A831BDC91978F5D8"
+ "Property" = "8:_0E131D1E621E4AF987555692269DB07C"
"Folders"
{
}
}
- "{9EF0B969-E518-4E46-987F-47570745A589}:_C85CB0CA2C2345A0B2C9C0FF87BE8120"
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_406EA5A50D6D43439512FD26B8E10B12"
{
- "Name" = "8:Sign"
+ "Name" = "8:Shelf"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
- "Property" = "8:_9C023EF441D44A9DA28424296F2159CB"
+ "Property" = "8:_E20BDEFFA62E4E0AB20264F078C8B707"
"Folders"
{
}
}
- "{9EF0B969-E518-4E46-987F-47570745A589}:_E3753D97AE3F45C1A1FADF675C057DDF"
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_7692A4F9B7D744A3A1E5AFA9F95890CD"
+ {
+ "Name" = "8:Furniture"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_2937B017097146D2A6817AF7E4D5E730"
+ "Folders"
+ {
+ }
+ }
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_9B75B83A53C7405E9D6020ABD06A3A14"
{
"Name" = "8:Gate"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
- "Property" = "8:_E41F9277146C4979BAF4B7F081C7878F"
+ "Property" = "8:_D4C27DCA72014974BE0153F4567A0529"
+ "Folders"
+ {
+ }
+ }
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_B3DF628258C043A6986617245B6F0BEE"
+ {
+ "Name" = "8:WallFinish"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_9539AA0455A14FD69BA524C6CA182A21"
+ "Folders"
+ {
+ }
+ }
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_BD6760C8ED8A40BFA5E98484CCEAA2B0"
+ {
+ "Name" = "8:Sign"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_AAD8831F673B4E9785D1F730886BBBFB"
+ "Folders"
+ {
+ }
+ }
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_BFD89CD05BEB451EA768E58E9AF9EB35"
+ {
+ "Name" = "8:Lamp"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_B8528982D85B476DB1C20E79CCD7C709"
+ "Folders"
+ {
+ }
+ }
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_CCB9CA9C12EE4E23A02C5D6A329D2A50"
+ {
+ "Name" = "8:Location"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_D9480F0D263B466FAC0BB89F6CF1E3F5"
"Folders"
{
}
@@ -2239,15 +2417,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:菜鸟驿站工具集"
- "ProductCode" = "8:{3C7C28E4-ABFB-47B5-A2D2-1D3BE24156C2}"
- "PackageCode" = "8:{EC98D320-1D7C-47B2-B3C8-9F02E7AE396A}"
+ "ProductCode" = "8:{5DCFF0F8-3C6C-4C34-B888-63FE8034843E}"
+ "PackageCode" = "8:{125C2C8A-BD7F-42BD-98CF-9784E5BADD7F}"
"UpgradeCode" = "8:{127EC3EC-7539-468B-84EA-E1ECDD6204E6}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:1.0.2"
+ "ProductVersion" = "8:1.0.3"
"Manufacturer" = "8:YTX Engineering"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
@@ -2704,7 +2882,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FBE461B9D4BD4603919E2821D88FB7CB"
{
- "SourcePath" = "8:..\\RookieStation\\obj\\Debug\\RookieStation.dll"
+ "SourcePath" = "8:"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_7C1EF99E309C4A3FB02B902F06BE7F60"