重构2.1,导出AB包

1 year ago · 3dd20e1c33
9 changed files with 1682 additions and 921 deletions
--- a/Assets/CloneTypesTemplate/Editor/SceneTool.cs
+++ b/Assets/CloneTypesTemplate/Editor/SceneTool.cs
@ -2,668 +2,96 @@ 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].name.ToLower().Contains("chewei") ||
-                obj[i].name.ToLower().Contains("-floor") &&
-                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;
-                }
-            }
-            if (obj[i].name.ToLower().Contains("_wall") ||//墙面
-                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>())
-                {
-                    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("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].name.ToLower().Contains("_ltcs"))//楼梯
-            {
-                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;
-                }
-            }
-            if (obj[i].name.ToLower().Contains("ft") &&
-           obj[i].GetComponent<MeshRenderer>() &&
-           !obj[i].name.ToLower().Contains("ft_name") &&
-           !obj[i].name.ToLower().Contains("bf"))//扶梯
+            if (obj[i].gameObject.activeInHierarchy && obj[i].gameObject.GetComponent<CloneableEnums>())
            {
-                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>())
+                if (!obj[i].gameObject.GetComponent<CloneEnumsHelp>())
                {
-                    obj[i].gameObject.AddComponent<CloneGameObjInfo>();
+                    obj[i].gameObject.AddComponent<CloneEnumsHelp>();
                }
-                if (!obj[i].gameObject.GetComponent<CloneableEnums>())
+                var count = obj[i].GetComponent<CloneableEnums>().CloneableTypes.Count;
+                if (count == 81 || count == 80 || count == 82)// 室外车能走
                {
-                    obj[i].gameObject.AddComponent<CloneableEnums>();
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.ShiWaiCar;
                }
-                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 == 35 && hasParentByName(obj[i].gameObject, "shinei"))// 室内人能走
                {
-                    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.ShiNeiMan;
                }
-                if (obj[i].parent.parent.GetComponent<FloorMessage>())
+                else if (count == 35 && hasParentByName(obj[i].gameObject, "shiwai"))// 楼顶
                {
-                    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.LouDing;
                }
-            }
-        }
-    }
-    [MenuItem("SceneTool/SetNavLayerShiWaiCarRoad")]//添加寻路层车（前提是将车的寻路层添加layer CarRoad）
-    public static void SetNavLayerShiWaiCarRoad()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        for (int i = 0; i < obj.Length; i++)
-        {
-            if (obj[i].gameObject.layer == LayerMask.NameToLayer("CarRoad"))
-            {
-                if (!obj[i].gameObject.GetComponent<NavMeshModifier>())
+                else if (count == 46 || count == 36 || count == 47 || count == 49)// 室外人能走
                {
-                    //Debug.Log(obj[i].name);
-                    if (!obj[i].gameObject.GetComponent<MeshCollider>())
+                    if (hasParentByName(obj[i].gameObject, "shinei"))
                    {
-                        obj[i].gameObject.AddComponent<MeshCollider>();
+                        obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.ShiNeiMan;
                    }
-                    if (!obj[i].gameObject.GetComponent<PathFindable>())
+                    else
                    {
-                        obj[i].gameObject.AddComponent<PathFindable>();
+                        obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.ShiWaiMan;
                    }
-                    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;
                }
-            }
-        }
-    }
-    [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++)
-            {
-                if (obj[i].GetComponent<MeshRenderer>())
-                {
-                    if (obj[i].GetComponent<MeshCollider>())
-                    {
-                        UnityEngine.Object.DestroyImmediate(obj[i].GetComponent<MeshCollider>(), true);
-                    }
-                }
-            }
-        }
-    }
-    [MenuItem("SceneTool/AddColider")]//添加碰撞器
-    public static void AddColider()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        {
-            for (int i = 0; i < obj.Length; i++)
-            {
-                if (obj[i].GetComponent<MeshRenderer>())
-                {
-                    if (!obj[i].GetComponent<MeshCollider>())
-                    {
-                        obj[i].gameObject.AddComponent<MeshCollider>();
-                    }
-                }
-            }
-        }
-    }
-    [MenuItem("SceneTool/SetGuanDing")]
-    public static void SetGuanDing()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        {
-            for (int i = 0; i < obj.Length; i++)
-            {
-                if (obj[i].GetComponent<MeshRenderer>())
+                else if (obj[i].gameObject.GetComponent<InDoorHydrantMessage>())// 室内消火栓
                {
-                    if (!obj[i].gameObject.GetComponent<MeshCollider>())
-                    {
-                        obj[i].gameObject.AddComponent<MeshCollider>();
-                    }
-                    if (!obj[i].gameObject.GetComponent<CloneableEnums>())
-                    {
-                        obj[i].gameObject.AddComponent<CloneableEnums>();
-                    }
-                    if (!obj[i].gameObject.GetComponent<FireOnTank>())
-                    {
-                        obj[i].gameObject.AddComponent<FireOnTank>();
-                    }
-                    if (!obj[i].gameObject.GetComponent<PathFindable>())
-                    {
-                        obj[i].gameObject.AddComponent<PathFindable>();
-                    }
-                    obj[i].gameObject.layer = LayerMask.NameToLayer("SoldierRoad");
-                    CloneableEnums enumParent = obj[i].gameObject.GetComponent<CloneableEnums>();
-                    Transform Template = GameObject.Find("Guanding").transform;
-                    var CloneableEnums = Template.GetComponent<CloneableEnums>();
-                    enumParent.CloneableTypes = CloneableEnums.CloneableTypes;
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.ShiNeiXHS;
                }
-            }
-        }
-    }
-    [MenuItem("SceneTool/SetGuanBi")]
-    public static void SetGuanBi()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        {
-            for (int i = 0; i < obj.Length; i++)
-            {
-                if (obj[i].GetComponent<MeshRenderer>())
+                else if (count == 3)//罐顶
                {
-                    if (!obj[i].gameObject.GetComponent<MeshCollider>())
-                    {
-                        obj[i].gameObject.AddComponent<MeshCollider>();
-                    }
-                    if (!obj[i].gameObject.GetComponent<CloneableEnums>())
-                    {
-                        obj[i].gameObject.AddComponent<CloneableEnums>();
-                    }
-                    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;
-                    CloneableEnums enumParent = obj[i].gameObject.GetComponent<CloneableEnums>();
-                    Transform Template = GameObject.Find("TheCarRoad").transform.Find("GuanBi").transform;
-                    var CloneableEnums = Template.GetComponent<CloneableEnums>();
-                    enumParent.CloneableTypes = CloneableEnums.CloneableTypes;
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.YouGuanDing;
                }
-            }
-        }
-    }
-    [MenuItem("SceneTool/SetGuanDi")]
-    public static void SetGuanDi()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        {
-            for (int i = 0; i < obj.Length; i++)
-            {
-                if (obj[i].GetComponent<MeshRenderer>())
+                else if (count == 1 && hasParentByName(obj[i].gameObject, "GuanQu"))//罐壁
                {
-                    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>();
-                    }
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.YouGuanBi;
                }
-            }
-        }
-    }
-    [MenuItem("SceneTool/SetTeamTargetItemName")]
-    public static void SetTeamTargetItemName()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        {
-            for (int i = 0; i < obj.Length; i++)
-            {
-                if (obj[i].GetComponent<TeamTargetItem>())
+                else if (count == 27)//罐区地面
                {
-                    obj[i].gameObject.GetComponent<TeamTargetItem>().TankName = obj[i].gameObject.name;
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.GuanQuDiMian;
                }
-            }
-        }
-    }
-    [MenuItem("SceneTool/SetGuanLouTi")]
-    public static void SetGuanLouTi()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        {
-            for (int i = 0; i < obj.Length; i++)
-            {
-                if (obj[i].GetComponent<MeshRenderer>())
+                else if (count == 1 && hasParentByName(obj[i].gameObject, "syk"))//试压口
                {
-                    obj[i].gameObject.layer = LayerMask.NameToLayer("SoldierRoad");
-                    if (!obj[i].gameObject.GetComponent<CloneableEnums>())
-                    {
-                        obj[i].gameObject.AddComponent<CloneableEnums>();
-                    }
-                    if (!obj[i].gameObject.GetComponent<MeshCollider>())
-                    {
-                        obj[i].gameObject.AddComponent<MeshCollider>();
-                    }
-                    if (!obj[i].gameObject.GetComponent<PathFindable>())
-                    {
-                        obj[i].gameObject.AddComponent<PathFindable>();
-                    }
-                    CloneableEnums enumParent = obj[i].gameObject.GetComponent<CloneableEnums>();
-                    Transform Template = GameObject.Find("GuanLouTi").transform;
-                    var CloneableEnums = Template.GetComponent<CloneableEnums>();
-                    enumParent.CloneableTypes = CloneableEnums.CloneableTypes;
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.ShiYaKou;
                }
-            }
-        }
-    }
-    [MenuItem("SceneTool/SetDouBuZou")]
-    public static void SetDouBuZou()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        {
-            for (int i = 0; i < obj.Length; i++)
-            {
-                if (obj[i].GetComponent<MeshRenderer>())
+                else if (count == 1 && hasParentByName(obj[i].gameObject, "CubeParent"))//半固定接口
                {
-                    obj[i].gameObject.layer = LayerMask.NameToLayer("CarRoad");
-                    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>();
-                    }
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.SemiFixedInterface;
                }
-            }
-        }
-    }
-    [MenuItem("SceneTool/ChangDingName")]
-    public static void ChangDingName()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        {
-            for (int i = 0; i < obj.Length; i++)
-            {
-                if (obj[i].GetComponent<MeshRenderer>())
+                else if (count == 1 && hasParentByName(obj[i].gameObject, "Normal"))//半固定分水器
                {
-                    if (obj[i].gameObject.GetComponent<FireOnTank>())
-                    {
-                        obj[i].gameObject.name = "GuanDing";
-                    }
+                    obj[i].gameObject.GetComponent<CloneEnumsHelp>().cloneOnFloorType = CloneOnFloorType.SemiFixedWaterSegregator;
                }
-            }
-        }
-    }
-    [MenuItem("SceneTool/ChangBiName")]
-    public static void ChangBiName()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        {
-            for (int i = 0; i < obj.Length; i++)
-            {
-                if (obj[i].GetComponent<MeshRenderer>())
+                else
                {
-                    if (obj[i].gameObject.GetComponent<CloneableEnums>() && obj[i].gameObject.GetComponent<CloneableEnums>().CloneableTypes.Count == 1)
-                    {
-                        if (obj[i].gameObject.GetComponent<CloneableEnums>().CloneableTypes[0] == CloneObjType.FireBreakThough)
-                            obj[i].gameObject.name = "GuanBi";
-                    }
+                    Debug.Log("警告，有对象没有绑定上脚本" + obj[i].name);
                }
            }
        }
    }
-    [MenuItem("SceneTool/ChangeMessage")]//添加碰撞器
-    public static void ChangeMessage()
+    private static bool hasParentByName(GameObject gameObject, string parentName)
    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
+        if (gameObject.transform.parent)
        {
-            for (int i = 0; i < obj.Length; i++)
+            if (gameObject.transform.parent.name == parentName)
            {
-                if (obj[i].GetComponent<CloneGameObjInfo>())
-                {
-                    if (obj[i].GetComponent<CloneGameObjInfo>().buildNum == "8XGYTC")
-                    {
-                        obj[i].GetComponent<CloneGameObjInfo>().buildNum = "2XGYTC";
-                    }
-
-                }
+                return true;
            }
-        }
-    }
-    [MenuItem("SceneTool/RemoveAnimator")]//移除碰撞器
-    public static void RemoveAnimator()
-    {
-        Transform[] obj = Selection.GetTransforms(SelectionMode.Deep);
-        {
-            for (int i = 0; i < obj.Length; i++)
+            else
            {
-                if (obj[i].GetComponent<Animator>())
-                {
-                    if (obj[i].GetComponent<Animator>())
-                    {
-                        UnityEngine.Object.DestroyImmediate(obj[i].GetComponent<Animator>(), 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("xhs") &&
-                !obj[i].name.ToLower().Contains("xhs_name") &&
-                !obj[i].name.ToLower().Contains("xhs_wz") &&
-                !obj[i].name.ToLower().Contains("xhs-wz") &&
-                obj[i].GetComponent<MeshRenderer>())
-            {
-                if (!obj[i].gameObject.GetComponent<BoxCollider>())
-                {
-                    obj[i].gameObject.AddComponent<BoxCollider>();
-                }
-                if (obj[i].GetComponent<MeshRenderer>())
-                {
-                    if (obj[i].GetComponent<MeshCollider>())
-                    {
-                        UnityEngine.Object.DestroyImmediate(obj[i].GetComponent<MeshCollider>(), true);
-                    }
-                }
-                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;
        }
    }
-}
+}
--- a/Assets/HuaYiNengYuanHuaGong/BuildingScene.unity
+++ b/Assets/HuaYiNengYuanHuaGong/BuildingScene.unity
@ -457,18 +457,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &363375062 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3351115386175079042, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &388567299 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3351115386175079050, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &416940320
 GameObject:
  m_ObjectHideFlags: 0
@ -520,12 +508,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &432000817 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3713306606019665865, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &432479220
 GameObject:
  m_ObjectHideFlags: 0
@ -577,18 +559,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &497314816 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1591424607470306965, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &525460335 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3713306606329652633, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &534618184
 GameObject:
  m_ObjectHideFlags: 0
@ -691,12 +661,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &607170265 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1591424607470306951, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &624783302
 GameObject:
  m_ObjectHideFlags: 0
@ -850,12 +814,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &694777751 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3351115386175079046, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &712325486
 GameObject:
  m_ObjectHideFlags: 0
@ -1057,18 +1015,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &778471132 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1591424607470307067, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &791800028 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1591424607470306963, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &822995055
 GameObject:
  m_ObjectHideFlags: 0
@ -1711,18 +1657,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &984251548 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3713306606843649788, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &1005411960 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3713306606927531745, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1006156788
 GameObject:
  m_ObjectHideFlags: 0
@ -1980,12 +1914,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &1041777384 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1591424607470306947, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1048043944
 GameObject:
  m_ObjectHideFlags: 0
@ -2241,12 +2169,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &1103142340 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1591424607470306955, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1116379736
 GameObject:
  m_ObjectHideFlags: 0
@ -2298,12 +2220,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &1132199604 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1591424607470306959, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1133368187
 GameObject:
  m_ObjectHideFlags: 0
@ -2406,18 +2322,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &1202114251 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3713306606528081232, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &1221954031 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1591424607470306967, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1268612192
 GameObject:
  m_ObjectHideFlags: 0
@ -2571,12 +2475,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &1333460096 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3713306605856883313, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1341993347
 GameObject:
  m_ObjectHideFlags: 0
@ -2934,18 +2832,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &1508245343 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3713306605356426878, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &1514816458 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1591424607470307071, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1519780818
 GameObject:
  m_ObjectHideFlags: 0
@ -2997,12 +2883,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &1527003099 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3351115386175079054, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1536140335
 GameObject:
  m_ObjectHideFlags: 0
@ -3156,12 +3036,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &1565518721 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1591424607470307065, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1573347809
 GameObject:
  m_ObjectHideFlags: 0
@ -3429,12 +3303,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &1709244227 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3351115386175079162, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1732927407
 GameObject:
  m_ObjectHideFlags: 0
@ -3537,12 +3405,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &1787219996 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3351115386175079070, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1860864572
 GameObject:
  m_ObjectHideFlags: 0
@ -3594,12 +3456,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &1902481739 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1591424607470307063, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1944721939
 GameObject:
  m_ObjectHideFlags: 0
@ -3651,12 +3507,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &1976893920 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3713306606010299901, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2000899323
 GameObject:
  m_ObjectHideFlags: 0
@ -3921,12 +3771,6 @@ MonoBehaviour:
  m_Bidirectional: 1
  m_AutoUpdatePosition: 0
  m_Area: 0
--- !u!1 &2113723263 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3351115386175079062, guid: 20a300e55b1734f429f8cd687d48b98a,
-    type: 3}
-  m_PrefabInstance: {fileID: 3713306607027110889}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2128634369
 GameObject:
  m_ObjectHideFlags: 0
@ -4098,150 +3942,5 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2710516686672561524, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.size
-      value: 11
-      objectReference: {fileID: 0}
-    - target: {fileID: 2710516686672561524, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[0]
-      value: 
-      objectReference: {fileID: 1221954031}
-    - target: {fileID: 2710516686672561524, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[1]
-      value: 
-      objectReference: {fileID: 1132199604}
-    - target: {fileID: 2710516686672561524, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[2]
-      value: 
-      objectReference: {fileID: 1103142340}
-    - target: {fileID: 2710516686672561524, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[3]
-      value: 
-      objectReference: {fileID: 607170265}
-    - target: {fileID: 2710516686672561524, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[4]
-      value: 
-      objectReference: {fileID: 1041777384}
-    - target: {fileID: 2710516686672561524, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[5]
-      value: 
-      objectReference: {fileID: 1514816458}
-    - target: {fileID: 2710516686672561524, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[6]
-      value: 
-      objectReference: {fileID: 778471132}
-    - target: {fileID: 2710516686672561524, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[7]
-      value: 
-      objectReference: {fileID: 1565518721}
-    - target: {fileID: 2710516686672561524, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[8]
-      value: 
-      objectReference: {fileID: 1902481739}
-    - target: {fileID: 2710516686672561524, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[9]
-      value: 
-      objectReference: {fileID: 497314816}
-    - target: {fileID: 2710516686672561524, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[10]
-      value: 
-      objectReference: {fileID: 791800028}
-    - target: {fileID: 2092446628038934901, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.size
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 2092446628038934901, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[0]
-      value: 
-      objectReference: {fileID: 1787219996}
-    - target: {fileID: 2092446628038934901, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[1]
-      value: 
-      objectReference: {fileID: 2113723263}
-    - target: {fileID: 2092446628038934901, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[2]
-      value: 
-      objectReference: {fileID: 388567299}
-    - target: {fileID: 2092446628038934901, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[3]
-      value: 
-      objectReference: {fileID: 1527003099}
-    - target: {fileID: 2092446628038934901, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[4]
-      value: 
-      objectReference: {fileID: 363375062}
-    - target: {fileID: 2092446628038934901, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[5]
-      value: 
-      objectReference: {fileID: 694777751}
-    - target: {fileID: 2092446628038934901, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[6]
-      value: 
-      objectReference: {fileID: 1709244227}
-    - target: {fileID: 5709999811907024961, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.size
-      value: 8
-      objectReference: {fileID: 0}
-    - target: {fileID: 5709999811907024961, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[0]
-      value: 
-      objectReference: {fileID: 984251548}
-    - target: {fileID: 5709999811907024961, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[1]
-      value: 
-      objectReference: {fileID: 1976893920}
-    - target: {fileID: 5709999811907024961, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[2]
-      value: 
-      objectReference: {fileID: 1333460096}
-    - target: {fileID: 5709999811907024961, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[3]
-      value: 
-      objectReference: {fileID: 1508245343}
-    - target: {fileID: 5709999811907024961, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[4]
-      value: 
-      objectReference: {fileID: 432000817}
-    - target: {fileID: 5709999811907024961, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[5]
-      value: 
-      objectReference: {fileID: 525460335}
-    - target: {fileID: 5709999811907024961, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[6]
-      value: 
-      objectReference: {fileID: 1005411960}
-    - target: {fileID: 5709999811907024961, guid: 20a300e55b1734f429f8cd687d48b98a,
-        type: 3}
-      propertyPath: tanks.Array.data[7]
-      value: 
-      objectReference: {fileID: 1202114251}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 20a300e55b1734f429f8cd687d48b98a, type: 3}
--- a/Assets/HuaYiNengYuanHuaGong/HuaYiNengYuan.prefab
+++ b/Assets/HuaYiNengYuanHuaGong/HuaYiNengYuan.prefab
--- a/Assets/MscPublic2
+++ b/Assets/MscPublic2
@ -1 +1 @@
-Subproject commit 8cf275dfd2efd7d3950b74077ad21ef5265fffc8
+Subproject commit f1d8242dfae536deadfeec9a2b86ea2d2a5e5725
--- a/Assets/MscPublic2.meta
+++ b/Assets/MscPublic2.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3e13853f2edbaeb4c9978f11cf1186f5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/StreamingAssets/AssetBundles/HuaYiNengYuanAB/HuaYiNengYuanAB
+++ b/Assets/StreamingAssets/AssetBundles/HuaYiNengYuanAB/HuaYiNengYuanAB
--- a/Assets/StreamingAssets/AssetBundles/HuaYiNengYuanAB/HuaYiNengYuanAB.manifest
+++ b/Assets/StreamingAssets/AssetBundles/HuaYiNengYuanAB/HuaYiNengYuanAB.manifest
@ -1,5 +1,5 @@
 ManifestFileVersion: 0
-CRC: 247147684
+CRC: 3581727714
 AssetBundleManifest:
  AssetBundleInfos:
    Info_0:
--- a/Assets/StreamingAssets/AssetBundles/HuaYiNengYuanAB/buildingscene
+++ b/Assets/StreamingAssets/AssetBundles/HuaYiNengYuanAB/buildingscene
--- a/Assets/StreamingAssets/AssetBundles/HuaYiNengYuanAB/buildingscene.manifest
+++ b/Assets/StreamingAssets/AssetBundles/HuaYiNengYuanAB/buildingscene.manifest
@ -1,12 +1,12 @@
 ManifestFileVersion: 0
-CRC: 1612840550
+CRC: 3067872309
 Hashes:
  AssetFileHash:
    serializedVersion: 2
-    Hash: 8711464868d945281a5b40f47667cfb2
+    Hash: ae44205b3947730ec88154f5bea8ff39
  TypeTreeHash:
    serializedVersion: 2
-    Hash: 231f8f45da2d08c18ce0aa7598897595
+    Hash: 713e27f2530224a4a7812e6075329b73
 HashAppended: 0
 ClassTypes:
 - Class: 1
@ -61,6 +61,8 @@ ClassTypes:
  Script: {fileID: 11500000, guid: c6c3bcee76738264da0b700ac7402719, type: 3}
 - Class: 114
  Script: {fileID: 11500000, guid: 49a6ba4f46ec21b4c8a83dce618eda97, type: 3}
+- Class: 114
+  Script: {fileID: 11500000, guid: b8b046bc0ab99e94cb2c70fd441b8fc7, type: 3}
 - Class: 115
  Script: {instanceID: 0}
 - Class: 157