DESKTOP-BGJIU14\ck 22 giờ trước cách đây
mục cha
commit
7c8aea634c

+ 11 - 10
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/RandomAllMap.cs

@@ -11,7 +11,7 @@ namespace GameLogic.Combat.CombatTool.SceneTool
 
         private SceneMonoConfig sceneMonoConfig;
 
-        private Map<int, GameObject> _allGameObjectPools = new Map<int, GameObject>();
+        private Map<int, GameObjectPool> _allGameObjectPools = new Map<int, GameObjectPool>();
 
         public void Init(Transform root, SceneMonoConfig sceneMonoConfig)
         {
@@ -25,11 +25,12 @@ namespace GameLogic.Combat.CombatTool.SceneTool
             List<int> removeKey = new List<int>();
             for (_allGameObjectPools.Begin(); _allGameObjectPools.Next();)
             {
-                Vector3 objetcPos = _allGameObjectPools.Value.transform.position;
+                Vector3 objetcPos = _allGameObjectPools.Value.own.transform.position;
                 if (Vector3.Distance(pos, objetcPos) > 300)
                 {
                     removeKey.Add(_allGameObjectPools.Key);
-                    _allGameObjectPools.Value.SetActive(false);
+                    GObjectPool.Instance.Recycle(_allGameObjectPools.Value);
+                    // _allGameObjectPools.Value.SetActive(false);
                 }
             }
 
@@ -61,22 +62,22 @@ namespace GameLogic.Combat.CombatTool.SceneTool
                         continue;
                     }
 
-                    GameObject gameObjectPool = GetObejct();
+                    GameObjectPool gameObjectPool = GetObejct();
                     float y = Random.Range(-2, 0);
-                    gameObjectPool.transform.position = new Vector3(currX, y, currZ);
+                    gameObjectPool.own.transform.position = new Vector3(currX, y, currZ);
                     _allGameObjectPools.Add(key, gameObjectPool);
                 }
             }
         }
 
-        private GameObject GetObejct()
+        private GameObjectPool GetObejct()
         {
             int index = Random.Range(0, sceneMonoConfig.allObject.Length);
             GameObject gameObject = sceneMonoConfig.allObject[index];
-            GameObject go = GameObject.Instantiate(gameObject);
-            // GameObjectPool gameObjectPool =
-            //     GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(gameObject, gameObject.name);
-            return go;
+            // GameObject go = GameObject.Instantiate(gameObject);
+            GameObjectPool gameObjectPool =
+                GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(gameObject, gameObject.name);
+            return gameObjectPool;
         }
     }
 }

+ 9 - 9
UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -93,9 +93,9 @@ MonoBehaviour:
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
     m_HSlider: 0
-    m_VSlider: 0
+    m_VSlider: 1
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -145,8 +145,8 @@ MonoBehaviour:
     y: 0
     width: 874
     height: 1307
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 2}
   m_Panes:
   - {fileID: 4}
@@ -705,9 +705,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 8806feff
-      m_LastClickedID: -129400
-      m_ExpandedIDs: e4dbfdffeadbfdffea0afeff8626feff8c26feff2c77ffffb6c7ffff3ecbffffe6eeffff38efffff7cfaffff
+      m_SelectedIDs: 106afbff
+      m_LastClickedID: -300528
+      m_ExpandedIDs: 1280fbffe4dbfdffeadbfdffea0afeff8626feff8c26feff2c77ffffb6c7ffff3ecbffffe6eeffff38efffff7cfaffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -872,8 +872,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 8806feff
-    m_LastClickedInstanceID: -129400
+    m_SelectedInstanceIDs: 106afbff
+    m_LastClickedInstanceID: -300528
     m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 00000000
     m_RenameOverlay: