修改bug

Assets/Res/UIAtlas/all.spriteatlasv2

@@ -11,193 +11,6 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
-    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
-    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
-    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
-    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
-    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
-    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
-    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
-    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
-    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
-    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
-    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
-    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
     - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
     - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
     - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}

Assets/Scenes/testCombat.scene

@@ -676,29 +676,29 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   myHeroInfo:
   - modelName: Hero01
-    hp: 1000
-    att: 100
+    hp: 100
+    att: 1
     attSpeed: 1
     attDis: 2
     isGpu: 0
     skillId: 1b270000ab860100
   - modelName: Hero02
-    hp: 1000
-    att: 100
+    hp: 100
+    att: 1
     attSpeed: 1
     attDis: 4
     isGpu: 0
     skillId: 1b2700004b0d0300
   - modelName: Hero03
-    hp: 1000
-    att: 100
+    hp: 100
+    att: 1
     attSpeed: 1
     attDis: 5
     isGpu: 0
     skillId: 1b270000eb930400
   - modelName: Hero04
-    hp: 1000
-    att: 100
+    hp: 100
+    att: 1
     attSpeed: 1
     attDis: 6
     isGpu: 0

Assets/Scripts/Core/Editor/PackgTool/UGUIPackgToolWindow.cs

@@ -460,7 +460,9 @@ namespace UnityEditor.UI
 
                 List<UnityEngine.Object> allAddAsset = new List<UnityEngine.Object>();
                 UnityEngine.Object[] currObject = spriteAtlas.GetPackables();
+                SpriteAtlasExtensions.Remove(spriteAtlas, currObject);
                 spriteAtlas.Remove(currObject);
+                // spriteAtl = 0;
                 for (int i = 0; i < textrueJson.newTextureJson.Count; i++)
                 {
                     string textrueName = textrueJson.newTextureJson[i].textrueName;
@@ -513,18 +515,21 @@ namespace UnityEditor.UI
 
                 spriteAtlas.SetIncludeInBuild(false);
                 SpriteAtlasAsset spriteAtlasAsset = SpriteAtlasAsset.Load(packInfo.packgSpritePath);
-                UnityEngine.Object[] sprites = spriteAtlas.GetPackables();
-                for (int i = 0; i < spriteAtlas.spriteCount * 2; i++)
+                MethodInfo methodInfo = spriteAtlasAsset.GetType()
+                    .GetMethod("RemoveAt", BindingFlags.Instance | BindingFlags.NonPublic);
+
+                for (int i = 0; i < spriteAtlas.spriteCount * 3; i++)
                 {
+                    methodInfo.Invoke(spriteAtlasAsset, new object[] { 0 });
                 }
 
-                spriteAtlasAsset.Remove(sprites);
+                // spriteAtlasAsset.Remove(sprites);
                 spriteAtlasAsset.Add(allAddAsset.ToArray());
                 SpriteAtlasAsset.Save(spriteAtlasAsset, packInfo.packgSpritePath);
                 // spriteAtlasAsset.
                 EditorUtility.SetDirty(spriteAtlas);
                 AssetDatabase.SaveAssets();
-                SpriteAtlasUtility.PackAtlases(new SpriteAtlas[] { spriteAtlas }, BuildTarget.Android);
+                SpriteAtlasUtility.PackAtlases(new SpriteAtlas[] { spriteAtlas }, BuildTarget.NoTarget);
                 AssetDatabase.Refresh();
                 packInfo.lasetJsonGUID = GetFileMD5(Application.dataPath + packInfo.packgJsonPath);
                 packInfo.isUpdate = false;

Assets/Scripts/Core/Pool/GPool/GObjectPool.cs

@@ -128,7 +128,7 @@ namespace Fort23.UTool
             // _usePool.Clear();
         }
 
-        public async CTask Preset<T>(Clock clock,bool isUseSynchronous) where T : IGObjectPoolInterface
+        public async CTask Preset<T>(Clock clock, bool isUseSynchronous) where T : IGObjectPoolInterface
         {
             DormancyPool();
 
@@ -153,16 +153,17 @@ namespace Fort23.UTool
 
 
             _destroyPool.Clear();
-            T OBJ = await Dequeue<T>(true, clock,isUseSynchronous);
+            T OBJ = await Dequeue<T>(true, clock, isUseSynchronous);
             Enqueue(OBJ, true);
         }
 
-        private async CTask<AssetHandle> LoadAsset(Clock clock,bool isUseSynchronous)
+        private async CTask<AssetHandle> LoadAsset(Clock clock, bool isUseSynchronous)
         {
             if (AssetBundleLoadManager.Instance != null)
             {
                 CTask<AssetHandle> cTask =
-                    AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>(_prefabName, clock: clock,isUseSynchronous:isUseSynchronous);
+                    AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>(_prefabName, clock: clock,
+                        isUseSynchronous: isUseSynchronous);
                 AssetHandle assetHandle = await cTask;
                 return assetHandle;
             }
@@ -210,7 +211,8 @@ namespace Fort23.UTool
             return CreateInstance<T>(isActive, gameObject);
         }
 
-        public async CTask<T> Dequeue<T>(bool isActive, Clock clock,bool isUseSynchronous) where T : IGObjectPoolInterface
+        public async CTask<T> Dequeue<T>(bool isActive, Clock clock, bool isUseSynchronous)
+            where T : IGObjectPoolInterface
         {
             for (int i = 0; i < _queue.Count; i++)
             {
@@ -239,8 +241,14 @@ namespace Fort23.UTool
             bool isUsePoolObject = false;
             if ((_PoolObjectFather == null || _PoolObjectFather.IsNull()) && !string.IsNullOrEmpty(_prefabName))
             {
-                _PoolObjectFather = await LoadAsset(clock,isUseSynchronous);
-                isUsePoolObject = true;
+                using (await CoroutineLockComponent.Instance.Wait(poolName, 20000))
+                {
+                    if (_PoolObjectFather == null)
+                    {
+                        _PoolObjectFather = await LoadAsset(clock, isUseSynchronous);
+                        isUsePoolObject = true;
+                    }
+                }
             }
 
             // if (clock != null && clock.isBreak)
@@ -257,11 +265,11 @@ namespace Fort23.UTool
                 AssetHandle assetHandle = _PoolObjectFather;
                 if (!isUsePoolObject)
                 {
-                    assetHandle= await _PoolObjectFather.InstantiateSync(isUseSynchronous);
+                    assetHandle = await _PoolObjectFather.InstantiateSync(isUseSynchronous);
                 }
 
                 // AssetHandle assetHandle = isUsePoolObject ? _PoolObjectFather : _PoolObjectFather;
-             
+
                 return CreateInstance<T>(isActive, assetHandle);
             }
 
@@ -279,9 +287,10 @@ namespace Fort23.UTool
             AssetHandle assetHandle2 = _PoolObjectFather;
             if (!isUsePoolObject)
             {
-                assetHandle2= await _PoolObjectFather.InstantiateSync(isUseSynchronous);
+                assetHandle2 = await _PoolObjectFather.InstantiateSync(isUseSynchronous);
             }
-            assetHandle2= await assetHandle2.InstantiateSync(isUseSynchronous);
+
+            assetHandle2 = await assetHandle2.InstantiateSync(isUseSynchronous);
             return CreateInstance<T>(isActive, assetHandle2);
         }
 
@@ -509,14 +518,16 @@ namespace Fort23.UTool
         /// <typeparam name="T"></typeparam>
         /// <returns></returns>
         public async CTask<T> FetchAsync<T>(string prefabName, System.Action<T> callBack = null, Clock clock = null,
-            bool Prestore = false, string poolName = null,bool isUseSynchronous=false) where T : IGObjectPoolInterface
+            bool Prestore = false, string poolName = null, bool isUseSynchronous = false)
+            where T : IGObjectPoolInterface
         {
             if (!prefabName.Contains(".prefab"))
             {
                 prefabName += ".prefab";
             }
 
-            T poolInerface = await FetchObjectAsync<T>(prefabName, clock, Prestore, poolName,isUseSynchronous:isUseSynchronous);
+            T poolInerface = await FetchObjectAsync<T>(prefabName, clock, Prestore, poolName,
+                isUseSynchronous: isUseSynchronous);
             if (Prestore)
             {
                 return default;
@@ -570,7 +581,7 @@ namespace Fort23.UTool
 
 #endif
         private async CTask<T> FetchObjectAsync<T>(string prefabName, Clock clock, bool Prestore, string poolName,
-            bool isActive = true,bool isUseSynchronous=false) where T : IGObjectPoolInterface
+            bool isActive = true, bool isUseSynchronous = false) where T : IGObjectPoolInterface
         {
 #if !COMBAT_SERVER
             try
@@ -581,7 +592,7 @@ namespace Fort23.UTool
 
 
                 // 加一个协程锁，让同时加载资源的时候lock住
-                using (await CoroutineLockComponent.Instance.Wait(poolName,20000))
+                // using (await CoroutineLockComponent.Instance.Wait(poolName,20000))
                 {
                     if (clock != null && clock.isBreak)
                     {
@@ -592,11 +603,11 @@ namespace Fort23.UTool
                     {
                         if (Prestore)
                         {
-                            await gameObjectQueue.Preset<T>(clock,isUseSynchronous);
+                            await gameObjectQueue.Preset<T>(clock, isUseSynchronous);
                             return default;
                         }
 
-                        return await gameObjectQueue.Dequeue<T>(isActive, clock,isUseSynchronous);
+                        return await gameObjectQueue.Dequeue<T>(isActive, clock, isUseSynchronous);
                     }
 
                     if (!this._dictionary.TryGetValue(poolName, out gameObjectQueue))
@@ -611,11 +622,11 @@ namespace Fort23.UTool
 
                     if (Prestore)
                     {
-                        await gameObjectQueue.Preset<T>(clock,isUseSynchronous);
+                        await gameObjectQueue.Preset<T>(clock, isUseSynchronous);
                         return default;
                     }
 
-                    return await gameObjectQueue.Dequeue<T>(isActive, clock,isUseSynchronous);
+                    return await gameObjectQueue.Dequeue<T>(isActive, clock, isUseSynchronous);
                 }
             }
             catch (Exception e)

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCameraControllder.cs

@@ -49,7 +49,7 @@ namespace GameLogic.Combat.CombatTool
 
                 p /= combatHeroEntities.Length;
                 // Vector3 tp = root.TransformVector(new Vector3(0, 0, -20));
-                root.position = Vector3.Lerp(root.position, new Vector3(p.x, root.position.y,  p.z+13), 0.3f);
+                root.position = Vector3.Lerp(root.position, new Vector3(p.x, root.position.y,  p.z+13), 0.1f);
             }
         }
 

Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs

@@ -52,6 +52,7 @@ namespace GameLogic.Combat.CombatTool
             heroDie.Remove(combatHeroEntity);
             combatHeroEntity.CurrCombatHeroInfo.hp = combatHeroEntity.MaxCombatHeroInfo.hp;
             AddHero(combatHeroEntity);
+            combatHeroEntity.HeroResurrection();
         }
 
         public void Update(float t)

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -80,7 +80,7 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
         timeLienData.DeserializeData();
         assetHandle.Release();
         combatHeroTimeLineControl = new CombatHeroTimeLineControl();
-        combatHeroTimeLineControl.Init(timeLienData);
+        combatHeroTimeLineControl.Init(this,timeLienData);
 
         combatHeroGameObject = new CombatHeroGameObject();
         combatHeroGameObject.Init(this, poolInterface);
@@ -167,7 +167,14 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
     {
         return CombatHeroSkillControl.NormalAttSpeedScale;
     }
-
+    public void HeroResurrection()
+    {
+        isDie = false;
+        CombatAIBasic.ChangeState(CombatHeroStateType.dile);
+        HeroHpUpdateEventData heroHpUpdateEventData = HeroHpUpdateEventData.Create();
+        heroHpUpdateEventData.combatHeroEntity = this;
+        CombatEventManager.Instance.Dispatch(CombatEventType.HeroHpUpdate, heroHpUpdateEventData);
+    }
     public void HeroDie(HarmReturnInfo harmReturnInfo)
     {
         heroDieNodeId = CombatController.currActiveCombat.CombatTypeBasic.allWinNodeCount;

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroTimeLineControl.cs

@@ -15,11 +15,26 @@ namespace GameLogic.Combat.Hero
         private BetterList<TimeLineEventLogicGroupBasic> _currRunEventLogicGroupList =
             new BetterList<TimeLineEventLogicGroupBasic>();
 
-        public void Init(TimeLienData timeLienData)
+        private CombatHeroEntity combatHeroEntity;
+        public void Init(CombatHeroEntity combatHeroEntity, TimeLienData timeLienData)
         {
+            this.combatHeroEntity = combatHeroEntity;
             _timeLineData = timeLienData;
         }
 
+        public TimeLineEventLogicGroupBasic AddEventLogicGroup(string groupName)
+        {
+            TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
+                combatHeroEntity.combatHeroTimeLineControl.TimeLineData
+                    .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>(groupName, null);
+            if (timeLineEventLogicGroup != null)
+            {
+                timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
+                combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
+            }
+            return timeLineEventLogicGroup;
+        }
+
         public void AddEventLogicGroup(TimeLineEventLogicGroupBasic eventLogicGroup)
         {
             _currRunEventLogicGroupList.Add(eventLogicGroup);

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroDieState.cs

@@ -20,17 +20,17 @@ namespace GameLogic.Combat.Hero.State
             return isSwitch;
         }
 
+        
+        
         protected override void ProEnter()
         {
 
             isSwitch = false;
             resurrectionTime = 0;
-            TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
-                combatHeroEntity.combatHeroTimeLineControl.TimeLineData
-                    .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("die", null);
+            TimeLineEventLogicGroupBasic timeLineEventLogicGroup=combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("die");
+          
             if (timeLineEventLogicGroup != null)
             {
-                timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
                 timeLineEventLogicGroup.TimeLineUpdateEnd = delegate
                 {
                     if (combatHeroEntity.IsEnemy)
@@ -40,10 +40,10 @@ namespace GameLogic.Combat.Hero.State
                     else
                     {
                         isStartResurrection = true;
+                        combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("die_idle");
                     }
-
                 };
-                combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
+               
             }
             else
             {
@@ -54,6 +54,7 @@ namespace GameLogic.Combat.Hero.State
                 else
                 {
                     isStartResurrection = true;
+                    combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("die_idle");
                 }
             }
 

Assets/Scripts/GameLogic/Combat/Hero/State/CombatResurrectionState.cs

@@ -16,13 +16,33 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProEnter()
         {
-            if (combatHeroEntity.heroDieNodeId != CombatController.currActiveCombat.CombatTypeBasic.allWinNodeCount&&CombatController.currActiveCombat.CombatHeroController.followTarget!=null)
+            TimeLineEventLogicGroupBasic timeLineEventLogicGroupBasic=  combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("die_up");
+
+            if (timeLineEventLogicGroupBasic != null)
+            {
+                timeLineEventLogicGroupBasic.TimeLineUpdateEnd= delegate
+                {
+                    if (combatHeroEntity.heroDieNodeId != CombatController.currActiveCombat.CombatTypeBasic.allWinNodeCount&&CombatController.currActiveCombat.CombatHeroController.followTarget!=null)
+                    {
+                        combatHeroEntity.combatHeroGameObject.SetPosition(CombatController.currActiveCombat.CombatHeroController.followTarget.dotPos+new Vector3(1,0,0));
+                    }
+
+                    CombatController.currActiveCombat.CombatHeroController.ResurrectionDieHero(combatHeroEntity);
+                    combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+                };
+            }
+            else
             {
-                combatHeroEntity.combatHeroGameObject.SetPosition(CombatController.currActiveCombat.CombatHeroController.followTarget.dotPos+new Vector3(1,0,0));
+                if (combatHeroEntity.heroDieNodeId != CombatController.currActiveCombat.CombatTypeBasic.allWinNodeCount&&CombatController.currActiveCombat.CombatHeroController.followTarget!=null)
+                {
+                    combatHeroEntity.combatHeroGameObject.SetPosition(CombatController.currActiveCombat.CombatHeroController.followTarget.dotPos+new Vector3(1,0,0));
+                }
+
+                CombatController.currActiveCombat.CombatHeroController.ResurrectionDieHero(combatHeroEntity);
+                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
             }
 
-            CombatController.currActiveCombat.CombatHeroController.ResurrectionDieHero(combatHeroEntity);
-            combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+
         }
 
         protected override void ProUpdate(float t)

Assets/Scripts/GameUI/UI/HeroHpWidget.cs

@@ -61,7 +61,7 @@ namespace Fort23.Mono
         private void HeroDie(IEventData iEventData)
         {
             HeroDieEventData heroDieEventData = iEventData as HeroDieEventData;
-            if (heroDieEventData.combatHeroEntity == combatHeroEntity)
+            if (heroDieEventData.combatHeroEntity == combatHeroEntity&&combatHeroEntity.IsEnemy)
             {
                 GObjectPool.Instance.Recycle(this);
             }

UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2543
     height: 1333
   m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Project
   m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
@@ -39,10 +39,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 630
+    x: 819
     y: 0
-    width: 315
-    height: 646
+    width: 411
+    height: 919
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 14}
@@ -69,8 +69,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 945
-    height: 646
+    width: 1230
+    height: 919
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
@@ -173,7 +173,7 @@ MonoBehaviour:
   m_MinSize: {x: 500, y: 100}
   m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 560
+  controlID: 168
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -194,7 +194,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 945
+    width: 1230
     height: 1283
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
@@ -218,8 +218,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 630
-    height: 646
+    width: 819
+    height: 919
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 15}
@@ -243,9 +243,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 646
-    width: 945
-    height: 637
+    y: 919
+    width: 1230
+    height: 364
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 16}
@@ -268,12 +268,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 945
+    x: 1230
     y: 0
-    width: 506
+    width: 388
     height: 1283
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -294,9 +294,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1451
+    x: 1618
     y: 0
-    width: 379
+    width: 371
     height: 1283
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -320,9 +320,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1830
+    x: 1989
     y: 0
-    width: 713
+    width: 554
     height: 1283
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
@@ -351,10 +351,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 639
+    x: 828
     y: 81
-    width: 313
-    height: 625
+    width: 409
+    height: 898
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -389,7 +389,7 @@ MonoBehaviour:
     - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
     pluginStates:
     - '{}'
-    scale: 23
+    scale: 33
     fitToScreenEnabled: 1
     rotationDegree: 0
     highlightSafeAreaEnabled: 0
@@ -419,8 +419,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 9
     y: 81
-    width: 629
-    height: 625
+    width: 818
+    height: 898
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -787,14 +787,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.08415088, y: 3.1853874, z: 0.002926414}
+    m_Target: {x: -11.307561, y: 0.13942158, z: -9.3319645}
     speed: 2
-    m_Value: {x: -0.08415088, y: 3.1853874, z: 0.002926414}
+    m_Value: {x: -11.307561, y: 0.13942158, z: -9.3319645}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -822,17 +822,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -840,17 +840,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: -0.21685494, y: 0.78297204, z: -0.42146724, w: -0.4028579}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: -0.21685492, y: 0.7829719, z: -0.42146719, w: -0.40285784}
   m_Size:
-    m_Target: 1.4470903
+    m_Target: 3.331384
     speed: 2
-    m_Value: 1.4470903
+    m_Value: 3.331384
   m_Ortho:
-    m_Target: 1
+    m_Target: 0
     speed: 2
-    m_Value: 1
+    m_Value: 0
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -894,9 +894,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 9
-    y: 727
-    width: 944
-    height: 616
+    y: 1000
+    width: 1229
+    height: 343
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -927,9 +927,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 954
+    x: 1239
     y: 81
-    width: 504
+    width: 386
     height: 1262
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -944,9 +944,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: cea70000
-      m_LastClickedID: 42958
-      m_ExpandedIDs: eaf5ffff
+      m_SelectedIDs: 00030000
+      m_LastClickedID: 0
+      m_ExpandedIDs: 3643feff3446feff4246feffc4faffff709e0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -990,9 +990,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1460
+    x: 1627
     y: 81
-    width: 377
+    width: 369
     height: 1262
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1015,7 +1015,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameUI
+    - Assets/Res/UIAtlas
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1023,16 +1023,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameUI
+  - Assets/Res/UIAtlas
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 406}
-    m_SelectedIDs: d2a80000
-    m_LastClickedID: 43218
-    m_ExpandedIDs: 00000000b4a80000b6a80000b8a80000baa80000bca80000bea80000c0a80000c2a80000c4a80000c6a80000c8a80000caa80000cca80000cea80000d0a80000d2a80000d4a8000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 383}
+    m_SelectedIDs: 94a10000
+    m_LastClickedID: 41364
+    m_ExpandedIDs: 00000000569f0000589f00005a9f00005c9f00005e9f0000609f0000629f0000649f0000669f0000689f00006a9f00006c9f00006e9f0000709f0000729f0000749f0000769f000060a1000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1060,7 +1060,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000b4a80000b6a80000b8a80000baa80000bca80000bea80000c0a80000c2a80000c4a80000c6a80000c8a80000caa80000cca80000cea80000d0a80000d2a80000d4a80000
+    m_ExpandedIDs: 00000000569f0000589f00005a9f00005c9f00005e9f0000609f0000629f0000649f0000669f0000689f00006a9f00006c9f00006e9f0000709f0000729f0000749f0000769f0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1088,7 +1088,7 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: 929701000000000096ba0200f41802008618020048180200ae180200d4180200e01702003ac30a004c1a02000c1a02007e17020058190200c4890000641b0200e4180200caa1000066d50000
+    m_ExpandedInstanceIDs: 929701000000000096ba0200f41802008618020048180200ae180200d4180200e01702003ac30a004c1a02000c1a02007e17020058190200c4890000641b0200e4180200caa1000066d500006c960000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1115,7 +1115,7 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 184
+  m_DirectoriesAreaWidth: 160
 --- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -1136,9 +1136,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1839
+    x: 1998
     y: 81
-    width: 712
+    width: 553
     height: 1262
   m_SerializedDataModeController:
     m_DataMode: 0