diff --git a/RookieStation/CommonTools/ViewModels/EncryptOrDecryptFamily.cs b/RookieStation/CommonTools/ViewModels/EncryptOrDecryptFamily.cs index aa83b54..04907dd 100644 --- a/RookieStation/CommonTools/ViewModels/EncryptOrDecryptFamily.cs +++ b/RookieStation/CommonTools/ViewModels/EncryptOrDecryptFamily.cs @@ -51,7 +51,7 @@ namespace RookieStation.CommonTools.ViewModels if (Cancel) break; viewmodel.CurrentValue += 1; - viewmodel.CurrentContext = string.Format("总进度{1}/{2}\r\n正在对<{0}>进行处理", Families[i].Name, viewmodel.CurrentValue, viewmodel.MaxValue); + viewmodel.CurrentContext = $"总进度{viewmodel.CurrentValue}/{viewmodel.MaxValue}\r\n正在对<{Families[i].Name}>进行处理"; try { if (IsEncrypt) diff --git a/RookieStation/Drawing/ExecuteCmds/CmdAutoCreateLegend.cs b/RookieStation/Drawing/ExecuteCmds/CmdAutoCreateLegend.cs index 3e65e93..f6b140e 100644 --- a/RookieStation/Drawing/ExecuteCmds/CmdAutoCreateLegend.cs +++ b/RookieStation/Drawing/ExecuteCmds/CmdAutoCreateLegend.cs @@ -99,7 +99,7 @@ namespace RookieStation.Drawing.ExecuteCmds { try { - newLegend.Name = string.Format("货架说明 {0}", i); + newLegend.Name = $"货架说明 {i}"; break; } catch (Exception) diff --git a/RookieStation/Finishes/ExecuteCmds/CmdFloorFinishes.cs b/RookieStation/Finishes/ExecuteCmds/CmdFloorFinishes.cs index ca2682a..32902de 100644 --- a/RookieStation/Finishes/ExecuteCmds/CmdFloorFinishes.cs +++ b/RookieStation/Finishes/ExecuteCmds/CmdFloorFinishes.cs @@ -31,7 +31,7 @@ namespace RookieStation.Finishes.ExecuteCmds TaskDialog.Show("温馨提示", "项目中当前没有房间"); return Result.Failed; } - WpfFloorFinishes floorCovering = CommonUtils.GenerateWindow(); + WpfFloorFinishes floorCovering = CommonUtils.ShowDialog(); double length; double width; @@ -207,7 +207,7 @@ namespace RookieStation.Finishes.ExecuteCmds { //删除模型线 doc.Delete(modelCurveIds); - string file = UserConstant.FamilyLibraryDirectory + "FloorFinish\\地砖.rfa"; + string file = UserConstant.FamilyLibraryDirectory + "板饰面\\地砖.rfa"; symbol = RsRevitUtils.GetAndActiveDefaultFamilySymbol(doc, file); try { diff --git a/RookieStation/Finishes/ExecuteCmds/CmdPlaceFloorFinishes.cs b/RookieStation/Finishes/ExecuteCmds/CmdPlaceFloorFinishes.cs index 1376d71..78e7f07 100644 --- a/RookieStation/Finishes/ExecuteCmds/CmdPlaceFloorFinishes.cs +++ b/RookieStation/Finishes/ExecuteCmds/CmdPlaceFloorFinishes.cs @@ -27,7 +27,7 @@ namespace RookieStation.Finishes.ExecuteCmds return Result.Failed; } - WpfFloorFinishes floorFinishes = CommonUtils.GenerateWindow(); + WpfFloorFinishes floorFinishes = CommonUtils.ShowDialog(); double length, width, gap, thickness; bool IsByRoom = false; @@ -74,7 +74,7 @@ namespace RookieStation.Finishes.ExecuteCmds private static void CreateCurtainSystemByFace(UIDocument uidoc, double length, double width, double gap, double thickness) { Document doc = uidoc.Document; - Reference faceReference = uidoc.Selection.PickObject(ObjectType.Face, "请选择铺贴面"); + Reference faceReference = uidoc.Selection.PickObject(ObjectType.Face, "请选择铺贴的面"); Element element = doc.GetElement(faceReference); Face face = element.GetGeometryObjectFromReference(faceReference) as Face; FaceArray faceArray = new FaceArray(); @@ -99,7 +99,7 @@ namespace RookieStation.Finishes.ExecuteCmds TaskDialog.Show("温馨提示", "项目中当前没有房间"); return; } - Reference refer = uidoc.Selection.PickObject(ObjectType.Element, new SelectFilter(), "请选择布置的房间"); + Reference refer = uidoc.Selection.PickObject(ObjectType.Element, new SelectFilter(), "请选择铺贴的房间"); Room room = doc.GetElement(refer) as Room; List curveLoops = new List(); var opts = new SpatialElementBoundaryOptions(); @@ -166,9 +166,9 @@ namespace RookieStation.Finishes.ExecuteCmds PanelType panelType = null; MullionType mullionType = null; - string cutainSystemTypeName = String.Format("{0} x {1}mm", length, width); + string cutainSystemTypeName = $"铺贴{length} x {width}mm"; string panelTypeName = "铺贴"; - string mullionTypeName = String.Format("{0} x {1}mm", gap, thickness); + string mullionTypeName = $"{gap} x {thickness}mm"; doc.Invoke(ts => { diff --git a/RookieStation/MailingAreaModule/ExecuteCmds/CmdPlaceReceptionArea.cs b/RookieStation/MailingAreaModule/ExecuteCmds/CmdPlaceReceptionArea.cs index b4532ff..8b783ea 100644 --- a/RookieStation/MailingAreaModule/ExecuteCmds/CmdPlaceReceptionArea.cs +++ b/RookieStation/MailingAreaModule/ExecuteCmds/CmdPlaceReceptionArea.cs @@ -41,7 +41,7 @@ namespace RookieStation.MailingAreaModule.ExecuteCmds Document doc = uidoc.Document; revitWindow = uiapp.MainWindowHandle; - WpfReceptionArea receptionAreaPlacement = CommonUtils.GenerateWindow(); + WpfReceptionArea receptionAreaPlacement = CommonUtils.ShowDialog(); //初始值 //基层厚度 double baseLayerThickness = 15 / 304.8; @@ -201,7 +201,7 @@ namespace RookieStation.MailingAreaModule.ExecuteCmds FamilyInstance signage = null; doc.Invoke(ts => { - string file = UserConstant.FamilyLibraryDirectory + "Sign\\菜鸟使命.rfa"; + string file = UserConstant.FamilyLibraryDirectory + "标识标牌\\菜鸟使命.rfa"; symbol = RsRevitUtils.GetAndActiveDefaultFamilySymbol(doc, file); var endPoint = referline.GetEndPoint(0); @@ -229,7 +229,7 @@ namespace RookieStation.MailingAreaModule.ExecuteCmds FamilyInstance reception = null; doc.Invoke(ts => { - string file = UserConstant.FamilyLibraryDirectory + "Furniture\\寄件接待台.rfa"; + string file = UserConstant.FamilyLibraryDirectory + "家具\\寄件接待台.rfa"; symbol = RsRevitUtils.GetAndActiveDefaultFamilySymbol(doc, file); try { @@ -250,7 +250,7 @@ namespace RookieStation.MailingAreaModule.ExecuteCmds FamilyInstance logo = null; doc.Invoke(ts => { - var file = UserConstant.FamilyLibraryDirectory + "Sign\\菜鸟LOGO.rfa"; + var file = UserConstant.FamilyLibraryDirectory + "标识标牌\\精工背发光字.rfa"; symbol = RsRevitUtils.GetAndActiveDefaultFamilySymbol(doc, file); try { @@ -264,11 +264,11 @@ namespace RookieStation.MailingAreaModule.ExecuteCmds { Log.WriteLog(ex.Message); } - }, "菜鸟LOG布置"); + }, "菜鸟LOGO布置"); doc.Invoke(ts => { - string file = UserConstant.FamilyLibraryDirectory + "Lamp\\吊灯.rfa"; + string file = UserConstant.FamilyLibraryDirectory + "灯具\\艺术吊灯.rfa"; symbol = RsRevitUtils.GetAndActiveDefaultFamilySymbol(doc, file); var referlineDirection = referline.Direction; List lampLocationPoints = new List(); diff --git a/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceEntranceGate.cs b/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceEntranceGate.cs index 53d4d06..8abaae0 100644 --- a/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceEntranceGate.cs +++ b/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceEntranceGate.cs @@ -36,7 +36,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds Document doc = uidoc.Document; revitWindow = uiapp.MainWindowHandle; - WpfEntranceGate entranceGateLayout = CommonUtils.GenerateWindow(); + WpfEntranceGate entranceGateLayout = CommonUtils.ShowDialog(); if (entranceGateLayout.DialogResult != true) { return Result.Cancelled; @@ -94,7 +94,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds offest = 0.0; return; } - Family gateFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Gate\\闸机.rfa"); + Family gateFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "出入口\\三轴手动闸机.rfa"); ElementId symbolId = gateFamily.GetFamilySymbolIds().FirstOrDefault(); FamilySymbol gateSymbol = doc.GetElement(symbolId) as FamilySymbol; offest = gateSymbol.GetParameters("深度").FirstOrDefault().AsDouble() / 2; diff --git a/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceExitGate.cs b/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceExitGate.cs index eb1c0e8..7d0b985 100644 --- a/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceExitGate.cs +++ b/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceExitGate.cs @@ -44,7 +44,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds Document doc = uidoc.Document; revitWindow = uiapp.MainWindowHandle; - WpfExitGate gateLayout = CommonUtils.GenerateWindow(); + WpfExitGate gateLayout = CommonUtils.ShowDialog(); if (gateLayout.DialogResult == true) { @@ -101,11 +101,11 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds List locationPoint = new List(); doc.Invoke(ts => { - Family gateFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Gate\\收检台-左.rfa"); + Family gateFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "出入口\\收检台-左.rfa"); IEnumerable leftSymbolId = from id in gateFamily.GetFamilySymbolIds() where doc.GetElement(id).Name.Contains("左") select id; - gateFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Gate\\收检台-右.rfa"); + gateFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "出入口\\收检台-右.rfa"); IEnumerable rightSymbolId = from id in gateFamily.GetFamilySymbolIds() where doc.GetElement(id).Name.Contains("右") select id; diff --git a/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceLamps.cs b/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceLamps.cs index 9ac05dd..180d41a 100644 --- a/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceLamps.cs +++ b/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceLamps.cs @@ -33,7 +33,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds TaskDialog.Show("温馨提示", "项目中当前没有房间"); return Result.Cancelled; } - WpfLampsLayout placeLamps = CommonUtils.GenerateWindow(); + WpfLampsLayout placeLamps = CommonUtils.ShowDialog(); if (placeLamps.DialogResult == true) { @@ -190,7 +190,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds { //删除模型线 doc.Delete(modelCurveIds); - string file = UserConstant.FamilyLibraryDirectory + "Lamp\\筒灯.rfa"; + string file = UserConstant.FamilyLibraryDirectory + "灯具\\明装筒灯.rfa"; symbol = RsRevitUtils.GetAndActiveDefaultFamilySymbol(doc, file); try { diff --git a/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceShelves.cs b/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceShelves.cs index d4eb677..19884f8 100644 --- a/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceShelves.cs +++ b/RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceShelves.cs @@ -46,7 +46,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds UIDocument uidoc = uiapp.ActiveUIDocument; Autodesk.Revit.DB.Document doc = uidoc.Document; revitWindow = uiapp.MainWindowHandle; - WpfShelvesLayout placement = CommonUtils.GenerateWindow(); + WpfShelvesLayout placement = CommonUtils.ShowDialog(); if (placement.DialogResult != true) { @@ -93,7 +93,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds double parallelReferlineOffest = vm.ParallelReferlineOffest / 304.8; //参考线起点垂直于参考线的偏移量 double verticalReferlineOffest = vm.VerticalReferlineOffest / 304.8; - shelfFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Shelf\\单联货架.rfa"); + shelfFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "货架\\仓储货架.rfa"); for (int i = 0; i < shelves.Count; i++) { @@ -327,7 +327,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds { doc.Invoke(ts => { - string file = UserConstant.FamilyLibraryDirectory + "Others\\吊线.rfa"; + string file = UserConstant.FamilyLibraryDirectory + "其他\\吊线.rfa"; FamilySymbol symbol = RsRevitUtils.GetAndActiveDefaultFamilySymbol(doc, file); try { @@ -448,7 +448,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds List locs = new List(); Locations = locs; - string file = UserConstant.FamilyLibraryDirectory + "Lamp\\筒灯.rfa"; + string file = UserConstant.FamilyLibraryDirectory + "灯具\\明装筒灯.rfa"; List instanceCreationDatas = new List(); for (int i = 0; i < firstRowPoints.Count; i++) @@ -552,7 +552,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds case NumOfGroup.Single: for (int j = 0; j < cardInstances.Count(); j++) { - cardInstances[j].GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}", currentnum)); + cardInstances[j].GetParameters("货架号").FirstOrDefault().Set($"{currentnum}"); } currentnum += 1; @@ -566,7 +566,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds } for (int j = 0; j < cardInstances.Count(); j++) { - cardInstances[j].GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", currentnum, currentnum + 1)); + cardInstances[j].GetParameters("货架号").FirstOrDefault().Set($"{currentnum}~{currentnum + 1}"); } //最后一个需要加上组合数作为下一列的开始 if (i == shelfInstances.Count - 1) @@ -583,7 +583,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds } for (int j = 0; j < cardInstances.Count(); j++) { - cardInstances[j].GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", currentnum, currentnum + 2)); + cardInstances[j].GetParameters("货架号").FirstOrDefault().Set($"{currentnum}~{currentnum + 2}"); } //最后一个需要加上组合数作为下一列的开始 if (i == shelfInstances.Count - 1) @@ -777,7 +777,7 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds { var shelfwidth = fi.Symbol.GetParameters("宽度").FirstOrDefault().AsDouble(); - Family card = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Shelf\\货架端牌.rfa"); + Family card = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "货架\\货架端牌.rfa"); var cardsymbolIds = card.GetFamilySymbolIds(); FamilySymbol cardsymbol = null; diff --git a/RookieStation/ParcelAreaModule/Models/Shelf.cs b/RookieStation/ParcelAreaModule/Models/Shelf.cs index b4c6453..cde3fc3 100644 --- a/RookieStation/ParcelAreaModule/Models/Shelf.cs +++ b/RookieStation/ParcelAreaModule/Models/Shelf.cs @@ -35,6 +35,6 @@ namespace RookieStation.ParcelAreaModule.Models } } - public string SymbolName => String.Format("{0}mmx{1}mm", CommonUtils.GetEnumDescription(ShelfLength), CommonUtils.GetEnumDescription(ShelfWidth)); + public string SymbolName => $"{CommonUtils.GetEnumDescription(ShelfLength)}mmx{CommonUtils.GetEnumDescription(ShelfWidth)}mm"; } } \ No newline at end of file diff --git a/RookieStation/ParcelAreaModule/Views/WpfShelfCards.xaml.cs b/RookieStation/ParcelAreaModule/Views/WpfShelfCards.xaml.cs index cbe596a..db1e0f9 100644 --- a/RookieStation/ParcelAreaModule/Views/WpfShelfCards.xaml.cs +++ b/RookieStation/ParcelAreaModule/Views/WpfShelfCards.xaml.cs @@ -67,7 +67,7 @@ namespace RookieStation.ParcelAreaModule.Views private void NumberCards(WpfShelfCards wpfShelfCards, UIDocument uidoc) { Document doc = uidoc.Document; - int CurrentNumber = wpfShelfCards.CurrentNumber; + int currentNumber = wpfShelfCards.CurrentNumber; bool isContinue = wpfShelfCards.IsContinue; int GroupNumber = wpfShelfCards.GroupNumber; try @@ -82,20 +82,20 @@ namespace RookieStation.ParcelAreaModule.Views { continue; } - Reference cards_refer = uidoc.Selection.PickObject(ObjectType.Element, new CardsSelectedFilter(instances), "请选择起始端牌"); - var first_card = doc.GetElement(cards_refer) as FamilyInstance; - var location_point = RsRevitUtils.GetLocationPointByElement(first_card); + Reference cardRefer = uidoc.Selection.PickObject(ObjectType.Element, new CardsSelectedFilter(instances), "请选择起始端牌"); + var firstCard = doc.GetElement(cardRefer) as FamilyInstance; + var firstLocation = RsRevitUtils.GetLocationPointByElement(firstCard); - List location_points = new List(); + List locationPoints = new List(); instances.ForEach(f => { var p = RsRevitUtils.GetLocationPointByElement(f); - location_points.Add(p); + locationPoints.Add(p); }); - var line_direction = location_points.LastOrDefault() - location_points.FirstOrDefault(); - Line line = Line.CreateUnbound(location_points.FirstOrDefault(), line_direction); + var line_direction = locationPoints.LastOrDefault() - locationPoints.FirstOrDefault(); + Line line = Line.CreateUnbound(locationPoints.FirstOrDefault(), line_direction); //是否共线 - foreach (var p in location_points) + foreach (var p in locationPoints) { if (line.Distance(p) > 0.01) { @@ -103,71 +103,52 @@ namespace RookieStation.ParcelAreaModule.Views return; } } - Dictionary dict_instance_double = new Dictionary(); + Dictionary dictInstanceDouble = new Dictionary(); foreach (var f in instances) { var p = RsRevitUtils.GetLocationPointByElement(f); - var distance = location_point.DistanceTo(p); - dict_instance_double.Add(f, distance); + var distance = firstLocation.DistanceTo(p); + dictInstanceDouble.Add(f, distance); } - var dict_sorted = dict_instance_double.OrderBy(x => x.Value); - int last_number = 0; + var dictSorted = dictInstanceDouble.OrderBy(x => x.Value); + int lastNumber = 0; doc.Invoke(ts => { if (GroupNumber == 1) { - for (int i = 0; i < dict_sorted.Count(); i++) + for (int i = 0; i < dictSorted.Count(); i++) { - var finstance = dict_sorted.ElementAt(i).Key; - string current_num_str = CurrentNumber.ToString(); - if (CurrentNumber < 10) + var finstance = dictSorted.ElementAt(i).Key; + string currenNumStr = currentNumber.ToString(); + if (currentNumber < 10) { - current_num_str = $"0{current_num_str}"; + currenNumStr = $"0{currenNumStr}"; } - finstance.GetParameters("货架号").FirstOrDefault().Set(current_num_str); + finstance.GetParameters("货架号").FirstOrDefault().Set(currenNumStr); - CurrentNumber += 1; - } - } - else if (GroupNumber == 2) - { - for (int i = 0; i < dict_sorted.Count(); i++) - { - last_number = CurrentNumber + 1; - string current_num_str = CurrentNumber.ToString(); - string last_num_str = last_number.ToString(); - - if (CurrentNumber < 10) - { - current_num_str = $"0{current_num_str}"; - } - if (last_number < 10) - { - last_num_str = $"0{last_number}"; - } - var finstance = dict_sorted.ElementAt(i).Key; - finstance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", current_num_str, last_num_str)); - CurrentNumber = last_number + 1; + currentNumber += 1; } } else { - for (int i = 0; i < dict_sorted.Count(); i++) + for (int i = 0; i < dictSorted.Count(); i++) { - last_number = CurrentNumber + 2; - string current_num_str = CurrentNumber.ToString(); - string last_num_str = last_number.ToString(); - if (CurrentNumber < 10) + lastNumber = currentNumber + GroupNumber - 1; + string currentNumStr = currentNumber.ToString(); + string lastNumStr = lastNumber.ToString(); + + if (currentNumber < 10) { - current_num_str = $"0{current_num_str}"; + currentNumStr = $"0{currentNumStr}"; } - if (last_number < 10) + if (lastNumber < 10) { - last_num_str = $"0{last_number}"; + lastNumStr = $"0{lastNumber}"; } - var finstance = dict_sorted.ElementAt(i).Key; - finstance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", current_num_str, last_num_str)); - CurrentNumber = last_number + 1; + var finstance = dictSorted.ElementAt(i).Key; + finstance.GetParameters("货架号").FirstOrDefault().Set($"{currentNumStr}~{lastNumStr}"); + //finstance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", current_num_str, last_num_str)); + currentNumber = lastNumber + 1; } } }, "端牌编号"); @@ -177,7 +158,7 @@ namespace RookieStation.ParcelAreaModule.Views { if (wpfShelfCards != null) { - wpfShelfCards.tbCurrentNum.Text = CurrentNumber.ToString(); + wpfShelfCards.tbCurrentNum.Text = currentNumber.ToString(); wpfShelfCards.ShowDialog(); } } @@ -193,22 +174,56 @@ namespace RookieStation.ParcelAreaModule.Views { while (isCoutinue) { + List instances = uidoc.Selection.PickElementsByRectangle(new ShelfFilter(), "请框选需要布置端牌的货架") + .Cast() + .ToList(); + if (instances.Count == 0) + { + continue; + } + Reference cardRefer = uidoc.Selection.PickObject(ObjectType.Element, new ShelvessSelectedFilter(instances), "请选择起始货架"); + FamilyInstance firstShelf = doc.GetElement(cardRefer) as FamilyInstance; + var firstLocation = RsRevitUtils.GetLocationPointByElement(firstShelf); + + List locationPoints = new List(); + instances.ForEach(f => + { + var p = RsRevitUtils.GetLocationPointByElement(f); + locationPoints.Add(p); + }); + var line_direction = locationPoints.LastOrDefault() - locationPoints.FirstOrDefault(); + Line line = Line.CreateUnbound(locationPoints.FirstOrDefault(), line_direction); + //是否共线 + foreach (var p in locationPoints) + { + if (line.Distance(p) > 0.01) + { + TaskDialog.Show("温馨提示", "所选货架不在一条直线上"); + return; + } + } + Dictionary dictInstanceDouble = new Dictionary(); + foreach (var f in instances) + { + var p = RsRevitUtils.GetLocationPointByElement(f); + var distance = firstLocation.DistanceTo(p); + dictInstanceDouble.Add(f, distance); + } + var dictSorted = dictInstanceDouble.OrderBy(x => x.Value); + + Reference front_face = firstShelf.GetReferences(FamilyInstanceReferenceType.Front).FirstOrDefault(); + Reference back_face = firstShelf.GetReferences(FamilyInstanceReferenceType.Back).FirstOrDefault(); + + var hand = firstShelf.HandOrientation; + + var width = firstShelf.Symbol.GetParameters("宽度").FirstOrDefault().AsDouble(); + doc.Invoke(ts => { - Reference refer_shelf = uidoc.Selection.PickObject(ObjectType.Element, new ShelfFilter(), "请选择布置端牌的货架"); - FamilyInstance shelf = doc.GetElement(refer_shelf) as FamilyInstance; - int LastNum = CurrentNumber + wpfShelfCards.GroupNumber - 1; - var location_XYZ = RsRevitUtils.GetLocationPointByElement(shelf); - Reference front_face = shelf.GetReferences(FamilyInstanceReferenceType.Front).FirstOrDefault(); - Reference back_face = shelf.GetReferences(FamilyInstanceReferenceType.Back).FirstOrDefault(); - - var hand = shelf.HandOrientation; - - var width = shelf.Symbol.GetParameters("宽度").FirstOrDefault().AsDouble(); - string file = UserConstant.FamilyLibraryDirectory + "Shelf\\货架端牌.rfa"; + string file = UserConstant.FamilyLibraryDirectory + "货架\\货架端牌.rfa"; Family family = RsRevitUtils.GetLoadedFamily(doc, file); - var symbolIds = family.GetFamilySymbolIds(); + ISet symbolIds = family.GetFamilySymbolIds(); FamilySymbol symbol = null; foreach (ElementId syid in symbolIds) @@ -225,28 +240,44 @@ namespace RookieStation.ParcelAreaModule.Views { symbol.Activate(); } - if (shelf.HandFlipped) + if (firstShelf.HandFlipped) { hand = -hand; } - var front_instance = doc.Create.NewFamilyInstance(front_face, location_XYZ, hand, symbol); - if (front_instance.CanFlipWorkPlane) + + for (int i = 0; i < dictSorted.Count(); i++) { - front_instance.IsWorkPlaneFlipped = true; + var location_XYZ = RsRevitUtils.GetLocationPointByElement(dictSorted.ElementAt(i).Key); + int LastNum = CurrentNumber + wpfShelfCards.GroupNumber - 1; + + var frontInstance = doc.Create.NewFamilyInstance(front_face, location_XYZ, hand, symbol); + if (frontInstance.CanFlipWorkPlane) + { + frontInstance.IsWorkPlaneFlipped = true; + } + var backInstance = doc.Create.NewFamilyInstance(back_face, location_XYZ, -hand, symbol); + string cardStr = string.Empty; + string firstNumber = $"{CurrentNumber}"; + string lastNumber = $"{LastNum}"; + if (CurrentNumber < 10) + { + firstNumber = $"0{CurrentNumber}"; + } + if (LastNum < 10) + { + lastNumber = $"0{LastNum}"; + } + cardStr = $"{firstNumber}~{lastNumber}"; + frontInstance.GetParameters("货架号").FirstOrDefault().Set(cardStr); + backInstance.GetParameters("货架号").FirstOrDefault().Set(cardStr); + if (GroupNumber == 1) + { + frontInstance.GetParameters("货架号").FirstOrDefault().Set(CurrentNumber.ToString()); + backInstance.GetParameters("货架号").FirstOrDefault().Set(CurrentNumber.ToString()); + } + CurrentNumber = LastNum + 1; } - var back_instance = doc.Create.NewFamilyInstance(back_face, location_XYZ, -hand, symbol); - - front_instance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", CurrentNumber, LastNum)); - - back_instance.GetParameters("货架号").FirstOrDefault().Set(string.Format("{0}~{1}", CurrentNumber, LastNum)); - if (GroupNumber == 1) - { - front_instance.GetParameters("货架号").FirstOrDefault().Set(CurrentNumber.ToString()); - back_instance.GetParameters("货架号").FirstOrDefault().Set(CurrentNumber.ToString()); - } - CurrentNumber = LastNum + 1; - #region 备用 //List placeFaces = new List(); @@ -351,4 +382,32 @@ namespace RookieStation.ParcelAreaModule.Views throw new NotImplementedException(); } } + + internal class ShelvessSelectedFilter : ISelectionFilter + { + private List fis; + + internal ShelvessSelectedFilter(List familyInstances) + { + fis = familyInstances; + } + + public bool AllowElement(Element elem) + { + FamilyInstance fi = elem as FamilyInstance; + foreach (FamilyInstance instance in fis) + { + if (fi != null && fi.UniqueId == instance.UniqueId) + { + return true; + } + } + return false; + } + + public bool AllowReference(Reference reference, XYZ position) + { + return true; + } + } } \ No newline at end of file diff --git a/RookieStation/ParcelAreaModule/Views/WpfShelvesLayout.xaml.cs b/RookieStation/ParcelAreaModule/Views/WpfShelvesLayout.xaml.cs index 3666023..f86ca07 100644 --- a/RookieStation/ParcelAreaModule/Views/WpfShelvesLayout.xaml.cs +++ b/RookieStation/ParcelAreaModule/Views/WpfShelvesLayout.xaml.cs @@ -68,8 +68,7 @@ namespace RookieStation.ParcelAreaModule.Views for (int i = 0; i < vm.Data.Count; i++) { Shelf shelf = vm.Data[i]; - string str = string.Format("{0},{1},{2}" - , CommonUtils.GetEnumDescription(shelf.NumOfGroup).ToString(), CommonUtils.GetEnumDescription(shelf.ShelfLength), CommonUtils.GetEnumDescription(shelf.ShelfWidth)); + string str = $"{CommonUtils.GetEnumDescription(shelf.NumOfGroup)},{CommonUtils.GetEnumDescription(shelf.ShelfLength)},{CommonUtils.GetEnumDescription(shelf.ShelfWidth)}"; sc.Add(str); } Properties.Settings.Default.Shelves = sc; diff --git a/RookieStation/ProjectConfig/ExcuteCmd/CmdProjectSettings.cs b/RookieStation/ProjectConfig/ExcuteCmd/CmdProjectSettings.cs index 605077d..aa0ebb7 100644 --- a/RookieStation/ProjectConfig/ExcuteCmd/CmdProjectSettings.cs +++ b/RookieStation/ProjectConfig/ExcuteCmd/CmdProjectSettings.cs @@ -16,7 +16,7 @@ namespace RookieStation.ProjectConfig.ExecuteCmds UIApplication uiapp = commandData.Application; UIDocument uidoc = uiapp.ActiveUIDocument; Document doc = uidoc.Document; - WpfProjectSettings settings = CommonUtils.GenerateWindow(); + WpfProjectSettings settings = CommonUtils.ShowDialog(); doc.Invoke(ts => { doc.ProjectInformation.get_Parameter(BuiltInParameter.PROJECT_BUILDING_NAME).Set(Properties.Settings.Default.SchoolName); diff --git a/RookieStation/RookieStation.csproj b/RookieStation/RookieStation.csproj index 22b1809..f236a19 100644 --- a/RookieStation/RookieStation.csproj +++ b/RookieStation/RookieStation.csproj @@ -107,6 +107,7 @@ WpfLegendCreator.xaml + @@ -193,43 +194,88 @@ SettingsSingleFileGenerator Settings.Designer.cs - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + Always @@ -239,97 +285,76 @@ Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - + Always diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-右.0001.rfa b/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-右.0001.rfa deleted file mode 100644 index a320611..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-右.0001.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-右.0002.rfa b/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-右.0002.rfa deleted file mode 100644 index 4aec619..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-右.0002.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-左.0001.rfa b/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-左.0001.rfa deleted file mode 100644 index d1c5d43..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-左.0001.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/直线形收检台.0001.rfa b/RookieStation/RsLibrary/FamilyLibrary/Gate/直线形收检台.0001.rfa deleted file mode 100644 index 5924c76..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Gate/直线形收检台.0001.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/简易收检台.0001.rfa b/RookieStation/RsLibrary/FamilyLibrary/Gate/简易收检台.0001.rfa deleted file mode 100644 index 36d2ec1..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Gate/简易收检台.0001.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Lamp/吊灯.rfa b/RookieStation/RsLibrary/FamilyLibrary/Lamp/吊灯.rfa deleted file mode 100644 index 2f5d1e9..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Lamp/吊灯.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Lamp/筒灯.rfa b/RookieStation/RsLibrary/FamilyLibrary/Lamp/筒灯.rfa deleted file mode 100644 index f246feb..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Lamp/筒灯.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Shelf/三联货架.rfa b/RookieStation/RsLibrary/FamilyLibrary/Shelf/三联货架.rfa deleted file mode 100644 index 2c39a46..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Shelf/三联货架.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Shelf/双联货架.rfa b/RookieStation/RsLibrary/FamilyLibrary/Shelf/双联货架.rfa deleted file mode 100644 index 47cf4a7..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Shelf/双联货架.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Shelf/货架端牌.rfa b/RookieStation/RsLibrary/FamilyLibrary/Shelf/货架端牌.rfa deleted file mode 100644 index 563d175..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Shelf/货架端牌.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/快递指导规范.rfa b/RookieStation/RsLibrary/FamilyLibrary/Sign/快递指导规范.rfa deleted file mode 100644 index 45e185f..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Sign/快递指导规范.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/菜鸟LOGO.rfa b/RookieStation/RsLibrary/FamilyLibrary/Sign/菜鸟LOGO.rfa deleted file mode 100644 index cf56b13..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Sign/菜鸟LOGO.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/防撞条.rfa b/RookieStation/RsLibrary/FamilyLibrary/Sign/防撞条.rfa deleted file mode 100644 index 0023f96..0000000 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Sign/防撞条.rfa and /dev/null differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Others/吊线.rfa b/RookieStation/RsLibrary/FamilyLibrary/其他/吊线.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Others/吊线.rfa rename to RookieStation/RsLibrary/FamilyLibrary/其他/吊线.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Location/定位线.rfa b/RookieStation/RsLibrary/FamilyLibrary/其他/定位线.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Location/定位线.rfa rename to RookieStation/RsLibrary/FamilyLibrary/其他/定位线.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/L型收检台.rfa b/RookieStation/RsLibrary/FamilyLibrary/出入口/L型收检台.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Gate/L型收检台.rfa rename to RookieStation/RsLibrary/FamilyLibrary/出入口/L型收检台.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/出入口/三轴手动闸机.rfa b/RookieStation/RsLibrary/FamilyLibrary/出入口/三轴手动闸机.rfa new file mode 100644 index 0000000..c020e7e Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/出入口/三轴手动闸机.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/三辊闸机.rfa b/RookieStation/RsLibrary/FamilyLibrary/出入口/三辊闸机.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Gate/三辊闸机.rfa rename to RookieStation/RsLibrary/FamilyLibrary/出入口/三辊闸机.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-右.rfa b/RookieStation/RsLibrary/FamilyLibrary/出入口/收检台-右.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-右.rfa rename to RookieStation/RsLibrary/FamilyLibrary/出入口/收检台-右.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-左.rfa b/RookieStation/RsLibrary/FamilyLibrary/出入口/收检台-左.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-左.rfa rename to RookieStation/RsLibrary/FamilyLibrary/出入口/收检台-左.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-左.0002.rfa b/RookieStation/RsLibrary/FamilyLibrary/出入口/收检台.rfa similarity index 62% rename from RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-左.0002.rfa rename to RookieStation/RsLibrary/FamilyLibrary/出入口/收检台.rfa index 5617eca..3c4187b 100644 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Gate/收检台-左.0002.rfa and b/RookieStation/RsLibrary/FamilyLibrary/出入口/收检台.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/直线形收检台.rfa b/RookieStation/RsLibrary/FamilyLibrary/出入口/直线形收检台.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Gate/直线形收检台.rfa rename to RookieStation/RsLibrary/FamilyLibrary/出入口/直线形收检台.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/简易收检台.rfa b/RookieStation/RsLibrary/FamilyLibrary/出入口/简易收检台.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Gate/简易收检台.rfa rename to RookieStation/RsLibrary/FamilyLibrary/出入口/简易收检台.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Gate/闸机.rfa b/RookieStation/RsLibrary/FamilyLibrary/出入口/闸机.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Gate/闸机.rfa rename to RookieStation/RsLibrary/FamilyLibrary/出入口/闸机.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/WallFinish/校园文化墙.rfa b/RookieStation/RsLibrary/FamilyLibrary/墙饰面/校园文化墙.rfa similarity index 50% rename from RookieStation/RsLibrary/FamilyLibrary/WallFinish/校园文化墙.rfa rename to RookieStation/RsLibrary/FamilyLibrary/墙饰面/校园文化墙.rfa index 59ecf83..caaf121 100644 Binary files a/RookieStation/RsLibrary/FamilyLibrary/WallFinish/校园文化墙.rfa and b/RookieStation/RsLibrary/FamilyLibrary/墙饰面/校园文化墙.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/WallFinish/背景墙.rfa b/RookieStation/RsLibrary/FamilyLibrary/墙饰面/背景墙.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/WallFinish/背景墙.rfa rename to RookieStation/RsLibrary/FamilyLibrary/墙饰面/背景墙.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/1.5m绿动箱.rfa b/RookieStation/RsLibrary/FamilyLibrary/家具/1.5m绿动箱.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Furniture/1.5m绿动箱.rfa rename to RookieStation/RsLibrary/FamilyLibrary/家具/1.5m绿动箱.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/3.0m绿动箱.rfa b/RookieStation/RsLibrary/FamilyLibrary/家具/3.0m绿动箱.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Furniture/3.0m绿动箱.rfa rename to RookieStation/RsLibrary/FamilyLibrary/家具/3.0m绿动箱.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/L型收检接待台.rfa b/RookieStation/RsLibrary/FamilyLibrary/家具/L型收检接待台.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Furniture/L型收检接待台.rfa rename to RookieStation/RsLibrary/FamilyLibrary/家具/L型收检接待台.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/咖餐厅座椅组.rfa b/RookieStation/RsLibrary/FamilyLibrary/家具/咖餐厅座椅组.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Furniture/咖餐厅座椅组.rfa rename to RookieStation/RsLibrary/FamilyLibrary/家具/咖餐厅座椅组.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/圆形餐桌组.rfa b/RookieStation/RsLibrary/FamilyLibrary/家具/圆形餐桌组.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Furniture/圆形餐桌组.rfa rename to RookieStation/RsLibrary/FamilyLibrary/家具/圆形餐桌组.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/寄件接待台-带收检台.rfa b/RookieStation/RsLibrary/FamilyLibrary/家具/寄件接待台-带收检台.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Furniture/寄件接待台-带收检台.rfa rename to RookieStation/RsLibrary/FamilyLibrary/家具/寄件接待台-带收检台.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/寄件接待台.rfa b/RookieStation/RsLibrary/FamilyLibrary/家具/寄件接待台.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Furniture/寄件接待台.rfa rename to RookieStation/RsLibrary/FamilyLibrary/家具/寄件接待台.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/拆包桌.rfa b/RookieStation/RsLibrary/FamilyLibrary/家具/拆包桌.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Furniture/拆包桌.rfa rename to RookieStation/RsLibrary/FamilyLibrary/家具/拆包桌.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/绿动箱.rfa b/RookieStation/RsLibrary/FamilyLibrary/家具/绿动箱.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Furniture/绿动箱.rfa rename to RookieStation/RsLibrary/FamilyLibrary/家具/绿动箱.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Furniture/钢制桌椅.rfa b/RookieStation/RsLibrary/FamilyLibrary/家具/钢制桌椅.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Furniture/钢制桌椅.rfa rename to RookieStation/RsLibrary/FamilyLibrary/家具/钢制桌椅.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/开关/三联开关 - 暗装.rfa b/RookieStation/RsLibrary/FamilyLibrary/开关/三联开关 - 暗装.rfa new file mode 100644 index 0000000..39abf8d Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/开关/三联开关 - 暗装.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/开关/单联开关 - 暗装.rfa b/RookieStation/RsLibrary/FamilyLibrary/开关/单联开关 - 暗装.rfa new file mode 100644 index 0000000..e0793ed Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/开关/单联开关 - 暗装.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/开关/双联开关 - 暗装.rfa b/RookieStation/RsLibrary/FamilyLibrary/开关/双联开关 - 暗装.rfa new file mode 100644 index 0000000..08b5d8f Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/开关/双联开关 - 暗装.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/插座/单相地面二三孔插座.rfa b/RookieStation/RsLibrary/FamilyLibrary/插座/单相地面二三孔插座.rfa new file mode 100644 index 0000000..939bb4e Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/插座/单相地面二三孔插座.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/插座/单相暗装二三孔插座.rfa b/RookieStation/RsLibrary/FamilyLibrary/插座/单相暗装二三孔插座.rfa new file mode 100644 index 0000000..9d45fb9 Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/插座/单相暗装二三孔插座.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/FloorFinish/地砖.rfa b/RookieStation/RsLibrary/FamilyLibrary/板饰面/地砖.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/FloorFinish/地砖.rfa rename to RookieStation/RsLibrary/FamilyLibrary/板饰面/地砖.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/FloorFinish/自适应地砖.rfa b/RookieStation/RsLibrary/FamilyLibrary/板饰面/自适应地砖.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/FloorFinish/自适应地砖.rfa rename to RookieStation/RsLibrary/FamilyLibrary/板饰面/自适应地砖.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/标识标牌/亚克力水晶字.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/亚克力水晶字.rfa new file mode 100644 index 0000000..77181be Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/亚克力水晶字.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/侧招灯箱.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/侧招灯箱.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Sign/侧招灯箱.rfa rename to RookieStation/RsLibrary/FamilyLibrary/标识标牌/侧招灯箱.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/台卡.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/台卡.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Sign/台卡.rfa rename to RookieStation/RsLibrary/FamilyLibrary/标识标牌/台卡.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/四牌.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/四牌.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Sign/四牌.rfa rename to RookieStation/RsLibrary/FamilyLibrary/标识标牌/四牌.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/地贴.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/地贴.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Sign/地贴.rfa rename to RookieStation/RsLibrary/FamilyLibrary/标识标牌/地贴.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/墙贴.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/墙贴.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Sign/墙贴.rfa rename to RookieStation/RsLibrary/FamilyLibrary/标识标牌/墙贴.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/寄件收费标准.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/寄件收费标准.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Sign/寄件收费标准.rfa rename to RookieStation/RsLibrary/FamilyLibrary/标识标牌/寄件收费标准.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/常规门头.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/常规门头.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Sign/常规门头.rfa rename to RookieStation/RsLibrary/FamilyLibrary/标识标牌/常规门头.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/标识标牌/快递指导规范.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/快递指导规范.rfa new file mode 100644 index 0000000..6a20f21 Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/快递指导规范.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/玻璃贴.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/玻璃贴.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Sign/玻璃贴.rfa rename to RookieStation/RsLibrary/FamilyLibrary/标识标牌/玻璃贴.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/标识标牌/精工背发光字.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/精工背发光字.rfa new file mode 100644 index 0000000..19a2519 Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/精工背发光字.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/标识标牌/腰封玻璃贴.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/腰封玻璃贴.rfa new file mode 100644 index 0000000..efacef0 Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/腰封玻璃贴.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Sign/菜鸟使命.rfa b/RookieStation/RsLibrary/FamilyLibrary/标识标牌/菜鸟使命.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Sign/菜鸟使命.rfa rename to RookieStation/RsLibrary/FamilyLibrary/标识标牌/菜鸟使命.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/灯具/支架灯.rfa b/RookieStation/RsLibrary/FamilyLibrary/灯具/支架灯.rfa new file mode 100644 index 0000000..a35999b Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/灯具/支架灯.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/灯具/明装筒灯.0001.rfa b/RookieStation/RsLibrary/FamilyLibrary/灯具/明装筒灯.0001.rfa new file mode 100644 index 0000000..dd963bb Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/灯具/明装筒灯.0001.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/灯具/明装筒灯.0002.rfa b/RookieStation/RsLibrary/FamilyLibrary/灯具/明装筒灯.0002.rfa new file mode 100644 index 0000000..a63a804 Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/灯具/明装筒灯.0002.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/灯具/明装筒灯.rfa b/RookieStation/RsLibrary/FamilyLibrary/灯具/明装筒灯.rfa new file mode 100644 index 0000000..e58f787 Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/灯具/明装筒灯.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/灯具/艺术吊灯.rfa b/RookieStation/RsLibrary/FamilyLibrary/灯具/艺术吊灯.rfa new file mode 100644 index 0000000..674ec1e Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/灯具/艺术吊灯.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/灯具/轨道射灯.rfa b/RookieStation/RsLibrary/FamilyLibrary/灯具/轨道射灯.rfa new file mode 100644 index 0000000..410fddb Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/灯具/轨道射灯.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/设备/家用配电箱.rfa b/RookieStation/RsLibrary/FamilyLibrary/设备/家用配电箱.rfa new file mode 100644 index 0000000..52134fe Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/设备/家用配电箱.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Equipment/自助寄件机.rfa b/RookieStation/RsLibrary/FamilyLibrary/设备/自助寄件机.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Equipment/自助寄件机.rfa rename to RookieStation/RsLibrary/FamilyLibrary/设备/自助寄件机.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/设备/配电箱.rfa b/RookieStation/RsLibrary/FamilyLibrary/设备/配电箱.rfa new file mode 100644 index 0000000..a614751 Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/设备/配电箱.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Shelf/单联货架.rfa b/RookieStation/RsLibrary/FamilyLibrary/货架/仓储货架.rfa similarity index 53% rename from RookieStation/RsLibrary/FamilyLibrary/Shelf/单联货架.rfa rename to RookieStation/RsLibrary/FamilyLibrary/货架/仓储货架.rfa index 2097b39..f59ed90 100644 Binary files a/RookieStation/RsLibrary/FamilyLibrary/Shelf/单联货架.rfa and b/RookieStation/RsLibrary/FamilyLibrary/货架/仓储货架.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/货架/货架端牌.rfa b/RookieStation/RsLibrary/FamilyLibrary/货架/货架端牌.rfa new file mode 100644 index 0000000..e4dad91 Binary files /dev/null and b/RookieStation/RsLibrary/FamilyLibrary/货架/货架端牌.rfa differ diff --git a/RookieStation/RsLibrary/FamilyLibrary/Door/双扇平开防火子母门.rfa b/RookieStation/RsLibrary/FamilyLibrary/门/双扇平开防火子母门.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Door/双扇平开防火子母门.rfa rename to RookieStation/RsLibrary/FamilyLibrary/门/双扇平开防火子母门.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Door/幕墙门-双扇无边框.rfa b/RookieStation/RsLibrary/FamilyLibrary/门/幕墙门-双扇无边框.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Door/幕墙门-双扇无边框.rfa rename to RookieStation/RsLibrary/FamilyLibrary/门/幕墙门-双扇无边框.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Door/幕墙门-玻璃门.rfa b/RookieStation/RsLibrary/FamilyLibrary/门/幕墙门-玻璃门.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Door/幕墙门-玻璃门.rfa rename to RookieStation/RsLibrary/FamilyLibrary/门/幕墙门-玻璃门.rfa diff --git a/RookieStation/RsLibrary/FamilyLibrary/Door/防火卷帘-中装.rfa b/RookieStation/RsLibrary/FamilyLibrary/门/防火卷帘-中装.rfa similarity index 100% rename from RookieStation/RsLibrary/FamilyLibrary/Door/防火卷帘-中装.rfa rename to RookieStation/RsLibrary/FamilyLibrary/门/防火卷帘-中装.rfa diff --git a/RookieStation/RsLibrary/Inventory.db b/RookieStation/RsLibrary/Inventory.db index 5eec260..93b1d7b 100644 Binary files a/RookieStation/RsLibrary/Inventory.db and b/RookieStation/RsLibrary/Inventory.db differ diff --git a/RookieStation/Statistics/ExecuteCmds/CmdExportBudgetInventory.cs b/RookieStation/Statistics/ExecuteCmds/CmdExportBudgetInventory.cs index 2bff78b..f01dc8a 100644 --- a/RookieStation/Statistics/ExecuteCmds/CmdExportBudgetInventory.cs +++ b/RookieStation/Statistics/ExecuteCmds/CmdExportBudgetInventory.cs @@ -44,7 +44,7 @@ namespace RookieStation.Statistics.ExecuteCmds SaveFileDialog sfd = new SaveFileDialog() { Filter = "Excel文件|*.xlsx", - FileName = "菜鸟驿站工程预算清单" + FileName = $"{UserConstant.SchoolName}菜鸟驿站工程预算清单" }; string destinationFileName = string.Empty; if (sfd.ShowDialog() == DialogResult.OK) @@ -58,15 +58,16 @@ namespace RookieStation.Statistics.ExecuteCmds var strs = sql.QueryTable("CaiNiaoInventory"); var items = GetQuantity(doc, strs); sql.CloseConncetion(); - var itemGroups = items.GroupBy(i => i.RootCategory).Select(s => s.Where(q => q.Quantity != 0.0)); + var itemGroups = items.GroupBy(i => i.RootCategory).Select(s => s.Where(q => q.Quantity != 0.0));//分成三组 using (ExcelPackage package = new ExcelPackage()) { ExcelWorksheet sheet = CreateTableHeader(doc, package); int row = 4; + List rows = new List(); for (int i = 0; i < itemGroups.Count(); i++) { - int startrow = row; + int startRow = row + 1;//用于根分类下一行，做汇总计算的起始行 #region 根分类 @@ -92,23 +93,31 @@ namespace RookieStation.Statistics.ExecuteCmds #endregion 根分类 - var subGroupys = rootItem.GroupBy(s => s.SubCategory); - for (int j = 0; j < subGroupys.Count(); j++) + var subGroupys = rootItem.GroupBy(s => s.SubCategory);//装饰装修分成六组 + for (int j = 0; j < subGroupys.Count(); j++)//每个子分类 { #region 子分类 - sheet.Cells[row, 1].Value = NumberToChar(j + 1); - sheet.Cells[row, 2].Value = subGroupys.ElementAt(j).Key; - using (var range = sheet.Cells[row, 1, row, 10]) + int subStartRow = row; + //子分类标题 + if (subGroupys.ElementAt(j).ElementAt(0).SubCategory != "") { - range.Style.Font.Name = "宋体"; - range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center; - range.Style.Font.Size = 10; - range.Style.Fill.PatternType = ExcelFillStyle.Solid; - range.Style.Fill.BackgroundColor.SetColor(System.Drawing.Color.LightGray); - range.Style.Border.BorderAround(ExcelBorderStyle.Thin); + sheet.Cells[row, 1].Value = NumberToChar(j + 1); + sheet.Cells[row, 2].Value = subGroupys.ElementAt(j).Key; + sheet.Cells[row, 3].Value = $"=SUM({sheet.Cells[subStartRow + 1, 9].Address}:{sheet.Cells[subStartRow + subGroupys.ElementAt(j).Count(), 9].Address})"; + sheet.Cells[row, 3].Style.Numberformat.Format = "#,##0.00"; + using (var range = sheet.Cells[row, 1, row, 10]) + { + range.Style.Font.Name = "宋体"; + range.Style.Font.Bold = true; + range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center; + range.Style.Font.Size = 10; + range.Style.Fill.PatternType = ExcelFillStyle.Solid; + range.Style.Fill.BackgroundColor.SetColor(System.Drawing.Color.LightGray); + range.Style.Border.BorderAround(ExcelBorderStyle.Thin); + } + row += 1; } - row += 1; #endregion 子分类 @@ -118,14 +127,14 @@ namespace RookieStation.Statistics.ExecuteCmds { var subitem = subGroupys.ElementAt(j).ElementAt(k); sheet.Cells[row, 1].Value = k + 1; - sheet.Cells[row, 2].Value = subitem.Name; + sheet.Cells[row, 2].Value = subitem.ItemName; sheet.Cells[row, 3].Value = subitem.Description; sheet.Cells[row, 4].Value = subitem.Unit; sheet.Cells[row, 5].Value = subitem.Quantity; - - sheet.Cells[row, 8].Formula = String.Format("=SUM({0}:{1})", sheet.Cells[row, 6].Address, sheet.Cells[row, 6].Address); - - sheet.Cells[row, 9].Formula = String.Format("={0}*{1}", sheet.Cells[row, 5].Address, sheet.Cells[row, 8].Address); + sheet.Cells[row, 5].Style.Font.Color.SetColor(System.Drawing.Color.Red); + sheet.Cells[row, 5].Style.Numberformat.Format = "0.00"; + sheet.Cells[row, 8].Formula = $"=SUM({sheet.Cells[row, 6].Address}:{sheet.Cells[row, 6].Address})"; + sheet.Cells[row, 9].Formula = $"={sheet.Cells[row, 5].Address}*{sheet.Cells[row, 8].Address}"; using (var range = sheet.Cells[row, 1, row, 10]) { range.Style.Font.Name = "宋体"; @@ -135,11 +144,31 @@ namespace RookieStation.Statistics.ExecuteCmds range.Style.Border.Bottom.Style = ExcelBorderStyle.Thin; range.Style.Border.Left.Style = ExcelBorderStyle.Thin; range.Style.Border.Right.Style = ExcelBorderStyle.Thin; - range.AutoFitColumns(); } - + using (var range = sheet.Cells[row, 6, row, 9]) + { + range.Style.Numberformat.Format = "#,##0.00"; + } row += 1; } + //if (subGroupys.ElementAt(j).ElementAt(0).SubCategory != null) + //{ + // sheet.Cells[row, 1, row, 8].Merge = true; + // sheet.Cells[row, 1].Value = rootItem.FirstOrDefault().SubCategory + "合计"; + // sheet.Cells[row, 9].Formula = string.Format("=SUM({0}:{1})", sheet.Cells[startrow, 9].Address, sheet.Cells[row - 1, 9].Address); + + // using (var range = sheet.Cells[row, 1, row, 10]) + // { + // range.Style.Font.Name = "宋体"; + // range.Style.Font.Bold = true; + // range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center; + // range.Style.Font.Size = 10; + // range.Style.Border.Top.Style = ExcelBorderStyle.Thin; + // range.Style.Border.Bottom.Style = ExcelBorderStyle.Thin; + // range.Style.Border.Left.Style = ExcelBorderStyle.Thin; + // range.Style.Border.Right.Style = ExcelBorderStyle.Thin; + // } + //} #endregion 子项 @@ -152,7 +181,8 @@ namespace RookieStation.Statistics.ExecuteCmds sheet.Cells[row, 1, row, 8].Merge = true; sheet.Cells[row, 1].Value = rootItem.FirstOrDefault().RootCategory + "合计"; - sheet.Cells[row, 9].Formula = String.Format("=SUM({0}:{1})", sheet.Cells[startrow, 9].Address, sheet.Cells[row - 1, 9].Address); + sheet.Cells[row, 9].Formula = $"=SUM({sheet.Cells[startRow, 9].Address}:{sheet.Cells[row - 1, 9].Address})"; + rows.Add(row);//记录汇总行号 using (var range = sheet.Cells[row, 1, row, 10]) { range.Style.Font.Name = "宋体"; @@ -168,9 +198,39 @@ namespace RookieStation.Statistics.ExecuteCmds #endregion 合计项 } - //using (var range = sheet.Cells[1, 4, 4, 10]) - //{ - //} + + #region 预算总价 + + sheet.Cells[row, 1, row, 8].Merge = true; + sheet.Cells[row, 1].Value = "预算总价（一+二+三）"; + sheet.Cells[row, 9].Formula = $"=SUM({sheet.Cells[rows[0], 9].Address}+{sheet.Cells[rows[1], 9].Address}+{sheet.Cells[rows[2], 9].Address})"; + using (var range = sheet.Cells[row, 1, row, 10]) + { + range.Style.Font.Name = "宋体"; + range.Style.Font.Bold = true; + range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center; + range.Style.Font.Size = 10; + range.Style.Border.Top.Style = ExcelBorderStyle.Thin; + range.Style.Border.Bottom.Style = ExcelBorderStyle.Thin; + range.Style.Border.Left.Style = ExcelBorderStyle.Thin; + range.Style.Border.Right.Style = ExcelBorderStyle.Thin; + } + row += 1; + + #endregion 预算总价 + + sheet.Cells[row, 1, row, 8].Merge = true; + sheet.Cells[row, 1].Value = "※本清单根据施工图生成，仅作为财务模型预算参考，不包含拆除、户外、空调、消防等其他专业预算；"; + using (var range = sheet.Cells[row, 1, row, 10]) + { + range.Style.Font.Name = "宋体"; + range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Left; + range.Style.Font.Size = 10; + } + using (var range = sheet.Cells[sheet.Dimension.Start.Row, sheet.Dimension.Start.Column, sheet.Dimension.End.Row, sheet.Dimension.End.Column]) + { + range.AutoFitColumns(); + } sheet.Calculate(); using (Stream stream = new FileStream(destinationFileName, FileMode.Create)) { @@ -182,6 +242,11 @@ namespace RookieStation.Statistics.ExecuteCmds return Result.Succeeded; } + /// + /// 数字转汉字 + /// + /// + /// private string NumberToChineseDigital(int n) { switch (n) @@ -203,6 +268,11 @@ namespace RookieStation.Statistics.ExecuteCmds } } + /// + /// 数字转字母 + /// + /// + /// private string NumberToChar(int n) { switch (n) @@ -233,8 +303,15 @@ namespace RookieStation.Statistics.ExecuteCmds } } + /// + /// 获取量 + /// + /// + /// + /// private static List GetQuantity(Document doc, List li) { + double similarity = 0.3; List items = new List(); for (int i = 0; i < li.Count; i++) { @@ -248,7 +325,7 @@ namespace RookieStation.Statistics.ExecuteCmds foreach (var wall in walls) { - if (name.Contains(wall.Name)) + if (levenshtein(name, wall.Name) > similarity) { if (name.Contains("踢脚线")) { @@ -264,7 +341,7 @@ namespace RookieStation.Statistics.ExecuteCmds { RootCategory = li[i].ElementAt(1), SubCategory = li[i].ElementAt(2), - Name = li[i].ElementAt(3), + ItemName = li[i].ElementAt(3), Description = li[i].ElementAt(4), Unit = li[i].ElementAt(5), }; @@ -282,9 +359,13 @@ namespace RookieStation.Statistics.ExecuteCmds { double floorTotalArea = 0.0; var floors = new FilteredElementCollector(doc).OfClass(typeof(Floor)).Cast(); + foreach (var floor in floors) { - if (name.Contains(floor.Name)) + //if (name.Intersect(floor.Name).Count() >= 3) + //{ + //} + if (levenshtein(name, floor.Name) > similarity) { floorTotalArea += floor.get_Parameter(BuiltInParameter.HOST_AREA_COMPUTED).AsDouble(); } @@ -293,7 +374,7 @@ namespace RookieStation.Statistics.ExecuteCmds { RootCategory = li[i].ElementAt(1), SubCategory = li[i].ElementAt(2), - Name = li[i].ElementAt(3), + ItemName = li[i].ElementAt(3), Description = li[i].ElementAt(4), Unit = li[i].ElementAt(5), Quantity = RsRevitUtils.ConvertSquareFeetToSquareMetre(floorTotalArea) @@ -306,7 +387,7 @@ namespace RookieStation.Statistics.ExecuteCmds var ceilings = new FilteredElementCollector(doc).OfClass(typeof(Ceiling)).Cast(); foreach (var ceiling in ceilings) { - if (name.Contains(ceiling.Name)) + if (levenshtein(name, ceiling.Name) > similarity) { ceilingTotalArea += ceiling.get_Parameter(BuiltInParameter.HOST_AREA_COMPUTED).AsDouble(); } @@ -315,7 +396,7 @@ namespace RookieStation.Statistics.ExecuteCmds { RootCategory = li[i].ElementAt(1), SubCategory = li[i].ElementAt(2), - Name = li[i].ElementAt(3), + ItemName = li[i].ElementAt(3), Description = li[i].ElementAt(4), Unit = li[i].ElementAt(5), Quantity = RsRevitUtils.ConvertSquareFeetToSquareMetre(ceilingTotalArea) @@ -325,10 +406,132 @@ namespace RookieStation.Statistics.ExecuteCmds else if (revitType == "familyinstance") { var instances = new FilteredElementCollector(doc).OfClass(typeof(FamilyInstance)).Cast(); + int count = 0; + double length = 0.0; + double area = 0.0; + string unit = li[i].ElementAt(5); - if (true) + foreach (var instance in instances) { + string familyName = instance.Symbol.FamilyName; + if (levenshtein(familyName, li[i].ElementAt(3)) > similarity) + { + if (unit == "m") + { + if (familyName.Contains("接待台")) + { + length += RsRevitUtils.ConvertFeetToMetre(instance.Symbol.GetParameters("台面长度").FirstOrDefault().AsDouble()); + } + if (familyName.Contains("腰封玻璃贴")) + { + var cur = RsRevitUtils.GetLocationCurveByElement(instance); + length += RsRevitUtils.ConvertFeetToMetre(cur.Length); + } + if (familyName.Contains("亚克力水晶字")) + { + length += instance.GetParameters("文字").FirstOrDefault().AsString().Length * 116.4 / 1000; + } + if (familyName.Contains("精工背发光字")) + { + double l = Convert.ToDouble((instance.Symbol.Name.Substring(0, instance.Symbol.Name.IndexOf('m')))) / 1000; + length += l; + } + if (familyName.Contains("立体发光字")) + { + double l = Convert.ToDouble((instance.Symbol.Name.Substring(0, instance.Symbol.Name.IndexOf('m')))) / 1000; + length += l; + } + } + else if (unit == "m2") + { + if (familyName.Contains("卷帘")) + { + var a = instance.Symbol.get_Parameter(BuiltInParameter.FAMILY_HEIGHT_PARAM).AsDouble() * instance.Symbol.get_Parameter(BuiltInParameter.FURNITURE_WIDTH).AsDouble(); + + area += RsRevitUtils.ConvertSquareFeetToSquareMetre(a); + } + } + else if (unit == "套" || unit == "个") + { + if (familyName.Contains("仓储货架")) + { + if (li[i].ElementAt(3).Contains(instance.Symbol.GetParameters("长度").FirstOrDefault().AsValueString())) + { + count += 1; + } + } + if (familyName.Contains("明装筒灯")) + { + if (li[i].ElementAt(3).Contains(instance.Symbol.Name)) + { + count += 1; + } + } + } + //var categoryValue = instance.Category.Id.IntegerValue; + //if (categoryValue == -2001060 || categoryValue == -2008087 || categoryValue == -2001350)//插座、开关、专用设备 + //{ + // count += 1; + //} + //else if (categoryValue == -2001120)//照明设备 + //{ + // if (li[i].ElementAt(3).Contains(instance.Symbol.Name)) + // { + // count += 1; + // } + //} + //else if (categoryValue == -2000080 || categoryValue == -2001100)//家具、家具系统 + //{ + // if (li[i].ElementAt(5) == "m") + // { + // } + // else + // { + // count += 1; + // } + //} + //else if (categoryValue == -2000023 || categoryValue == -2000014)//门、窗 + //{ + // if (li[i].ElementAt(5) == "m2") + // { + // } + // else + // { + // count += 1; + // } + //} + }; } + SubItem item = new SubItem() + { + RootCategory = li[i].ElementAt(1), + SubCategory = li[i].ElementAt(2), + ItemName = li[i].ElementAt(3), + Description = li[i].ElementAt(4), + Unit = li[i].ElementAt(5), + }; + switch (unit) + { + case "m": + item.Quantity = length; + break; + + case "m2": + item.Quantity = area; + break; + + case "个": + item.Quantity = count; + break; + + case "套": + item.Quantity = count; + break; + + default: + break; + } + items.Add(item); } else if (revitType == "cabletray") { @@ -342,14 +545,45 @@ namespace RookieStation.Statistics.ExecuteCmds { RootCategory = li[i].ElementAt(1), SubCategory = li[i].ElementAt(2), - Name = li[i].ElementAt(3), + ItemName = li[i].ElementAt(3), Description = li[i].ElementAt(4), Unit = li[i].ElementAt(5), Quantity = RsRevitUtils.ConvertFeetToMetre(ctTotalLength) }; items.Add(item); } - else + else if (revitType == "curtainsystem") + { + double area = 0.0; + var curtainSystems = new FilteredElementCollector(doc).OfClass(typeof(CurtainSystem)).OfCategory(BuiltInCategory.OST_CurtaSystem).Cast(); + foreach (var curtainSystem in curtainSystems) + { + if (levenshtein(name, curtainSystem.Name) > similarity) + { + var geometryElement = curtainSystem.get_Geometry(new Options()); + foreach (GeometryObject geomObj in geometryElement) + { + var solid = geomObj as Solid; + if (solid != null) + { + area += solid.SurfaceArea / 2; + } + } + } + } + + SubItem item = new SubItem() + { + RootCategory = li[i].ElementAt(1), + SubCategory = li[i].ElementAt(2), + ItemName = li[i].ElementAt(3), + Description = li[i].ElementAt(4), + Unit = li[i].ElementAt(5), + Quantity = RsRevitUtils.ConvertSquareFeetToSquareMetre(area) + }; + items.Add(item); + } + else//无法统计的量，采用总场地面积计 { double otherArea = 0.0; var rooms = new FilteredElementCollector(doc).OfCategory(BuiltInCategory.OST_Rooms).Cast(); @@ -362,7 +596,7 @@ namespace RookieStation.Statistics.ExecuteCmds { RootCategory = li[i].ElementAt(1), SubCategory = li[i].ElementAt(2), - Name = li[i].ElementAt(3), + ItemName = li[i].ElementAt(3), Description = li[i].ElementAt(4), Unit = li[i].ElementAt(5), Quantity = RsRevitUtils.ConvertSquareFeetToSquareMetre(otherArea) @@ -374,6 +608,53 @@ namespace RookieStation.Statistics.ExecuteCmds return items; } + public static float levenshtein(String str1, String str2) + { + int len1 = str1.Length; + int len2 = str2.Length; + int[,] dif = new int[len1 + 1, len2 + 1]; + for (int a = 0; a <= len1; a++) + { + dif[a, 0] = a; + } + for (int a = 0; a <= len2; a++) + { + dif[0, a] = a; + } + int temp; + for (int i = 1; i <= len1; i++) + { + for (int j = 1; j <= len2; j++) + { + if (str1.ElementAt(i - 1) == str2.ElementAt(j - 1)) + { + temp = 0; + } + else + { + temp = 1; + } + dif[i, j] = min(dif[i - 1, j - 1] + temp, dif[i, j - 1] + 1, + dif[i - 1, j] + 1); + } + } + float similarity = 1 - (float)dif[len1, len2] / Math.Max(len1, len2); + return similarity; + } + + private static int min(params int[] arr) + { + int min = int.MaxValue; + foreach (int i in arr) + { + if (min > i) + { + min = i; + } + } + return min; + } + private static ExcelWorksheet CreateTableHeader(Document doc, ExcelPackage package) { var rooms = new FilteredElementCollector(doc).OfCategory(BuiltInCategory.OST_Rooms).Cast(); diff --git a/RookieStation/Statistics/ExecuteCmds/CmdExportOrderQuantity.cs b/RookieStation/Statistics/ExecuteCmds/CmdExportOrderQuantity.cs new file mode 100644 index 0000000..9aff5df --- /dev/null +++ b/RookieStation/Statistics/ExecuteCmds/CmdExportOrderQuantity.cs @@ -0,0 +1,84 @@ +using Autodesk.Revit.DB; +using Autodesk.Revit.UI; +using Autodesk.Revit.UI.Selection; +using OfficeOpenXml; +using OfficeOpenXml.Style; +using RookieStation.ProjectConfig; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace RookieStation.Statistics.ExecuteCmds +{ + [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] + [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)] + internal class CmdExportOrderQuantity : IExternalCommand + { + public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements) + { + UIApplication uiapp = commandData.Application; + UIDocument uidoc = uiapp.ActiveUIDocument; + Autodesk.Revit.ApplicationServices.Application app = uiapp.Application; + Document doc = uidoc.Document; + DocumentSet docset = uiapp.Application.Documents; + var shelves = new FilteredElementCollector(doc).OfClass(typeof(FamilyInstance)).Cast().Where(n => n.Symbol.FamilyName.EndsWith("货架")); + var totalLength = 0.0; + SaveFileDialog sfd = new SaveFileDialog() + { + Filter = "Excel文件|*.xlsx", + FileName = "单量增长预测" + }; + string destinationFileName = string.Empty; + if (sfd.ShowDialog() == DialogResult.OK) + { + destinationFileName = sfd.FileName; + } + if (destinationFileName == string.Empty) + { + return Result.Cancelled; + } + foreach (var instance in shelves) + { + totalLength += Math.Round(instance.Symbol.GetParameters("长度").FirstOrDefault().AsDouble() * 304.8 / 1000); + } + using (ExcelPackage package = new ExcelPackage()) + { + ExcelWorksheet sheet = package.Workbook.Worksheets.Add("单量预测"); + //sheet.Cells["A1:F1"].Merge = true; + sheet.Cells[1, 1].Value = "第一年"; + sheet.Cells[1, 2].Value = "第二年"; + sheet.Cells[1, 3].Value = "第三年"; + sheet.Cells[1, 4].Value = "第四年"; + sheet.Cells[1, 5].Value = "第五年"; + sheet.Cells[1, 6].Value = "最大承载单量"; + + sheet.Cells[2, 1].Value = UserConstant.Orders; + sheet.Cells[2, 2].Value = Math.Ceiling(UserConstant.Orders * Math.Pow(1.15, 2)); + sheet.Cells[2, 3].Value = Math.Ceiling(UserConstant.Orders * Math.Pow(1.15, 3)); + sheet.Cells[2, 4].Value = Math.Ceiling(UserConstant.Orders * Math.Pow(1.15, 4)); + sheet.Cells[2, 5].Value = Math.Ceiling(UserConstant.Orders * Math.Pow(1.15, 5)); + sheet.Cells[2, 6].Value = totalLength * 80; + + using (var range = sheet.Cells[1, 1, 2, 6]) + { + range.Style.Font.Name = "宋体"; + range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center; + range.Style.Font.Size = 10; + range.Style.Border.BorderAround(ExcelBorderStyle.Thin); + range.AutoFitColumns(); + } + using (Stream stream = new FileStream(destinationFileName, FileMode.Create)) + { + package.SaveAs(stream); + } + } + System.Diagnostics.Process.Start(destinationFileName); + + return Result.Succeeded; + } + } +} \ No newline at end of file diff --git a/RookieStation/Statistics/ExecuteCmds/CmdExportWorkSchedule.cs b/RookieStation/Statistics/ExecuteCmds/CmdExportWorkSchedule.cs index c125f69..3d02914 100644 --- a/RookieStation/Statistics/ExecuteCmds/CmdExportWorkSchedule.cs +++ b/RookieStation/Statistics/ExecuteCmds/CmdExportWorkSchedule.cs @@ -257,7 +257,7 @@ namespace RookieStation.Statistics.ExecuteCmds trashCanCount += 2; } } - else if (furn.Symbol.FamilyName.Contains("货架")) + else if (furn.Symbol.FamilyName.Contains("仓储货架")) { shelfCount += 1; } @@ -277,7 +277,7 @@ namespace RookieStation.Statistics.ExecuteCmds { cainiaoDutyCount += 1; } - else if (furnsys.Symbol.FamilyName.Contains("防撞条")) + else if (furnsys.Symbol.FamilyName.Contains("腰封玻璃贴")) { containmentLength += furnsys.get_Parameter(BuiltInParameter.FAMILY_LINE_LENGTH_PARAM).AsDouble(); } diff --git a/RookieStation/Statistics/Models/SubItem.cs b/RookieStation/Statistics/Models/SubItem.cs index 2f956e9..d1fba62 100644 --- a/RookieStation/Statistics/Models/SubItem.cs +++ b/RookieStation/Statistics/Models/SubItem.cs @@ -21,7 +21,7 @@ namespace RookieStation.Statistics.Models /// /// 分项 /// - public string Name { get; set; } + public string ItemName { get; set; } /// /// 项目特征 diff --git a/RookieStation/UserConstant.cs b/RookieStation/UserConstant.cs index 472aed8..299bdf8 100644 --- a/RookieStation/UserConstant.cs +++ b/RookieStation/UserConstant.cs @@ -15,7 +15,7 @@ namespace RookieStation.ProjectConfig private static string AddinPath = typeof(RsApp).Assembly.Location; public static string AddinDirectory => System.IO.Path.GetDirectoryName(AddinPath); -#if DEBUG +#if (DEBUG) //调试路径 internal static string FamilyLibraryDirectory => AddinDirectory + "\\RsLibrary\\FamilyLibrary\\"; diff --git a/RookieStation/Utils/CommonUtils.cs b/RookieStation/Utils/CommonUtils.cs index 4def643..d863054 100644 --- a/RookieStation/Utils/CommonUtils.cs +++ b/RookieStation/Utils/CommonUtils.cs @@ -54,7 +54,7 @@ namespace RookieStation.Utils /// /// /// - public static T GenerateWindow() where T : System.Windows.Window, new() + public static T ShowDialog() where T : System.Windows.Window, new() { string AddInPath = typeof(RsApp).Assembly.Location; string dirAssembly = System.IO.Path.GetDirectoryName(AddInPath); diff --git a/RookieStation/Utils/RsRevitUtils.cs b/RookieStation/Utils/RsRevitUtils.cs index 59acc80..3c490a9 100644 --- a/RookieStation/Utils/RsRevitUtils.cs +++ b/RookieStation/Utils/RsRevitUtils.cs @@ -187,7 +187,7 @@ namespace RookieStation.Utils FamilySymbol lineSymbol = null; doc.Invoke(ts => { - Family lineFamily = GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "定位线.rfa"); + Family lineFamily = GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "其他\\定位线.rfa"); if (lineFamily != null) { lineSymbol = doc.GetElement(lineFamily.GetFamilySymbolIds().FirstOrDefault()) as FamilySymbol; diff --git a/RookieStationSetup/RookieStationSetup.vdproj b/RookieStationSetup/RookieStationSetup.vdproj index 77aed74..c68c029 100644 --- a/RookieStationSetup/RookieStationSetup.vdproj +++ b/RookieStationSetup/RookieStationSetup.vdproj @@ -13,6 +13,12 @@ "SccProvider" = "8:" "Hierarchy" { + "Entry" + { + "MsmKey" = "8:_032CB90F0BF943239BB69AAB64E6E14F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } "Entry" { "MsmKey" = "8:_04396D7F9297427F80C9E06D8FD2B755" @@ -21,13 +27,13 @@ } "Entry" { - "MsmKey" = "8:_0660ACCC4499404AB0F56A4F40616368" + "MsmKey" = "8:_0604710874094BA382219F6918CFFB61" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0B6B91DFBA194421B832C283AF273173" + "MsmKey" = "8:_060C202BBFD64BE5A8BC215EFAAEC530" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -45,19 +51,31 @@ } "Entry" { + "MsmKey" = "8:_10822E2CCDA0448098A400048633F2FA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_13193E847C5A4DE2BEB5F88D5742E81D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1345D702605345EEA013C7CD519045AD" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_19C34F97873F4001BE315F3995963382" + "MsmKey" = "8:_16B80DE96AE94AFE99429146A6BE1A49" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1E7D869E37AA44DC81AC2C890AE68104" + "MsmKey" = "8:_21A557C5E98D44DAA1A1C8B107B5D7F9" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -75,31 +93,31 @@ } "Entry" { + "MsmKey" = "8:_24445053684B405EAB5246A2F5088D30" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_24527FE9429AA075502970126305C23D" "OwnerKey" = "8:_FBE461B9D4BD4603919E2821D88FB7CB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_29F4AA19B9504E47A47E831266948330" + "MsmKey" = "8:_2470285CE78B47638B9F2760CEA09973" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2ABBB4346733481187A37206130EF461" + "MsmKey" = "8:_2B19E60F5BDB440481ECBD432199D184" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2D2AC1383D5E4D5C83D66AE2506CA571" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2DB1DB1D0C0A41A3B49BA21FA0EE6338" + "MsmKey" = "8:_2C3C4DFBA6334529BD077412B9B4A343" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -111,13 +129,13 @@ } "Entry" { - "MsmKey" = "8:_2F8C378AA3F647BBACF452F5F4D68EC1" + "MsmKey" = "8:_2DF6A635F9D54DACB4428000C75CF4BA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_34084FCC261C45ACB1E9BE29AF27F16C" + "MsmKey" = "8:_318C1B44007A4107B8511C9631C09425" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -129,13 +147,13 @@ } "Entry" { - "MsmKey" = "8:_3E5CDABF8FFB4A4F99AE33F0F9077795" + "MsmKey" = "8:_35393CFDAA6B4C7697972DA26C4ECCB1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3ED05085BD6E486189B74353F77595C8" + "MsmKey" = "8:_3C638280963E4C24BFED1515982889B6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -153,13 +171,25 @@ } "Entry" { - "MsmKey" = "8:_4934194598254F9DB6A3692F12D46877" + "MsmKey" = "8:_4F1D2AFDF92D41FB809FB635297BECD7" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4A21CF3BA26B47B7829AABAC21A525D1" + "MsmKey" = "8:_521A7B6735F74BC7806DDEC169A4D21C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_55F218AD6B334FB2A2AF995172891B61" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_56A77A185A4F4CCEADF54FE8000DE1FF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -195,13 +225,31 @@ } "Entry" { + "MsmKey" = "8:_61D4A3D883C44305A10891E770AC27B7" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_6288BC0ECCE74AA5AD49D6094B6ED51E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_66B8224986B547ECB60E7AFC8977A760" + "MsmKey" = "8:_6611E00E851D4212ADFAE1B8FAF8F250" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6648394B397944EFB1D4FBC1BDC2256D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_679D61CD77E7444C977B96AB809EAEFA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -213,6 +261,12 @@ } "Entry" { + "MsmKey" = "8:_6B17F4D39BED4015A225CC9774765826" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_6BD9A7A1F336A6A56438520C9B87D6AD" "OwnerKey" = "8:_FBE461B9D4BD4603919E2821D88FB7CB" "MsmSig" = "8:_UNDEFINED" @@ -225,13 +279,19 @@ } "Entry" { - "MsmKey" = "8:_73709D6BB93E411D8B86E32B9F4ADA61" + "MsmKey" = "8:_72B7FE72965542A9A3AA5B80B571ED7A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_77F7C420C9D0472FB7F862222E2B4DB8" + "MsmKey" = "8:_76807171ACD64850A971288BA4D9E84A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7ADB633693524483955C20CFA59BCAC7" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -249,24 +309,12 @@ } "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" @@ -279,7 +327,13 @@ } "Entry" { - "MsmKey" = "8:_89CD2D66CBC1431BB4EB6907E21FFAC4" + "MsmKey" = "8:_8B93DE5BD9D04559925F2D0A028817D1" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8D69CCA8BC1543BA9C87E3DF37E2424C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -297,13 +351,25 @@ } "Entry" { - "MsmKey" = "8:_9B193C96A36E45D8AA0AE8C850191C60" + "MsmKey" = "8:_95EC43AA79E74956A091DB109F1B77CF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9D57E706186F4B89BAA1DFF557AFB722" + "MsmKey" = "8:_995E1F0272894582A03C196EAB0E7DA8" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9BD4BDE0C3334A53B1A6909D890CD9C7" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9DD160189CFD41F5B9852D6C05F96F45" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -315,31 +381,25 @@ } "Entry" { - "MsmKey" = "8:_9F186119162048C59B774F07AD1D37E4" + "MsmKey" = "8:_9FCFD3DD0CB14697A7BF60BF355FCB3A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A2D16A25D1D143B3A3C2510EC5FC69FF" + "MsmKey" = "8:_9FF67E9936EE4270A69720618E1C59C3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A461F83BB9E04AA685182130A48B8B95" + "MsmKey" = "8:_A34A4549497845D7BF1582DD3F1A69EB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A757474C8B3E4F53A62942420CA97A1B" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_A87178FC0E8E464D83DFBDEA9F2A9C43" + "MsmKey" = "8:_AAAC4E042EBE45528995A11893322216" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -399,13 +459,7 @@ } "Entry" { - "MsmKey" = "8:_C13B6EFF3BDC485F995140ECE3BF976B" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C37253C8AABD42589BAED190AE0CDE5A" + "MsmKey" = "8:_C12975D383A948AABE249BB636014B7F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -417,7 +471,19 @@ } "Entry" { - "MsmKey" = "8:_C6F1B21F07C448A68E96C70BBD84EEB0" + "MsmKey" = "8:_C6EB34B46B17405CA06205387A553B52" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C8B0C074C8F1440A82B5CCCA0362BBC5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CA838E6409624FCD8795AD075EE07CE0" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -429,7 +495,19 @@ } "Entry" { - "MsmKey" = "8:_CDDEB52E94FD4C9EB222CB9A0A4E5575" + "MsmKey" = "8:_CC98C16F36814E47B7A071BA0E2D6EC0" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CD837656CA87438A9E5944CD44B6CE7B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CDCC763AE8324179BD758E226030B7FA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -441,30 +519,30 @@ } "Entry" { - "MsmKey" = "8:_CF02B938C86745D1927C3C5C9BBD5745" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D0AB549F50BB4B5A8E0C7C407948585D" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_D7CE0EFBE9E549AF95F204F2459A3AAE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_D8D84847A8CD46DDB4C769FD75A4F0D8" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_DAEA3EBD334748F3B1E7744F406BD951" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_DB2604DE331C4564AFAA8A30EB85C15A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_DC3759CFF85D4A419D39A3570B5C883E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -489,19 +567,19 @@ } "Entry" { - "MsmKey" = "8:_E6F75818F7284D35A94F08B41BE960FA" + "MsmKey" = "8:_E6C260269E4D4223A74A83E2F1CC42AA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E8AFEE9E12CE427AA2AB71E7E62B6567" + "MsmKey" = "8:_EE5304E4B88C4949980DA38F88047BBF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EC425FC610B1482B8A054EB6074A4616" + "MsmKey" = "8:_EE8F16D8A5A6469AB8E68F75BB44D2AB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -513,13 +591,7 @@ } "Entry" { - "MsmKey" = "8:_F9CADC97AF6243588CB8367484A601AA" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_FA661FC2BD524B1EBF0D5EDB740D5D0B" + "MsmKey" = "8:_F5AD5DA6B45641049F1FC2DB7B4F4E5C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -537,6 +609,18 @@ } "Entry" { + "MsmKey" = "8:_FD6F839283D2470E891F2E9B5EE6CC02" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FDA54880C44E4C1B8060ECC5E354341F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_FBE461B9D4BD4603919E2821D88FB7CB" "MsmSig" = "8:_UNDEFINED" @@ -708,6 +792,26 @@ } "File" { + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_032CB90F0BF943239BB69AAB64E6E14F" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\门\\幕墙门-双扇无边框.rfa" + "TargetName" = "8:幕墙门-双扇无边框.rfa" + "Tag" = "8:" + "Folder" = "8:_E72FF5B6871B4CAD9DD292E024751230" + "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}:_04396D7F9297427F80C9E06D8FD2B755" { "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\免费WiFi.png" @@ -728,12 +832,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0660ACCC4499404AB0F56A4F40616368" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0604710874094BA382219F6918CFFB61" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Shelf\\货架端牌.rfa" - "TargetName" = "8:货架端牌.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\其他\\定位线.rfa" + "TargetName" = "8:定位线.rfa" "Tag" = "8:" - "Folder" = "8:_406EA5A50D6D43439512FD26B8E10B12" + "Folder" = "8:_98E27BC7EFA24FC1BCA0DF735BDD58D5" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -748,12 +852,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0B6B91DFBA194421B832C283AF273173" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_060C202BBFD64BE5A8BC215EFAAEC530" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\WallFinish\\背景墙.rfa" - "TargetName" = "8:背景墙.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\钢制桌椅.rfa" + "TargetName" = "8:钢制桌椅.rfa" "Tag" = "8:" - "Folder" = "8:_B3DF628258C043A6986617245B6F0BEE" + "Folder" = "8:_C339685F5ECF4472982108116EDD1313" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -799,6 +903,46 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_10822E2CCDA0448098A400048633F2FA" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\货架\\仓储货架.rfa" + "TargetName" = "8:仓储货架.rfa" + "Tag" = "8:" + "Folder" = "8:_C5CB0261E21D4CACB8E9BDCB134DB886" + "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}:_13193E847C5A4DE2BEB5F88D5742E81D" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\墙贴.rfa" + "TargetName" = "8:墙贴.rfa" + "Tag" = "8:" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" + "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}:_1345D702605345EEA013C7CD519045AD" { "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\确认台卡.jpg" @@ -819,12 +963,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_19C34F97873F4001BE315F3995963382" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_16B80DE96AE94AFE99429146A6BE1A49" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Shelf\\双联货架.rfa" - "TargetName" = "8:双联货架.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\墙饰面\\校园文化墙.rfa" + "TargetName" = "8:校园文化墙.rfa" "Tag" = "8:" - "Folder" = "8:_406EA5A50D6D43439512FD26B8E10B12" + "Folder" = "8:_B4398527109B4F75A08962ABDB7B8946" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -839,12 +983,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1E7D869E37AA44DC81AC2C890AE68104" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_21A557C5E98D44DAA1A1C8B107B5D7F9" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Door\\幕墙门-玻璃门.rfa" - "TargetName" = "8:幕墙门-玻璃门.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\寄件接待台-带收检台.rfa" + "TargetName" = "8:寄件接待台-带收检台.rfa" "Tag" = "8:" - "Folder" = "8:_1DCEC210457E4FB0AB7B04A6A5D03306" + "Folder" = "8:_C339685F5ECF4472982108116EDD1313" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -899,6 +1043,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_24445053684B405EAB5246A2F5088D30" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\地贴.rfa" + "TargetName" = "8:地贴.rfa" + "Tag" = "8:" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" + "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}:_24527FE9429AA075502970126305C23D" { "AssemblyRegister" = "3:1" @@ -930,12 +1094,12 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_29F4AA19B9504E47A47E831266948330" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2470285CE78B47638B9F2760CEA09973" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Gate\\收检台-左.rfa" - "TargetName" = "8:收检台-左.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\常规门头.rfa" + "TargetName" = "8:常规门头.rfa" "Tag" = "8:" - "Folder" = "8:_9B75B83A53C7405E9D6020ABD06A3A14" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -950,12 +1114,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2ABBB4346733481187A37206130EF461" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2B19E60F5BDB440481ECBD432199D184" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Lamp\\筒灯.rfa" - "TargetName" = "8:筒灯.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\其他\\吊线.rfa" + "TargetName" = "8:吊线.rfa" "Tag" = "8:" - "Folder" = "8:_BFD89CD05BEB451EA768E58E9AF9EB35" + "Folder" = "8:_98E27BC7EFA24FC1BCA0DF735BDD58D5" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -970,32 +1134,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2D2AC1383D5E4D5C83D66AE2506CA571" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2C3C4DFBA6334529BD077412B9B4A343" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Equipment\\自助寄件机.rfa" - "TargetName" = "8:自助寄件机.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\出入口\\L型收检台.rfa" + "TargetName" = "8:L型收检台.rfa" "Tag" = "8:" - "Folder" = "8:_53DBD7D27C3C4DBD92F6D88A8725455A" - "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}:_2DB1DB1D0C0A41A3B49BA21FA0EE6338" - { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\1.5m绿动箱.rfa" - "TargetName" = "8:1.5m绿动箱.rfa" - "Tag" = "8:" - "Folder" = "8:_7692A4F9B7D744A3A1E5AFA9F95890CD" + "Folder" = "8:_6E817D1A55504DF1A464A896AB1135D7" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1030,12 +1174,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2F8C378AA3F647BBACF452F5F4D68EC1" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2DF6A635F9D54DACB4428000C75CF4BA" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\拆包桌.rfa" - "TargetName" = "8:拆包桌.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\灯具\\明装筒灯.rfa" + "TargetName" = "8:明装筒灯.rfa" "Tag" = "8:" - "Folder" = "8:_7692A4F9B7D744A3A1E5AFA9F95890CD" + "Folder" = "8:_C856AF9B3EC949E29C78B2DE5C2C78EB" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1050,12 +1194,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_34084FCC261C45ACB1E9BE29AF27F16C" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_318C1B44007A4107B8511C9631C09425" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Gate\\L型收检台.rfa" - "TargetName" = "8:L型收检台.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\咖餐厅座椅组.rfa" + "TargetName" = "8:咖餐厅座椅组.rfa" "Tag" = "8:" - "Folder" = "8:_9B75B83A53C7405E9D6020ABD06A3A14" + "Folder" = "8:_C339685F5ECF4472982108116EDD1313" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1090,12 +1234,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3E5CDABF8FFB4A4F99AE33F0F9077795" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_35393CFDAA6B4C7697972DA26C4ECCB1" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Location\\定位线.rfa" - "TargetName" = "8:定位线.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\灯具\\艺术吊灯.rfa" + "TargetName" = "8:艺术吊灯.rfa" "Tag" = "8:" - "Folder" = "8:_CCB9CA9C12EE4E23A02C5D6A329D2A50" + "Folder" = "8:_C856AF9B3EC949E29C78B2DE5C2C78EB" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1110,12 +1254,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3ED05085BD6E486189B74353F77595C8" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3C638280963E4C24BFED1515982889B6" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\绿动箱.rfa" - "TargetName" = "8:绿动箱.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\拆包桌.rfa" + "TargetName" = "8:拆包桌.rfa" "Tag" = "8:" - "Folder" = "8:_7692A4F9B7D744A3A1E5AFA9F95890CD" + "Folder" = "8:_C339685F5ECF4472982108116EDD1313" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1170,12 +1314,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4934194598254F9DB6A3692F12D46877" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F1D2AFDF92D41FB809FB635297BECD7" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Gate\\简易收检台.rfa" - "TargetName" = "8:简易收检台.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\板饰面\\地砖.rfa" + "TargetName" = "8:地砖.rfa" "Tag" = "8:" - "Folder" = "8:_9B75B83A53C7405E9D6020ABD06A3A14" + "Folder" = "8:_6C6DD76B009B4F9E9B9E8C9862FEF487" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1190,12 +1334,52 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4A21CF3BA26B47B7829AABAC21A525D1" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_521A7B6735F74BC7806DDEC169A4D21C" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\菜鸟LOGO.rfa" - "TargetName" = "8:菜鸟LOGO.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\设备\\自助寄件机.rfa" + "TargetName" = "8:自助寄件机.rfa" "Tag" = "8:" - "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0" + "Folder" = "8:_7307D1B62D474D0786B3F43094D92CC0" + "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}:_55F218AD6B334FB2A2AF995172891B61" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\出入口\\收检台-左.rfa" + "TargetName" = "8:收检台-左.rfa" + "Tag" = "8:" + "Folder" = "8:_6E817D1A55504DF1A464A896AB1135D7" + "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}:_56A77A185A4F4CCEADF54FE8000DE1FF" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\开关\\三联开关 - 暗装.rfa" + "TargetName" = "8:三联开关 - 暗装.rfa" + "Tag" = "8:" + "Folder" = "8:_FF6F2E169EDB4DC4B78B71B9F8DFCC0A" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1292,6 +1476,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61D4A3D883C44305A10891E770AC27B7" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\圆形餐桌组.rfa" + "TargetName" = "8:圆形餐桌组.rfa" + "Tag" = "8:" + "Folder" = "8:_C339685F5ECF4472982108116EDD1313" + "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}:_6288BC0ECCE74AA5AD49D6094B6ED51E" { "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\邮件快件实名收寄管理办法（700mm_500mm竖版）.jpg" @@ -1312,12 +1516,52 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_66B8224986B547ECB60E7AFC8977A760" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6611E00E851D4212ADFAE1B8FAF8F250" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\四牌.rfa" - "TargetName" = "8:四牌.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\门\\幕墙门-玻璃门.rfa" + "TargetName" = "8:幕墙门-玻璃门.rfa" "Tag" = "8:" - "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0" + "Folder" = "8:_E72FF5B6871B4CAD9DD292E024751230" + "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}:_6648394B397944EFB1D4FBC1BDC2256D" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\玻璃贴.rfa" + "TargetName" = "8:玻璃贴.rfa" + "Tag" = "8:" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" + "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}:_679D61CD77E7444C977B96AB809EAEFA" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\设备\\配电箱.rfa" + "TargetName" = "8:配电箱.rfa" + "Tag" = "8:" + "Folder" = "8:_7307D1B62D474D0786B3F43094D92CC0" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1352,6 +1596,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6B17F4D39BED4015A225CC9774765826" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\菜鸟使命.rfa" + "TargetName" = "8:菜鸟使命.rfa" + "Tag" = "8:" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" + "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}:_6BD9A7A1F336A6A56438520C9B87D6AD" { "AssemblyRegister" = "3:1" @@ -1403,12 +1667,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_73709D6BB93E411D8B86E32B9F4ADA61" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_72B7FE72965542A9A3AA5B80B571ED7A" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\墙贴.rfa" - "TargetName" = "8:墙贴.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\设备\\家用配电箱.rfa" + "TargetName" = "8:家用配电箱.rfa" "Tag" = "8:" - "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0" + "Folder" = "8:_7307D1B62D474D0786B3F43094D92CC0" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1423,12 +1687,32 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_77F7C420C9D0472FB7F862222E2B4DB8" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_76807171ACD64850A971288BA4D9E84A" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\寄件收费标准.rfa" - "TargetName" = "8:寄件收费标准.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\灯具\\轨道射灯.rfa" + "TargetName" = "8:轨道射灯.rfa" "Tag" = "8:" - "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0" + "Folder" = "8:_C856AF9B3EC949E29C78B2DE5C2C78EB" + "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}:_7ADB633693524483955C20CFA59BCAC7" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\绿动箱.rfa" + "TargetName" = "8:绿动箱.rfa" + "Tag" = "8:" + "Folder" = "8:_C339685F5ECF4472982108116EDD1313" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1494,26 +1778,6 @@ "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" @@ -1534,26 +1798,6 @@ "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" @@ -1585,12 +1829,32 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_89CD2D66CBC1431BB4EB6907E21FFAC4" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8B93DE5BD9D04559925F2D0A028817D1" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\寄件接待台-带收检台.rfa" - "TargetName" = "8:寄件接待台-带收检台.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\出入口\\直线形收检台.rfa" + "TargetName" = "8:直线形收检台.rfa" "Tag" = "8:" - "Folder" = "8:_7692A4F9B7D744A3A1E5AFA9F95890CD" + "Folder" = "8:_6E817D1A55504DF1A464A896AB1135D7" + "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}:_8D69CCA8BC1543BA9C87E3DF37E2424C" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\出入口\\三辊闸机.rfa" + "TargetName" = "8:三辊闸机.rfa" + "Tag" = "8:" + "Folder" = "8:_6E817D1A55504DF1A464A896AB1135D7" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1636,12 +1900,12 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9B193C96A36E45D8AA0AE8C850191C60" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_95EC43AA79E74956A091DB109F1B77CF" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Lamp\\吊灯.rfa" - "TargetName" = "8:吊灯.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\四牌.rfa" + "TargetName" = "8:四牌.rfa" "Tag" = "8:" - "Folder" = "8:_BFD89CD05BEB451EA768E58E9AF9EB35" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1656,12 +1920,52 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9D57E706186F4B89BAA1DFF557AFB722" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_995E1F0272894582A03C196EAB0E7DA8" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\FloorFinish\\地砖.rfa" - "TargetName" = "8:地砖.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\开关\\双联开关 - 暗装.rfa" + "TargetName" = "8:双联开关 - 暗装.rfa" "Tag" = "8:" - "Folder" = "8:_18E710EDFE6E40DA8D0A6674502C62B2" + "Folder" = "8:_FF6F2E169EDB4DC4B78B71B9F8DFCC0A" + "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}:_9BD4BDE0C3334A53B1A6909D890CD9C7" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\墙饰面\\背景墙.rfa" + "TargetName" = "8:背景墙.rfa" + "Tag" = "8:" + "Folder" = "8:_B4398527109B4F75A08962ABDB7B8946" + "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}:_9DD160189CFD41F5B9852D6C05F96F45" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\侧招灯箱.rfa" + "TargetName" = "8:侧招灯箱.rfa" + "Tag" = "8:" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1696,12 +2000,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9F186119162048C59B774F07AD1D37E4" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9FCFD3DD0CB14697A7BF60BF355FCB3A" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\台卡.rfa" - "TargetName" = "8:台卡.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\插座\\单相暗装二三孔插座.rfa" + "TargetName" = "8:单相暗装二三孔插座.rfa" "Tag" = "8:" - "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0" + "Folder" = "8:_17E2657907374C52A1BEC13102E99EEE" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1716,52 +2020,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A2D16A25D1D143B3A3C2510EC5FC69FF" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9FF67E9936EE4270A69720618E1C59C3" { - "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}:_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" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\寄件接待台.rfa" "TargetName" = "8:寄件接待台.rfa" "Tag" = "8:" - "Folder" = "8:_7692A4F9B7D744A3A1E5AFA9F95890CD" + "Folder" = "8:_C339685F5ECF4472982108116EDD1313" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1776,12 +2040,32 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A87178FC0E8E464D83DFBDEA9F2A9C43" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A34A4549497845D7BF1582DD3F1A69EB" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Furniture\\3.0m绿动箱.rfa" - "TargetName" = "8:3.0m绿动箱.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\腰封玻璃贴.rfa" + "TargetName" = "8:腰封玻璃贴.rfa" "Tag" = "8:" - "Folder" = "8:_7692A4F9B7D744A3A1E5AFA9F95890CD" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" + "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}:_AAAC4E042EBE45528995A11893322216" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\寄件收费标准.rfa" + "TargetName" = "8:寄件收费标准.rfa" + "Tag" = "8:" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1918,32 +2202,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C13B6EFF3BDC485F995140ECE3BF976B" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C12975D383A948AABE249BB636014B7F" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Gate\\直线形收检台.rfa" - "TargetName" = "8:直线形收检台.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\灯具\\支架灯.rfa" + "TargetName" = "8:支架灯.rfa" "Tag" = "8:" - "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" + "Folder" = "8:_C856AF9B3EC949E29C78B2DE5C2C78EB" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1978,12 +2242,52 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C6F1B21F07C448A68E96C70BBD84EEB0" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C6EB34B46B17405CA06205387A553B52" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Gate\\收检台-右.rfa" - "TargetName" = "8:收检台-右.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\门\\防火卷帘-中装.rfa" + "TargetName" = "8:防火卷帘-中装.rfa" "Tag" = "8:" - "Folder" = "8:_9B75B83A53C7405E9D6020ABD06A3A14" + "Folder" = "8:_E72FF5B6871B4CAD9DD292E024751230" + "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}:_C8B0C074C8F1440A82B5CCCA0362BBC5" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\1.5m绿动箱.rfa" + "TargetName" = "8:1.5m绿动箱.rfa" + "Tag" = "8:" + "Folder" = "8:_C339685F5ECF4472982108116EDD1313" + "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}:_CA838E6409624FCD8795AD075EE07CE0" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\精工背发光字.rfa" + "TargetName" = "8:精工背发光字.rfa" + "Tag" = "8:" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -2018,12 +2322,52 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CDDEB52E94FD4C9EB222CB9A0A4E5575" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CC98C16F36814E47B7A071BA0E2D6EC0" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\防撞条.rfa" - "TargetName" = "8:防撞条.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\门\\双扇平开防火子母门.rfa" + "TargetName" = "8:双扇平开防火子母门.rfa" "Tag" = "8:" - "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0" + "Folder" = "8:_E72FF5B6871B4CAD9DD292E024751230" + "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}:_CD837656CA87438A9E5944CD44B6CE7B" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\亚克力水晶字.rfa" + "TargetName" = "8:亚克力水晶字.rfa" + "Tag" = "8:" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" + "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}:_CDCC763AE8324179BD758E226030B7FA" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\快递指导规范.rfa" + "TargetName" = "8:快递指导规范.rfa" + "Tag" = "8:" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -2069,46 +2413,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CF02B938C86745D1927C3C5C9BBD5745" - { - "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}:_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" - "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}:_D7CE0EFBE9E549AF95F204F2459A3AAE" { "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\验视台卡.jpg" @@ -2129,6 +2433,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D8D84847A8CD46DDB4C769FD75A4F0D8" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\开关\\单联开关 - 暗装.rfa" + "TargetName" = "8:单联开关 - 暗装.rfa" + "Tag" = "8:" + "Folder" = "8:_FF6F2E169EDB4DC4B78B71B9F8DFCC0A" + "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" @@ -2149,6 +2473,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DB2604DE331C4564AFAA8A30EB85C15A" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\出入口\\闸机.rfa" + "TargetName" = "8:闸机.rfa" + "Tag" = "8:" + "Folder" = "8:_6E817D1A55504DF1A464A896AB1135D7" + "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}:_DC3759CFF85D4A419D39A3570B5C883E" { "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\服务承诺_损失赔偿方法_投诉处理办法（700mm_500mm竖版）.jpg" @@ -2229,12 +2573,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E6F75818F7284D35A94F08B41BE960FA" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E6C260269E4D4223A74A83E2F1CC42AA" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Shelf\\三联货架.rfa" - "TargetName" = "8:三联货架.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\出入口\\收检台-右.rfa" + "TargetName" = "8:收检台-右.rfa" "Tag" = "8:" - "Folder" = "8:_406EA5A50D6D43439512FD26B8E10B12" + "Folder" = "8:_6E817D1A55504DF1A464A896AB1135D7" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -2249,12 +2593,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E8AFEE9E12CE427AA2AB71E7E62B6567" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EE5304E4B88C4949980DA38F88047BBF" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Gate\\闸机.rfa" - "TargetName" = "8:闸机.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\台卡.rfa" + "TargetName" = "8:台卡.rfa" "Tag" = "8:" - "Folder" = "8:_9B75B83A53C7405E9D6020ABD06A3A14" + "Folder" = "8:_B551F2A6C0904D6BBC32D147053B2218" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -2269,12 +2613,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC425FC610B1482B8A054EB6074A4616" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EE8F16D8A5A6469AB8E68F75BB44D2AB" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\快递指导规范.rfa" - "TargetName" = "8:快递指导规范.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\插座\\单相地面二三孔插座.rfa" + "TargetName" = "8:单相地面二三孔插座.rfa" "Tag" = "8:" - "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0" + "Folder" = "8:_17E2657907374C52A1BEC13102E99EEE" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -2320,32 +2664,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F9CADC97AF6243588CB8367484A601AA" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F5AD5DA6B45641049F1FC2DB7B4F4E5C" { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Others\\吊线.rfa" - "TargetName" = "8:吊线.rfa" + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\3.0m绿动箱.rfa" + "TargetName" = "8:3.0m绿动箱.rfa" "Tag" = "8:" - "Folder" = "8:_D0C4D81042044D55A4163DAFEA624966" - "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}:_FA661FC2BD524B1EBF0D5EDB740D5D0B" - { - "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\Sign\\侧招灯箱.rfa" - "TargetName" = "8:侧招灯箱.rfa" - "Tag" = "8:" - "Folder" = "8:_BD6760C8ED8A40BFA5E98484CCEAA2B0" + "Folder" = "8:_C339685F5ECF4472982108116EDD1313" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -2380,6 +2704,46 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FD6F839283D2470E891F2E9B5EE6CC02" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\货架\\货架端牌.rfa" + "TargetName" = "8:货架端牌.rfa" + "Tag" = "8:" + "Folder" = "8:_C5CB0261E21D4CACB8E9BDCB134DB886" + "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}:_FDA54880C44E4C1B8060ECC5E354341F" + { + "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\出入口\\简易收检台.rfa" + "TargetName" = "8:简易收检台.rfa" + "Tag" = "8:" + "Folder" = "8:_6E817D1A55504DF1A464A896AB1135D7" + "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:" + } } "FileType" { @@ -2434,123 +2798,134 @@ "Property" = "8:_0FDD8782BE3C426997F11FB8E6614478" "Folders" { - "{9EF0B969-E518-4E46-987F-47570745A589}:_18E710EDFE6E40DA8D0A6674502C62B2" + "{9EF0B969-E518-4E46-987F-47570745A589}:_17E2657907374C52A1BEC13102E99EEE" { - "Name" = "8:FloorFinish" + "Name" = "8:插座" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:_FB75768CD0DC42D6BE01870E9487BB45" + "Property" = "8:_00300591D8A34AD5875B289D99265E10" "Folders" { } } - "{9EF0B969-E518-4E46-987F-47570745A589}:_1DCEC210457E4FB0AB7B04A6A5D03306" + "{9EF0B969-E518-4E46-987F-47570745A589}:_6C6DD76B009B4F9E9B9E8C9862FEF487" { - "Name" = "8:Door" + "Name" = "8:板饰面" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:_0E131D1E621E4AF987555692269DB07C" + "Property" = "8:_490DD7B90FEB4B47AC8746DD52F5A2EA" "Folders" { } } - "{9EF0B969-E518-4E46-987F-47570745A589}:_406EA5A50D6D43439512FD26B8E10B12" + "{9EF0B969-E518-4E46-987F-47570745A589}:_6E817D1A55504DF1A464A896AB1135D7" { - "Name" = "8:Shelf" + "Name" = "8:出入口" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:_E20BDEFFA62E4E0AB20264F078C8B707" + "Property" = "8:_72A76CBB323644E3939891C25CBDE16F" "Folders" { } } - "{9EF0B969-E518-4E46-987F-47570745A589}:_53DBD7D27C3C4DBD92F6D88A8725455A" + "{9EF0B969-E518-4E46-987F-47570745A589}:_7307D1B62D474D0786B3F43094D92CC0" { - "Name" = "8:Equipment" + "Name" = "8:设备" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:_0A1B0BB2E7944BA6B18DFCB74744DDD0" + "Property" = "8:_8FFEE81B196242EB83BADDF149F696DE" "Folders" { } } - "{9EF0B969-E518-4E46-987F-47570745A589}:_7692A4F9B7D744A3A1E5AFA9F95890CD" + "{9EF0B969-E518-4E46-987F-47570745A589}:_98E27BC7EFA24FC1BCA0DF735BDD58D5" { - "Name" = "8:Furniture" + "Name" = "8:其他" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:_2937B017097146D2A6817AF7E4D5E730" + "Property" = "8:_3E2C85209B2246D388AAC76D8919C230" "Folders" { } } - "{9EF0B969-E518-4E46-987F-47570745A589}:_9B75B83A53C7405E9D6020ABD06A3A14" + "{9EF0B969-E518-4E46-987F-47570745A589}:_B4398527109B4F75A08962ABDB7B8946" { - "Name" = "8:Gate" + "Name" = "8:墙饰面" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:_D4C27DCA72014974BE0153F4567A0529" + "Property" = "8:_517B8DCE40E24601B0761B3542DA2DA1" "Folders" { } } - "{9EF0B969-E518-4E46-987F-47570745A589}:_B3DF628258C043A6986617245B6F0BEE" + "{9EF0B969-E518-4E46-987F-47570745A589}:_B551F2A6C0904D6BBC32D147053B2218" { - "Name" = "8:WallFinish" + "Name" = "8:标识标牌" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:_9539AA0455A14FD69BA524C6CA182A21" + "Property" = "8:_17F277B9DB6146E8AF2C571065CA47A5" "Folders" { } } - "{9EF0B969-E518-4E46-987F-47570745A589}:_BD6760C8ED8A40BFA5E98484CCEAA2B0" + "{9EF0B969-E518-4E46-987F-47570745A589}:_C339685F5ECF4472982108116EDD1313" { - "Name" = "8:Sign" + "Name" = "8:家具" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:_AAD8831F673B4E9785D1F730886BBBFB" + "Property" = "8:_9EB8DA6D6ADB458E8877ED7AF98E46E3" "Folders" { } } - "{9EF0B969-E518-4E46-987F-47570745A589}:_BFD89CD05BEB451EA768E58E9AF9EB35" + "{9EF0B969-E518-4E46-987F-47570745A589}:_C5CB0261E21D4CACB8E9BDCB134DB886" { - "Name" = "8:Lamp" + "Name" = "8:货架" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:_B8528982D85B476DB1C20E79CCD7C709" + "Property" = "8:_4FF4A3B74F234075A4DBF50CA852B6CF" "Folders" { } } - "{9EF0B969-E518-4E46-987F-47570745A589}:_CCB9CA9C12EE4E23A02C5D6A329D2A50" + "{9EF0B969-E518-4E46-987F-47570745A589}:_C856AF9B3EC949E29C78B2DE5C2C78EB" { - "Name" = "8:Location" + "Name" = "8:灯具" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:_D9480F0D263B466FAC0BB89F6CF1E3F5" + "Property" = "8:_1AC4FAC9183B4D9496415B2AA5A1B6A0" "Folders" { } } - "{9EF0B969-E518-4E46-987F-47570745A589}:_D0C4D81042044D55A4163DAFEA624966" + "{9EF0B969-E518-4E46-987F-47570745A589}:_E72FF5B6871B4CAD9DD292E024751230" { - "Name" = "8:Others" + "Name" = "8:门" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:_BAC898C1945847DBB424EE83CCCDAF80" + "Property" = "8:_6477EA8E5DF045B784CF3D9B969D12D9" + "Folders" + { + } + } + "{9EF0B969-E518-4E46-987F-47570745A589}:_FF6F2E169EDB4DC4B78B71B9F8DFCC0A" + { + "Name" = "8:开关" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_2CC9FDC14A134AB19F1A59459EA1F7F3" "Folders" { } @@ -2613,7 +2988,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:菜鸟驿站工具集" "ProductCode" = "8:{5DCFF0F8-3C6C-4C34-B888-63FE8034843E}" - "PackageCode" = "8:{91ECDA1D-5270-45EF-890D-1889A8B67DC7}" + "PackageCode" = "8:{F481155F-8AF8-48C7-A715-4BA4074E52A3}" "UpgradeCode" = "8:{127EC3EC-7539-468B-84EA-E1ECDD6204E6}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE"