长融世贸三期合成

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "Assets/MscPublic"]
-	path = Assets/MscPublic
-	url = http://121.36.37.70:3000/mengtao/MscPublic.git
+[submodule "Assets/MscPublic2.1"]
+	path = Assets/MscPublic2.1
+	url = http://121.36.37.70:3000/AX-ORG/MscPublic2.git

Assets/CloneTypesTemplate/Editor/SceneTool.cs

@@ -2,405 +2,89 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
-using UnityEngine.AI;
-using System.IO;
-using System.Text;
-using System;
 
-public class SceneTool
+public class SceneTool : Editor
 {
-    [MenuItem("SceneTool/SetFloorMessage")]//添加FloorMessage脚本绑定楼层信息
-    public static void SetFloorMessage()
-    {
-        Transform neiParent = GameObject.Find("shinei").transform.GetChild(0);
-        for (int i = 0; i < neiParent.childCount; i++)
-        {
-            //Debug.Log(neiParent.GetChild(i).name);
-            if (!neiParent.GetChild(i).GetComponent<FloorMessage>())
-            {
-                neiParent.GetChild(i).gameObject.AddComponent<FloorMessage>();
-            }
-            FloorMessage msg = neiParent.GetChild(i).GetComponent<FloorMessage>();
-            msg.targetTrans = GetTarget(neiParent.GetChild(i));
-            msg.buildNum = neiParent.name;
-            if (!neiParent.GetChild(i).name.ToLower().Contains("m"))
-            {
-                string floornum = neiParent.GetChild(i).name.Substring
-                    (neiParent.GetChild(i).name.ToLower().IndexOf("nei") + 3, neiParent.GetChild(i).name.Length - 3);
-                msg.floorNum = int.Parse(floornum);
-                msg.interlayerNum = 0;
-            }
-            else
-            {
-                msg.floorNum = int.Parse(neiParent.GetChild(i).name.Substring
-                    (neiParent.GetChild(i).name.ToLower().IndexOf("nei") + 3, neiParent.GetChild(i).name.ToLower().IndexOf("m")
-                    - neiParent.GetChild(i).name.ToLower().IndexOf("nei") - 3));
-                msg.interlayerNum = int.Parse(neiParent.GetChild(i).name.Substring
-                    (neiParent.GetChild(i).name.ToLower().IndexOf("m") + 1, neiParent.GetChild(i).name.Length -
-                    neiParent.GetChild(i).name.ToLower().IndexOf("m") - 1));
-            }
-        }
-        Transform waiParent = GameObject.Find("shiwai").transform.GetChild(0);
-        for (int i = 0; i < waiParent.childCount; i++)
-        {
-            //Debug.Log(waiParent.GetChild(i).name);
-            if (!waiParent.GetChild(i).GetComponent<FloorMessage>())
-            {
-                waiParent.GetChild(i).gameObject.AddComponent<FloorMessage>();
-            }
-            FloorMessage msg = waiParent.GetChild(i).GetComponent<FloorMessage>();
-            msg.buildNum = waiParent.name;
-            if (!waiParent.GetChild(i).name.ToLower().Contains("m"))
-            {
-                string floornum = waiParent.GetChild(i).name.Substring
-                    (waiParent.GetChild(i).name.ToLower().IndexOf("wai") + 3, waiParent.GetChild(i).name.Length - 3);
-                msg.floorNum = int.Parse(floornum);
-                msg.interlayerNum = 0;
-            }
-            else
-            {
-                msg.floorNum = int.Parse(waiParent.GetChild(i).name.Substring
-                    (waiParent.GetChild(i).name.ToLower().IndexOf("wai") + 3, waiParent.GetChild(i).name.ToLower().IndexOf("m")
-                    - waiParent.GetChild(i).name.ToLower().IndexOf("wai") - 3));
-                msg.interlayerNum = int.Parse(waiParent.GetChild(i).name.Substring
-                    (waiParent.GetChild(i).name.ToLower().IndexOf("m") + 1, waiParent.GetChild(i).name.Length -
-                    waiParent.GetChild(i).name.ToLower().IndexOf("m") - 1));
-            }
-        }
-    }
-    static Transform GetTarget(Transform parent)
-    {
-        for (int i = 0; i < parent.childCount; i++)
-        {
-            if (parent.GetChild(i).name.ToLower().Contains("_floor")
-                || parent.GetChild(i).name.ToLower().Contains("-floor")
-                || parent.GetChild(i).name.ToLower().Contains("-floor")
-                )
-            {
-                if (parent.GetChild(i).GetComponent<MeshRenderer>())
-                    return parent.GetChild(i);
-            }
-        }
-
-        return parent;
-    }
-    [MenuItem("SceneTool/SetNavLayerShiNeiFloor")]//添加寻路层（选中shinei对象设置，注：扶梯情况特殊没有包含）
-    public static void SetNavLayerShiNeiFloor()
+    [MenuItem("SceneTool/AddNewScripts")]//优化增加新的脚本
+    public static void AddNewScripts()
     {
         Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
         for (int i = 0; i < obj.Length; i++)
         {
-            if (obj[i].name.ToLower().Contains("_floor") ||//地面
-                obj[i].name.ToLower().Contains("_floor") ||
-                obj[i].name.ToLower().Contains("-floor") &&
-                obj[i].GetComponent<MeshRenderer>())
+            if (obj[i].gameObject.activeInHierarchy && obj[i].gameObject.GetComponent<CloneableEnums>())
             {
-                obj[i].gameObject.layer = LayerMask.NameToLayer("SoldierRoad");
-                if (!obj[i].gameObject.GetComponent<MeshCollider>())
+                if (!obj[i].gameObject.GetComponent<CloneEnumsHelp>())
                 {
-                    obj[i].gameObject.AddComponent<MeshCollider>();
+                    obj[i].gameObject.AddComponent<CloneEnumsHelp>();
                 }
-                if (!obj[i].gameObject.GetComponent<PathFindable>())
+                var count = obj[i].GetComponent<CloneableEnums>().CloneableTypes.Count;
+                if (count == 81|| count == 80)// 室外车能走
                 {
-                    obj[i].gameObject.AddComponent<PathFindable>();
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.ShiWaiCar;
                 }
-                if (!obj[i].gameObject.GetComponent<CloneGameObjInfo>())
+                else if (count == 35 && hasParentByName(obj[i].gameObject, "shinei"))// 室内人能走
                 {
-                    obj[i].gameObject.AddComponent<CloneGameObjInfo>();
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.ShiNeiMan;
                 }
-                if (!obj[i].gameObject.GetComponent<CloneableEnums>())
+                else if (count == 35 && hasParentByName(obj[i].gameObject, "shiwai"))// 楼顶
                 {
-                    obj[i].gameObject.AddComponent<CloneableEnums>();
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.LouDing;
                 }
-                CloneableEnums enumParent = obj[i].gameObject.GetComponent<CloneableEnums>();
-                Transform Template = GameObject.Find("TheCarRoad").transform.Find("ShiNeiFloor");
-                var CloneableEnums = Template.GetComponent<CloneableEnums>();
-                enumParent.CloneableTypes = CloneableEnums.CloneableTypes;
-                if (obj[i].parent.GetComponent<FloorMessage>())
+                else if (count == 46)// 室外人能走
                 {
-                    FloorMessage fmg = obj[i].parent.GetComponent<FloorMessage>();
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjType = CloneObjType.StaticGameObject;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().buildNum = fmg.buildNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().floorNum = fmg.floorNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().interlayerNum = fmg.interlayerNum;
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.ShiWaiMan;
                 }
-                if (obj[i].parent.parent.GetComponent<FloorMessage>())
+                else if (obj[i].gameObject.GetComponent<InDoorHydrantMessage>())// 室内消火栓
                 {
-                    FloorMessage fmg = obj[i].parent.parent.GetComponent<FloorMessage>();
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjType = CloneObjType.StaticGameObject;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().buildNum = fmg.buildNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().floorNum = fmg.floorNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().interlayerNum = fmg.interlayerNum;
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.ShiNeiXHS;
                 }
-            }
-            if (obj[i].name.ToLower().Contains("_wall") ||//墙面
-                obj[i].name.ToLower().Contains("_wall") ||
-                obj[i].name.ToLower().Contains("-wall") &&
-                obj[i].GetComponent<MeshRenderer>())
-            {
-                obj[i].gameObject.layer = LayerMask.NameToLayer("SoldierRoad");
-                if (!obj[i].gameObject.GetComponent<NavMeshModifier>())
+                else if(count == 3)//罐顶
                 {
-                    obj[i].gameObject.AddComponent<NavMeshModifier>();
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.YouGuanDing;
                 }
-                NavMeshModifier mod = obj[i].gameObject.GetComponent<NavMeshModifier>();
-                mod.overrideArea = true;
-                mod.area = 1;
-                if (!obj[i].gameObject.GetComponent<MeshCollider>())
-                {
-                    obj[i].gameObject.AddComponent<MeshCollider>();
-                }
-            }
-            if (obj[i].name.ToLower().Contains("zhuzi") ||//柱子
-               obj[i].name.ToLower().Contains("_zhuzi") ||
-               obj[i].name.ToLower().Contains("-zhuzi") &&
-               obj[i].GetComponent<MeshRenderer>())
-            {
-                //Debug.Log(obj[i].name);
-                obj[i].gameObject.layer = LayerMask.NameToLayer("SoldierRoad");
-                if (!obj[i].gameObject.GetComponent<NavMeshModifier>())
-                {
-                    obj[i].gameObject.AddComponent<NavMeshModifier>();
-                }
-                NavMeshModifier mod = obj[i].gameObject.GetComponent<NavMeshModifier>();
-                mod.overrideArea = true;
-                mod.area = 1;
-                if (!obj[i].gameObject.GetComponent<MeshCollider>())
-                {
-                    obj[i].gameObject.AddComponent<MeshCollider>();
-                }
-            }
-            if (obj[i].name.ToLower().Contains("lt") &&
-                obj[i].GetComponent<MeshRenderer>() &&
-                !obj[i].name.ToLower().Contains("lt_name"))//楼梯
-            {
-                obj[i].gameObject.layer = LayerMask.NameToLayer("SoldierRoad");
-                if (!obj[i].gameObject.GetComponent<MeshCollider>())
+                else if(count == 1 && hasParentByName(obj[i].gameObject, "GuanQu"))//罐壁
                 {
-                    obj[i].gameObject.AddComponent<MeshCollider>();
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.YouGuanBi;
                 }
-                if (!obj[i].gameObject.GetComponent<PathFindable>())
+                else if(count == 27)//罐区地面
                 {
-                    obj[i].gameObject.AddComponent<PathFindable>();
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.GuanQuDiMian;
                 }
-                if (!obj[i].gameObject.GetComponent<CloneGameObjInfo>())
+                else if(count == 1 && hasParentByName(obj[i].gameObject, "syk"))//试压口
                 {
-                    obj[i].gameObject.AddComponent<CloneGameObjInfo>();
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.ShiYaKou;
                 }
-                if (!obj[i].gameObject.GetComponent<CloneableEnums>())
+                else if (count == 1 && hasParentByName(obj[i].gameObject, "CubeParent"))//半固定接口
                 {
-                    obj[i].gameObject.AddComponent<CloneableEnums>();
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.SemiFixedInterface;
                 }
-                CloneableEnums enumParent = obj[i].gameObject.GetComponent<CloneableEnums>();
-                Transform Template = GameObject.Find("TheCarRoad").transform.Find("ShiNeiFloor");
-                var CloneableEnums = Template.GetComponent<CloneableEnums>();
-                enumParent.CloneableTypes = CloneableEnums.CloneableTypes;
-                if (obj[i].parent.GetComponent<FloorMessage>())
+                else if (count == 1 && hasParentByName(obj[i].gameObject, "Normal"))//半固定分水器
                 {
-                    FloorMessage fmg = obj[i].parent.GetComponent<FloorMessage>();
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjType = CloneObjType.StaticGameObject;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().buildNum = fmg.buildNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().floorNum = fmg.floorNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().interlayerNum = fmg.interlayerNum;
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.SemiFixedWaterSegregator;
                 }
-                if (obj[i].parent.parent.GetComponent<FloorMessage>())
+                else
                 {
-                    FloorMessage fmg = obj[i].parent.parent.GetComponent<FloorMessage>();
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjType = CloneObjType.StaticGameObject;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().buildNum = fmg.buildNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().floorNum = fmg.floorNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().interlayerNum = fmg.interlayerNum;
-                }
-            }
-            if (obj[i].name.ToLower().Contains("futi") &&
-               obj[i].GetComponent<MeshRenderer>())//扶梯
-
-            {
-                obj[i].gameObject.layer = LayerMask.NameToLayer("SoldierRoad");
-                if (!obj[i].gameObject.GetComponent<MeshCollider>())
-                {
-                    obj[i].gameObject.AddComponent<MeshCollider>();
-                }
-                if (!obj[i].gameObject.GetComponent<PathFindable>())
-                {
-                    obj[i].gameObject.AddComponent<PathFindable>();
-                }
-                if (!obj[i].gameObject.GetComponent<CloneGameObjInfo>())
-                {
-                    obj[i].gameObject.AddComponent<CloneGameObjInfo>();
-                }
-                if (!obj[i].gameObject.GetComponent<CloneableEnums>())
-                {
-                    obj[i].gameObject.AddComponent<CloneableEnums>();
-                }
-                CloneableEnums enumParent = obj[i].gameObject.GetComponent<CloneableEnums>();
-                Transform Template = GameObject.Find("TheCarRoad").transform.Find("ShiNeiFloor");
-                var CloneableEnums = Template.GetComponent<CloneableEnums>();
-                enumParent.CloneableTypes = CloneableEnums.CloneableTypes;
-                if (obj[i].parent.GetComponent<FloorMessage>())
-                {
-                    FloorMessage fmg = obj[i].parent.GetComponent<FloorMessage>();
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjType = CloneObjType.StaticGameObject;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().buildNum = fmg.buildNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().floorNum = fmg.floorNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().interlayerNum = fmg.interlayerNum;
-                }
-                if (obj[i].parent.parent.GetComponent<FloorMessage>())
-                {
-                    FloorMessage fmg = obj[i].parent.parent.GetComponent<FloorMessage>();
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjType = CloneObjType.StaticGameObject;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().buildNum = fmg.buildNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().floorNum = fmg.floorNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().interlayerNum = fmg.interlayerNum;
+                    Debug.Log("警告，有对象没有绑定上脚本" + obj[i].name);
                 }
             }
         }
     }
-    [MenuItem("SceneTool/SetNavLayerShiWaiCarRoad")]//添加寻路层车（前提是将车的寻路层添加layer CarRoad）
-    public static void SetNavLayerShiWaiCarRoad()
+    private static bool hasParentByName(GameObject gameObject, string parentName)
     {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        for (int i = 0; i < obj.Length; i++)
+        if (gameObject.transform.parent)
         {
-            if (obj[i].gameObject.layer == LayerMask.NameToLayer("CarRoad"))
+            if (gameObject.transform.parent.name == parentName)
             {
-                if (!obj[i].gameObject.GetComponent<NavMeshModifier>())
-                {
-                    //Debug.Log(obj[i].name);
-                    if (!obj[i].gameObject.GetComponent<MeshCollider>())
-                    {
-                        obj[i].gameObject.AddComponent<MeshCollider>();
-                    }
-                    if (!obj[i].gameObject.GetComponent<PathFindable>())
-                    {
-                        obj[i].gameObject.AddComponent<PathFindable>();
-                    }
-                    if (!obj[i].gameObject.GetComponent<CloneableEnums>())
-                    {
-                        obj[i].gameObject.AddComponent<CloneableEnums>();
-                    }
-                    CloneableEnums enumParent = obj[i].gameObject.GetComponent<CloneableEnums>();
-                    Transform Template = GameObject.Find("TheCarRoad").transform;
-                    var CloneableEnums = Template.GetComponent<CloneableEnums>();
-                    enumParent.CloneableTypes = CloneableEnums.CloneableTypes;
-                }
+                return true;
             }
-        }
-    }
-    [MenuItem("SceneTool/SetNavLayerShiWaiSoldierRoad")]//添加寻路层车（前提是将车的寻路层添加layer SoliderRoad）
-    public static void SetNavLayerShiWaiSoliderRoad()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        for (int i = 0; i < obj.Length; i++)
-        {
-            if (obj[i].gameObject.layer == LayerMask.NameToLayer("SoldierRoad"))
-            {
-                if (!obj[i].gameObject.GetComponent<NavMeshModifier>())
-                {
-                    //Debug.Log(obj[i].name);
-                    if (!obj[i].gameObject.GetComponent<MeshCollider>())
-                    {
-                        obj[i].gameObject.AddComponent<MeshCollider>();
-                    }
-                    if (!obj[i].gameObject.GetComponent<PathFindable>())
-                    {
-                        obj[i].gameObject.AddComponent<PathFindable>();
-                    }
-                    if (!obj[i].gameObject.GetComponent<CloneableEnums>())
-                    {
-                        obj[i].gameObject.AddComponent<CloneableEnums>();
-                    }
-                    CloneableEnums enumParent = obj[i].gameObject.GetComponent<CloneableEnums>();
-                    Transform Template = GameObject.Find("TheCarRoad").transform.Find("ShiWaiSolider");
-                    var CloneableEnums = Template.GetComponent<CloneableEnums>();
-                    enumParent.CloneableTypes = CloneableEnums.CloneableTypes;
-                }
-            }
-        }
-    }
-    [MenuItem("SceneTool/RemoveColider")]//移除碰撞器
-    public static void RemoveColider()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        {
-            for (int i = 0; i < obj.Length; i++)
+            else
             {
-                if (obj[i].GetComponent<MeshRenderer>())
-                {
-                    if (obj[i].GetComponent<MeshCollider>())
-                    {
-                        UnityEngine.Object.DestroyImmediate(obj[i].GetComponent<MeshCollider>(), true);
-                    }
-                }
+                return hasParentByName(gameObject.transform.parent.gameObject, parentName);
             }
         }
-    }
-    [MenuItem("SceneTool/SetshineiXHS")]//设置室内消火栓属性
-    public static void SetSNXHS()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        for (int i = 0; i < obj.Length; i++)
+        else
         {
-            if (obj[i].name.ToLower().Contains("snxh") &&
-                obj[i].GetComponent<MeshRenderer>())
-            {
-                if (!obj[i].gameObject.GetComponent<BoxCollider>())
-                {
-                    obj[i].gameObject.AddComponent<BoxCollider>();
-                }
-                if (!obj[i].gameObject.GetComponent<CloneGameObjInfo>())
-                {
-                    obj[i].gameObject.AddComponent<CloneGameObjInfo>();
-                }
-                if (obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjID == 0)
-                {
-                    long staticGameObjId = (long)GUID.NewGuid(1, 1);
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().SetGameObjID(staticGameObjId);
-                }
-                obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjType = CloneObjType.IndoorFireHydrant;
-                if (!obj[i].gameObject.GetComponent<InDoorHydrantMessage>())
-                {
-                    obj[i].gameObject.AddComponent<InDoorHydrantMessage>();
-                }
-                if (!obj[i].gameObject.GetComponent<WaterSource>())
-                {
-                    obj[i].gameObject.AddComponent<WaterSource>();
-                }
-                if (!obj[i].gameObject.GetComponent<CloneableEnums>())
-                {
-                    obj[i].gameObject.AddComponent<CloneableEnums>();
-                }
-                CloneableEnums enumParent = obj[i].gameObject.GetComponent<CloneableEnums>();
-
-                List<CloneObjType> EnumsList = new List<CloneObjType>() {
-                        CloneObjType.FireHose
-                };
-                enumParent.CloneableTypes = EnumsList;
-                if (obj[i].parent.GetComponent<FloorMessage>())
-                {
-                    FloorMessage fmg = obj[i].parent.GetComponent<FloorMessage>();
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjType = CloneObjType.IndoorFireHydrant;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().buildNum = fmg.buildNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().floorNum = fmg.floorNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().interlayerNum = fmg.interlayerNum;
-                }
-                if (obj[i].parent.parent.GetComponent<FloorMessage>())
-                {
-                    FloorMessage fmg = obj[i].parent.parent.GetComponent<FloorMessage>();
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjType = CloneObjType.IndoorFireHydrant;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().buildNum = fmg.buildNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().floorNum = fmg.floorNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().interlayerNum = fmg.interlayerNum;
-                }
-                if (obj[i].parent.parent.parent.GetComponent<FloorMessage>())
-                {
-                    FloorMessage fmg = obj[i].parent.parent.parent.GetComponent<FloorMessage>();
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjType = CloneObjType.IndoorFireHydrant;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().buildNum = fmg.buildNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().floorNum = fmg.floorNum;
-                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().interlayerNum = fmg.interlayerNum;
-                }
-            }
+            return false;
         }
     }
-}
+}

Assets/Editor.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c618cece409bd7a448aa62abfb1c559d
+guid: 5ee8f1e3561f28a41a2b0ba0c464e470
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/MscPublic

@@ -1 +0,0 @@
-Subproject commit de87481cc215ef168c1832a66b809840b98e580c

Assets/MscPublic2.1

@@ -0,0 +1 @@
+Subproject commit 8cf275dfd2efd7d3950b74077ad21ef5265fffc8

Assets/MscPublic2.1.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6c00ef155a89f1848a4248058d55e0b6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/AssetBundles/ChangRongShiMaoAB/ChangRongShiMaoAB.manifest

@@ -1,5 +1,5 @@
 ManifestFileVersion: 0
-CRC: 1552743366
+CRC: 2949364813
 AssetBundleManifest:
   AssetBundleInfos:
     Info_0:

Assets/StreamingAssets/AssetBundles/ChangRongShiMaoAB/buildingscene.manifest

@@ -1,12 +1,12 @@
 ManifestFileVersion: 0
-CRC: 3683137107
+CRC: 1930878544
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: f7b9c542e35de36238210ddf53850432
+    Hash: e86ecddec40f0c25769c67355bfd6733
   TypeTreeHash:
     serializedVersion: 2
-    Hash: 82f9fb1db1c986b98a3538e262547d70
+    Hash: 19842d3b394de8e0a8fa5fa202755ca1
 HashAppended: 0
 ClassTypes:
 - Class: 1
@@ -53,6 +53,8 @@ ClassTypes:
   Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: e01c388cf4175aa49b4973deb437d754, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: b8b046bc0ab99e94cb2c70fd441b8fc7, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: b133d14efd54f9841a1659ef37479be7, type: 3}
 - Class: 114