Jelajahi Sumber

修改模型

DESKTOP-67ERK9L\Administrator 1 bulan lalu
induk
melakukan
3b3a8c400d
100 mengubah file dengan 1273 tambahan dan 401 penghapusan
  1. TEMPAT SAMPAH
      assets/Model/Box.fbx
  2. 15 15
      assets/Model/Box.fbx.meta
  3. 3 2
      assets/Model/C.fbx.meta
  4. 3 2
      assets/Model/Coin.fbx.meta
  5. 3 2
      assets/Model/Crown.fbx.meta
  6. 3 2
      assets/Model/Cube.fbx.meta
  7. 3 2
      assets/Model/Dice.fbx.meta
  8. 3 2
      assets/Model/Hammer.fbx.meta
  9. 3 2
      assets/Model/L.fbx.meta
  10. 3 2
      assets/Model/LEGO01.fbx.meta
  11. 3 2
      assets/Model/LEGO02.fbx.meta
  12. 3 2
      assets/Model/MIC.fbx.meta
  13. 3 2
      assets/Model/Magnet.fbx.meta
  14. 3 2
      assets/Model/MarkBox.fbx.meta
  15. 3 2
      assets/Model/Music01.fbx.meta
  16. 3 2
      assets/Model/Music02.fbx.meta
  17. 3 2
      assets/Model/NumOne.fbx.meta
  18. 3 2
      assets/Model/Piece01.fbx.meta
  19. 3 2
      assets/Model/Piece02.fbx.meta
  20. 14 14
      assets/Model/Prefabs/Box.prefab
  21. 2 2
      assets/Model/Prefabs/Box.prefab.meta
  22. 3 2
      assets/Model/T.fbx.meta
  23. 1 1
      assets/Model/Texture/TextureColor.jpg.meta
  24. 3 2
      assets/Model/Top.fbx.meta
  25. 3 2
      assets/Model/ball.fbx.meta
  26. 3 2
      assets/Model/duck.fbx.meta
  27. 3 2
      assets/Model/yoyo.fbx.meta
  28. 15 45
      assets/models/ball.prefab
  29. 663 0
      assets/models/box.prefab
  30. 1 0
      assets/models/box.prefab.meta
  31. 1 1
      assets/resources/csv/levels.csv.meta
  32. 1 1
      assets/resources/csv/model_names.csv.meta
  33. 239 28
      assets/resources/gameui/GameUI.prefab
  34. 80 182
      assets/resources/prefabs/GameNode.prefab
  35. 1 1
      assets/resources/spine/effect_hecheng.atlas.meta
  36. 1 1
      assets/resources/spine/effect_hecheng.png.meta
  37. 4 3
      assets/scenes/loading.scene
  38. 1 1
      assets/scripts/core/base/BaseExp.ts.meta
  39. 1 1
      assets/scripts/core/common/BusyLoading.ts.meta
  40. 1 1
      assets/scripts/core/common/GameConst.ts.meta
  41. 1 1
      assets/scripts/core/component/BasePanel.ts.meta
  42. 1 1
      assets/scripts/core/component/BaseUI.ts.meta
  43. 1 1
      assets/scripts/core/component/ComponentEx.ts.meta
  44. 1 1
      assets/scripts/core/component/UIEffect.ts.meta
  45. 1 1
      assets/scripts/core/configs/BundleConfig.ts.meta
  46. 1 1
      assets/scripts/core/csv/CsvManager.ts.meta
  47. 1 1
      assets/scripts/core/csv/CsvParser.ts.meta
  48. 1 1
      assets/scripts/core/event/EventEmitter.ts.meta
  49. 1 1
      assets/scripts/core/extend/AutoBind.ts.meta
  50. 1 1
      assets/scripts/core/extend/DateTime.ts.meta
  51. 1 1
      assets/scripts/core/extend/Logger.ts.meta
  52. 1 1
      assets/scripts/core/extend/Nodes.ts.meta
  53. 1 1
      assets/scripts/core/extend/NumRaiseLable.ts.meta
  54. 1 1
      assets/scripts/core/extend/SensitiveWords.ts.meta
  55. 1 1
      assets/scripts/core/extend/Verbatim.ts.meta
  56. 1 1
      assets/scripts/core/i18n/lan/en.ts.meta
  57. 1 1
      assets/scripts/core/i18n/lan/zh.ts.meta
  58. 1 1
      assets/scripts/core/i18n/runtime-scripts/LanguageData.ts.meta
  59. 1 1
      assets/scripts/core/i18n/runtime-scripts/LocalizedLabel.ts.meta
  60. 1 1
      assets/scripts/core/i18n/runtime-scripts/LocalizedSprite.ts.meta
  61. 1 1
      assets/scripts/core/i18n/runtime-scripts/polyglot.min.ts.meta
  62. 1 1
      assets/scripts/core/manager/AudioManager.ts.meta
  63. 1 1
      assets/scripts/core/manager/BundleManager.ts.meta
  64. 1 1
      assets/scripts/core/manager/BusyLoadingManager.ts.meta
  65. 1 1
      assets/scripts/core/manager/Data.ts.meta
  66. 1 1
      assets/scripts/core/manager/PoolManager.ts.meta
  67. 1 1
      assets/scripts/core/manager/Singleton.ts.meta
  68. 1 1
      assets/scripts/core/manager/StateManager.ts.meta
  69. 1 1
      assets/scripts/core/manager/UIManager.ts.meta
  70. 1 1
      assets/scripts/core/manager/WindowManager.ts.meta
  71. 1 1
      assets/scripts/core/utils/DebugTools.ts.meta
  72. 1 1
      assets/scripts/core/utils/MsgHints.ts.meta
  73. 1 1
      assets/scripts/core/utils/QuickEnv.ts.meta
  74. 1 1
      assets/scripts/core/utils/ResUtil.ts.meta
  75. 1 1
      assets/scripts/core/utils/Utils.ts.meta
  76. 107 1
      assets/scripts/game/GameNode.ts
  77. 1 1
      assets/scripts/game/GameNode.ts.meta
  78. 1 1
      assets/scripts/game/GameUI.ts.meta
  79. 1 1
      assets/scripts/game/HallUI.ts.meta
  80. 1 1
      assets/scripts/game/Main.ts.meta
  81. 1 1
      assets/scripts/game/TileItem.ts.meta
  82. 1 1
      assets/scripts/gameui/BoxLayer.ts.meta
  83. 1 1
      assets/scripts/gameui/BuyCoinLayer.ts.meta
  84. 1 1
      assets/scripts/gameui/BuyItemLayer.ts.meta
  85. 1 1
      assets/scripts/gameui/BuyLifeLayer.ts.meta
  86. 1 1
      assets/scripts/gameui/DrawStarLayer.ts.meta
  87. 1 1
      assets/scripts/gameui/FailLayer.ts.meta
  88. 1 1
      assets/scripts/gameui/LevelClearLayer.ts.meta
  89. 1 1
      assets/scripts/gameui/LevelLayer.ts.meta
  90. 1 1
      assets/scripts/gameui/NewPackOpenedLayer.ts.meta
  91. 1 1
      assets/scripts/gameui/OutOfBoxLayer.ts.meta
  92. 1 1
      assets/scripts/gameui/PauseLayer.ts.meta
  93. 1 1
      assets/scripts/gameui/RoY.ts.meta
  94. 1 1
      assets/scripts/gameui/SettingLayer.ts.meta
  95. 1 1
      assets/scripts/loading/Loading.ts.meta
  96. 1 1
      assets/scripts/platform/platformBrowser.ts.meta
  97. 1 1
      assets/scripts/platform/platformDefault.ts.meta
  98. 1 1
      assets/scripts/platform/platformSystem.ts.meta
  99. 1 1
      assets/scripts/platform/platformTT.ts.meta
  100. 1 1
      assets/scripts/platform/platformWX.ts.meta

TEMPAT SAMPAH
assets/Model/Box.fbx


+ 15 - 15
assets/Model/Box.fbx.meta

@@ -1,19 +1,19 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
-  "uuid": "fe421ede-e27a-4a5c-a86c-8e66e1753b86",
+  "uuid": "5c42fd54-bcfa-4468-aeee-295a4e3b9f05",
   "files": [],
   "subMetas": {
-    "444de": {
+    "e10e4": {
       "importer": "gltf-mesh",
-      "uuid": "fe421ede-e27a-4a5c-a86c-8e66e1753b86@444de",
+      "uuid": "5c42fd54-bcfa-4468-aeee-295a4e3b9f05@e10e4",
       "displayName": "",
-      "id": "444de",
-      "name": "Box.mesh",
+      "id": "e10e4",
+      "name": "立方体.mesh",
       "userData": {
         "gltfIndex": 0,
-        "triangleCount": 76
+        "triangleCount": 99
       },
       "ver": "1.1.1",
       "imported": true,
@@ -23,12 +23,12 @@
       ],
       "subMetas": {}
     },
-    "d9508": {
+    "bd3ce": {
       "importer": "gltf-scene",
-      "uuid": "fe421ede-e27a-4a5c-a86c-8e66e1753b86@d9508",
+      "uuid": "5c42fd54-bcfa-4468-aeee-295a4e3b9f05@bd3ce",
       "displayName": "",
-      "id": "d9508",
-      "name": "Box.prefab",
+      "id": "bd3ce",
+      "name": "box.prefab",
       "userData": {
         "gltfIndex": 0
       },
@@ -43,9 +43,9 @@
   "userData": {
     "imageMetas": [],
     "fbx": {
-      "smartMaterialEnabled": true,
-      "matchMeshNames": false
+      "smartMaterialEnabled": true
     },
+    "redirect": "5c42fd54-bcfa-4468-aeee-295a4e3b9f05@bd3ce",
     "lods": {
       "enable": false,
       "hasBuiltinLOD": false,
@@ -66,13 +66,13 @@
     },
     "assetFinder": {
       "meshes": [
-        "fe421ede-e27a-4a5c-a86c-8e66e1753b86@444de"
+        "5c42fd54-bcfa-4468-aeee-295a4e3b9f05@e10e4"
       ],
       "skeletons": [],
       "textures": [],
       "materials": [],
       "scenes": [
-        "fe421ede-e27a-4a5c-a86c-8e66e1753b86@d9508"
+        "5c42fd54-bcfa-4468-aeee-295a4e3b9f05@bd3ce"
       ]
     }
   }

+ 3 - 2
assets/Model/C.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "a4dba4a0-1819-4f59-8c7b-fab7ad463118",
@@ -74,6 +74,7 @@
       "scenes": [
         "a4dba4a0-1819-4f59-8c7b-fab7ad463118@7873c"
       ]
-    }
+    },
+    "redirect": "a4dba4a0-1819-4f59-8c7b-fab7ad463118@7873c"
   }
 }

+ 3 - 2
assets/Model/Coin.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "4d263ba2-0eb8-4c8f-9cdf-cfd882d42932",
@@ -74,6 +74,7 @@
       "scenes": [
         "4d263ba2-0eb8-4c8f-9cdf-cfd882d42932@4b8b9"
       ]
-    }
+    },
+    "redirect": "4d263ba2-0eb8-4c8f-9cdf-cfd882d42932@4b8b9"
   }
 }

+ 3 - 2
assets/Model/Crown.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "419ab438-30d6-48bf-91a7-98511301c524",
@@ -74,6 +74,7 @@
       "scenes": [
         "419ab438-30d6-48bf-91a7-98511301c524@2cbc4"
       ]
-    }
+    },
+    "redirect": "419ab438-30d6-48bf-91a7-98511301c524@2cbc4"
   }
 }

+ 3 - 2
assets/Model/Cube.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "ee4f5649-1aba-411d-9a44-bb5a78652234",
@@ -74,6 +74,7 @@
       "scenes": [
         "ee4f5649-1aba-411d-9a44-bb5a78652234@9d327"
       ]
-    }
+    },
+    "redirect": "ee4f5649-1aba-411d-9a44-bb5a78652234@9d327"
   }
 }

+ 3 - 2
assets/Model/Dice.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "482a2c91-b3a3-438c-8529-af56662062d0",
@@ -74,6 +74,7 @@
       "scenes": [
         "482a2c91-b3a3-438c-8529-af56662062d0@f0f48"
       ]
-    }
+    },
+    "redirect": "482a2c91-b3a3-438c-8529-af56662062d0@f0f48"
   }
 }

+ 3 - 2
assets/Model/Hammer.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "8d3e6e0a-31a5-4d3f-91d5-a1a804fb01a1",
@@ -74,6 +74,7 @@
       "scenes": [
         "8d3e6e0a-31a5-4d3f-91d5-a1a804fb01a1@b3d17"
       ]
-    }
+    },
+    "redirect": "8d3e6e0a-31a5-4d3f-91d5-a1a804fb01a1@b3d17"
   }
 }

+ 3 - 2
assets/Model/L.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "443cdf75-a7cc-431e-82bb-5cbde49099bd",
@@ -74,6 +74,7 @@
       "scenes": [
         "443cdf75-a7cc-431e-82bb-5cbde49099bd@df82e"
       ]
-    }
+    },
+    "redirect": "443cdf75-a7cc-431e-82bb-5cbde49099bd@df82e"
   }
 }

+ 3 - 2
assets/Model/LEGO01.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "d0d7ff1e-de31-47d4-8f59-26828d531107",
@@ -74,6 +74,7 @@
       "scenes": [
         "d0d7ff1e-de31-47d4-8f59-26828d531107@aa44f"
       ]
-    }
+    },
+    "redirect": "d0d7ff1e-de31-47d4-8f59-26828d531107@aa44f"
   }
 }

+ 3 - 2
assets/Model/LEGO02.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "d4d29551-d7df-4d39-a6f0-9b3011b395a8",
@@ -74,6 +74,7 @@
       "scenes": [
         "d4d29551-d7df-4d39-a6f0-9b3011b395a8@3bf4d"
       ]
-    }
+    },
+    "redirect": "d4d29551-d7df-4d39-a6f0-9b3011b395a8@3bf4d"
   }
 }

+ 3 - 2
assets/Model/MIC.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "931be0b5-b3a1-43d7-9801-cc118291fef4",
@@ -74,6 +74,7 @@
       "scenes": [
         "931be0b5-b3a1-43d7-9801-cc118291fef4@6a2c4"
       ]
-    }
+    },
+    "redirect": "931be0b5-b3a1-43d7-9801-cc118291fef4@6a2c4"
   }
 }

+ 3 - 2
assets/Model/Magnet.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "3b3d8d03-c789-44cb-b8da-8b845da85aa6",
@@ -74,6 +74,7 @@
       "scenes": [
         "3b3d8d03-c789-44cb-b8da-8b845da85aa6@9b5ce"
       ]
-    }
+    },
+    "redirect": "3b3d8d03-c789-44cb-b8da-8b845da85aa6@9b5ce"
   }
 }

+ 3 - 2
assets/Model/MarkBox.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "7df25276-bbbf-42bc-9acd-31f13a31a745",
@@ -74,6 +74,7 @@
       "scenes": [
         "7df25276-bbbf-42bc-9acd-31f13a31a745@37a06"
       ]
-    }
+    },
+    "redirect": "7df25276-bbbf-42bc-9acd-31f13a31a745@37a06"
   }
 }

+ 3 - 2
assets/Model/Music01.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "1a530300-235b-4317-91eb-f6885138f425",
@@ -74,6 +74,7 @@
       "scenes": [
         "1a530300-235b-4317-91eb-f6885138f425@4787d"
       ]
-    }
+    },
+    "redirect": "1a530300-235b-4317-91eb-f6885138f425@4787d"
   }
 }

+ 3 - 2
assets/Model/Music02.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "673d272e-74d9-40d2-b00a-6e28272a61e8",
@@ -74,6 +74,7 @@
       "scenes": [
         "673d272e-74d9-40d2-b00a-6e28272a61e8@0d7a0"
       ]
-    }
+    },
+    "redirect": "673d272e-74d9-40d2-b00a-6e28272a61e8@0d7a0"
   }
 }

+ 3 - 2
assets/Model/NumOne.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "3c59d5c9-e7f0-425b-9ab5-82cae289c58e",
@@ -74,6 +74,7 @@
       "scenes": [
         "3c59d5c9-e7f0-425b-9ab5-82cae289c58e@69544"
       ]
-    }
+    },
+    "redirect": "3c59d5c9-e7f0-425b-9ab5-82cae289c58e@69544"
   }
 }

+ 3 - 2
assets/Model/Piece01.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "1fa56737-730e-4a2f-af8a-eb10f81a82aa",
@@ -74,6 +74,7 @@
       "scenes": [
         "1fa56737-730e-4a2f-af8a-eb10f81a82aa@491e6"
       ]
-    }
+    },
+    "redirect": "1fa56737-730e-4a2f-af8a-eb10f81a82aa@491e6"
   }
 }

+ 3 - 2
assets/Model/Piece02.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "632c2cfe-7955-4577-b6ff-c038c7abfb11",
@@ -74,6 +74,7 @@
       "scenes": [
         "632c2cfe-7955-4577-b6ff-c038c7abfb11@592fc"
       ]
-    }
+    },
+    "redirect": "632c2cfe-7955-4577-b6ff-c038c7abfb11@592fc"
   }
 }

+ 14 - 14
assets/Model/Prefabs/Box.prefab

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "Box",
+    "_name": "box",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Box",
+    "_name": "box",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": null,
@@ -58,7 +58,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Box",
+    "_name": "立方体",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -82,16 +82,16 @@
     },
     "_lrot": {
       "__type__": "cc.Quat",
-      "x": -6.123234262925839e-17,
-      "y": -1,
-      "z": -6.123234262925839e-17,
-      "w": 6.123233995736766e-17
+      "x": 6.123234262925839e-17,
+      "y": 1,
+      "z": 6.123234262925839e-17,
+      "w": 3.7493993930529855e-33
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
+      "x": 3.207812786102295,
+      "y": 0.6770976781845093,
+      "z": 4.2951436042785645
     },
     "_mobility": 0,
     "_layer": 1073741824,
@@ -126,7 +126,7 @@
       "__id__": 5
     },
     "_mesh": {
-      "__uuid__": "fe421ede-e27a-4a5c-a86c-8e66e1753b86@444de",
+      "__uuid__": "5c42fd54-bcfa-4468-aeee-295a4e3b9f05@e10e4",
       "__expectedType__": "cc.Mesh"
     },
     "_shadowCastingMode": 0,
@@ -142,7 +142,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a9dqaU5x1bSoXe6ueBTS3K"
+    "fileId": "a6D6s5Tl9VLIRFr6ObPifk"
   },
   {
     "__type__": "cc.ModelBakeSettings",
@@ -172,7 +172,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ca0f6LfRpULJ223fR0dZPy",
+    "fileId": "ccQyPV1fRfaKwTF9l/2ltC",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -185,7 +185,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "6edDn60s9Txrqc8Yj8oX/f",
+    "fileId": "e0IYQ+s3JXepO5aZpZpw+R",
     "targetOverrides": null
   }
 ]

+ 2 - 2
assets/Model/Prefabs/Box.prefab.meta

@@ -2,12 +2,12 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "f5d4c39b-c353-42d0-a384-ec64281ee248",
+  "uuid": "452aab0a-32a2-444f-88cb-61ec5971ff7c",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "Box"
+    "syncNodeName": "box"
   }
 }

+ 3 - 2
assets/Model/T.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "6cc36c2a-b348-4862-8a67-291308c1cdfa",
@@ -74,6 +74,7 @@
       "scenes": [
         "6cc36c2a-b348-4862-8a67-291308c1cdfa@22401"
       ]
-    }
+    },
+    "redirect": "6cc36c2a-b348-4862-8a67-291308c1cdfa@22401"
   }
 }

+ 1 - 1
assets/Model/Texture/TextureColor.jpg.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.27",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "36f4230d-6875-42c6-9d9b-c1089a93c018",

+ 3 - 2
assets/Model/Top.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "ca6571f9-e9f6-4713-aa49-462382ecfda7",
@@ -74,6 +74,7 @@
       "scenes": [
         "ca6571f9-e9f6-4713-aa49-462382ecfda7@83c62"
       ]
-    }
+    },
+    "redirect": "ca6571f9-e9f6-4713-aa49-462382ecfda7@83c62"
   }
 }

+ 3 - 2
assets/Model/ball.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "03aba354-934e-4d5c-9002-f47bda19fe3d",
@@ -74,6 +74,7 @@
       "scenes": [
         "03aba354-934e-4d5c-9002-f47bda19fe3d@8c1b3"
       ]
-    }
+    },
+    "redirect": "03aba354-934e-4d5c-9002-f47bda19fe3d@8c1b3"
   }
 }

+ 3 - 2
assets/Model/duck.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "a9d50e74-43f5-48af-aeda-4d36243c7d3d",
@@ -74,6 +74,7 @@
       "scenes": [
         "a9d50e74-43f5-48af-aeda-4d36243c7d3d@70f33"
       ]
-    }
+    },
+    "redirect": "a9d50e74-43f5-48af-aeda-4d36243c7d3d@70f33"
   }
 }

+ 3 - 2
assets/Model/yoyo.fbx.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "2.3.13",
+  "ver": "2.3.12",
   "importer": "fbx",
   "imported": true,
   "uuid": "b091e2f7-66f9-47ad-b097-ba2ce1c38955",
@@ -74,6 +74,7 @@
       "scenes": [
         "b091e2f7-66f9-47ad-b097-ba2ce1c38955@c940d"
       ]
-    }
+    },
+    "redirect": "b091e2f7-66f9-47ad-b097-ba2ce1c38955@c940d"
   }
 }

+ 15 - 45
assets/models/ball.prefab

@@ -3,6 +3,7 @@
     "__type__": "cc.Prefab",
     "_name": "ball",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_native": "",
     "data": {
       "__id__": 1
@@ -22,13 +23,9 @@
       }
     ],
     "_active": true,
-    "_components": [
-      {
-        "__id__": 9
-      }
-    ],
+    "_components": [],
     "_prefab": {
-      "__id__": 11
+      "__id__": 9
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -88,10 +85,10 @@
     },
     "_lrot": {
       "__type__": "cc.Quat",
-      "x": 6.123234262925839e-17,
-      "y": 1,
-      "z": 6.123234262925839e-17,
-      "w": 3.7493993930529855e-33
+      "x": -6.123234262925839e-17,
+      "y": -1,
+      "z": -6.123234262925839e-17,
+      "w": 6.123233995736766e-17
     },
     "_lscale": {
       "__type__": "cc.Vec3",
@@ -139,6 +136,10 @@
     "_shadowReceivingMode": 1,
     "_shadowBias": 0,
     "_shadowNormalBias": 0,
+    "_reflectionProbeId": -1,
+    "_reflectionProbeBlendId": -1,
+    "_reflectionProbeBlendWeight": 0,
+    "_enabledGlobalStandardSkinObject": false,
     "_enableMorph": true,
     "_id": ""
   },
@@ -164,13 +165,13 @@
     "_useLightProbe": false,
     "_bakeToLightProbe": true,
     "_reflectionProbeType": 0,
-    "_bakeToReflectionProbe": true,
-    "_probeCubemap": null
+    "_bakeToReflectionProbe": true
   },
   {
     "__type__": "cc.SphereCollider",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
@@ -186,12 +187,12 @@
       "y": 0,
       "z": 0
     },
-    "_radius": 0.578,
+    "_radius": 0.6,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "32PJVoN+xLYp81YakM8Itj"
+    "fileId": "16cwQKTQ5N/Ih4dg277u+y"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -206,37 +207,6 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
-  {
-    "__type__": "cc.BoxCollider",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 10
-    },
-    "_material": null,
-    "_isTrigger": false,
-    "_center": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_size": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "31YthFQJVCQaXYmxN/LZRf"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 663 - 0
assets/models/box.prefab

@@ -0,0 +1,663 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "box",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "box",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 19
+      },
+      {
+        "__id__": 23
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 27
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "立方体",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 6.123234262925839e-17,
+      "y": 1,
+      "z": 6.123234262925839e-17,
+      "w": 3.7493993930529855e-33
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 3.207812786102295,
+      "y": 0.6770976781845093,
+      "z": 4.2951436042785645
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": -7.0167096047110005e-15,
+      "y": -180,
+      "z": 7.0167096047110005e-15
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.MeshRenderer",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_materials": [
+      {
+        "__uuid__": "1348765a-6d5c-4f62-9c1a-68435a4a9170",
+        "__expectedType__": "cc.Material"
+      }
+    ],
+    "_visFlags": 0,
+    "bakeSettings": {
+      "__id__": 5
+    },
+    "_mesh": {
+      "__uuid__": "5c42fd54-bcfa-4468-aeee-295a4e3b9f05@e10e4",
+      "__expectedType__": "cc.Mesh"
+    },
+    "_shadowCastingMode": 0,
+    "_shadowReceivingMode": 1,
+    "_shadowBias": 0,
+    "_shadowNormalBias": 0,
+    "_reflectionProbeId": -1,
+    "_reflectionProbeBlendId": -1,
+    "_reflectionProbeBlendWeight": 0,
+    "_enabledGlobalStandardSkinObject": false,
+    "_enableMorph": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a6D6s5Tl9VLIRFr6ObPifk"
+  },
+  {
+    "__type__": "cc.ModelBakeSettings",
+    "texture": null,
+    "uvParam": {
+      "__type__": "cc.Vec4",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 0
+    },
+    "_bakeable": false,
+    "_castShadow": false,
+    "_receiveShadow": false,
+    "_recieveShadow": false,
+    "_lightmapSize": 64,
+    "_useLightProbe": false,
+    "_bakeToLightProbe": true,
+    "_reflectionProbeType": 0,
+    "_bakeToReflectionProbe": true
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "ccQyPV1fRfaKwTF9l/2ltC",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -0.559,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.BoxCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 9
+    },
+    "_material": null,
+    "_isTrigger": false,
+    "_center": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_size": {
+      "__type__": "cc.Vec3",
+      "x": 6.796,
+      "y": 1,
+      "z": 8.805
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "95mw5BtmFIzLG7/rTgXiWt"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "61YMq8oZxCiqLJeY1V24kY",
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node-001",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -4.089,
+      "y": 0.43,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.BoxCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 11
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 13
+    },
+    "_material": null,
+    "_isTrigger": false,
+    "_center": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_size": {
+      "__type__": "cc.Vec3",
+      "x": 1.956,
+      "y": 1,
+      "z": 8.622
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2dIkBOlxVKO79qXQ9siJyw"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "07FT3jQ0BCMIjc5lQPoVe7",
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node-002",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 4.13,
+      "y": 0.43,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.BoxCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "_material": null,
+    "_isTrigger": false,
+    "_center": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_size": {
+      "__type__": "cc.Vec3",
+      "x": 1.956,
+      "y": 1,
+      "z": 8.622
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "6dZw06BIBJPIJwZcyYEC/h"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "ecSZ+sE/lKwZC+okaBw81u",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node-003",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 20
+      }
+    ],
+    "_prefab": {
+      "__id__": 22
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0.43,
+      "z": -5.03
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.BoxCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 19
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
+    "_material": null,
+    "_isTrigger": false,
+    "_center": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_size": {
+      "__type__": "cc.Vec3",
+      "x": 6.456,
+      "y": 1,
+      "z": 1.61
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "44Lno0zYhOGZ5zvHRx8+EE"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "4eU4mYr65HUqV65mKiEpDg",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node-004",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 24
+      }
+    ],
+    "_prefab": {
+      "__id__": 26
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0.43,
+      "z": 5.037
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.BoxCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 25
+    },
+    "_material": null,
+    "_isTrigger": false,
+    "_center": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_size": {
+      "__type__": "cc.Vec3",
+      "x": 6.456,
+      "y": 1,
+      "z": 1.61
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "10IaEWfOhN3phxaGdPsMrj"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "fczmsqGKdNjLms037ofmYM",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "e0IYQ+s3JXepO5aZpZpw+R",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

+ 1 - 0
assets/models/box.prefab.meta

@@ -0,0 +1 @@
+{"ver":"1.1.50","importer":"prefab","imported":true,"uuid":"1f1fc3ab-ff7f-4f4e-87fe-641972433beb","files":[".json"],"subMetas":{},"userData":{"syncNodeName":"box"}}

+ 1 - 1
assets/resources/csv/levels.csv.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.1",
+  "ver": "1.0.2",
   "importer": "text",
   "imported": true,
   "uuid": "cedbdb40-f925-4256-9cea-6e937c53876f",

+ 1 - 1
assets/resources/csv/model_names.csv.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.1",
+  "ver": "1.0.2",
   "importer": "text",
   "imported": true,
   "uuid": "db1b73cf-fcdc-4071-af23-1c99f1e041ec",

File diff ditekan karena terlalu besar
+ 239 - 28
assets/resources/gameui/GameUI.prefab


+ 80 - 182
assets/resources/prefabs/GameNode.prefab

@@ -79,11 +79,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 245
+        "__id__": 244
       }
     ],
     "_prefab": {
-      "__id__": 247
+      "__id__": 246
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5483,218 +5483,115 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "box",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
-    "_children": [
-      {
-        "__id__": 237
-      }
-    ],
-    "_active": true,
-    "_components": [],
     "_prefab": {
-      "__id__": 244
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 1.6,
-      "z": 0
+      "__id__": 237
     },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 236
     },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
+    "asset": {
+      "__uuid__": "1f1fc3ab-ff7f-4f4e-87fe-641972433beb",
+      "__expectedType__": "cc.Prefab"
     },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
+    "fileId": "e0IYQ+s3JXepO5aZpZpw+R",
+    "instance": {
+      "__id__": 238
     },
-    "_id": ""
+    "targetOverrides": null
   },
   {
-    "__type__": "cc.Node",
-    "_name": "Box",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 236
+    "__type__": "cc.PrefabInstance",
+    "fileId": "5cGyz+LJ5EzrFBkVoradG2",
+    "prefabRootNode": {
+      "__id__": 1
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
       {
-        "__id__": 238
+        "__id__": 239
       },
       {
         "__id__": 241
+      },
+      {
+        "__id__": 242
+      },
+      {
+        "__id__": 243
       }
     ],
-    "_prefab": {
-      "__id__": 243
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": -6.123234262925839e-17,
-      "y": -1,
-      "z": -6.123234262925839e-17,
-      "w": 6.123233995736766e-17
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": -7.0167096047110005e-15,
-      "y": -180,
-      "z": 7.0167096047110005e-15
-    },
-    "_id": ""
+    "removedComponents": []
   },
   {
-    "__type__": "cc.MeshRenderer",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 237
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 239
-    },
-    "_materials": [
-      {
-        "__uuid__": "1348765a-6d5c-4f62-9c1a-68435a4a9170",
-        "__expectedType__": "cc.Material"
-      }
-    ],
-    "_visFlags": 0,
-    "bakeSettings": {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
       "__id__": 240
     },
-    "_mesh": {
-      "__uuid__": "fe421ede-e27a-4a5c-a86c-8e66e1753b86@444de",
-      "__expectedType__": "cc.Mesh"
-    },
-    "_shadowCastingMode": 0,
-    "_shadowReceivingMode": 1,
-    "_shadowBias": 0,
-    "_shadowNormalBias": 0,
-    "_reflectionProbeId": -1,
-    "_reflectionProbeBlendId": -1,
-    "_reflectionProbeBlendWeight": 0,
-    "_enabledGlobalStandardSkinObject": false,
-    "_enableMorph": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "26h+S75b5JR41viLViR+7T"
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "box"
   },
   {
-    "__type__": "cc.ModelBakeSettings",
-    "texture": null,
-    "uvParam": {
-      "__type__": "cc.Vec4",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 0
-    },
-    "_bakeable": false,
-    "_castShadow": false,
-    "_receiveShadow": false,
-    "_recieveShadow": false,
-    "_lightmapSize": 64,
-    "_useLightProbe": false,
-    "_bakeToLightProbe": true,
-    "_reflectionProbeType": 0,
-    "_bakeToReflectionProbe": true
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "e0IYQ+s3JXepO5aZpZpw+R"
+    ]
   },
   {
-    "__type__": "cc.MeshCollider",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 237
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 242
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 240
     },
-    "_material": null,
-    "_isTrigger": false,
-    "_center": {
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 1.6,
       "z": 0
-    },
-    "_mesh": {
-      "__uuid__": "fe421ede-e27a-4a5c-a86c-8e66e1753b86@444de",
-      "__expectedType__": "cc.Mesh"
-    },
-    "_convex": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "e4VE0ovbZGjLgsUvsN+65G"
+    }
   },
   {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 240
     },
-    "fileId": "85yqFcT11BRbwhxpHo3/zb",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    }
   },
   {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 240
     },
-    "fileId": "b17YG2jJJAy5HoJ5j0whza",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
   },
   {
     "__type__": "a2d93SPQfJDU4bqNJGq/PnA",
@@ -5706,11 +5603,9 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 246
-    },
-    "plate": {
-      "__id__": 236
+      "__id__": 245
     },
+    "plate": null,
     "_id": ""
   },
   {
@@ -5729,6 +5624,9 @@
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
+      {
+        "__id__": 236
+      },
       {
         "__id__": 165
       }

+ 1 - 1
assets/resources/spine/effect_hecheng.atlas.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.0",
+  "ver": "1.0.1",
   "importer": "*",
   "imported": true,
   "uuid": "68ced266-9802-49f2-90f8-80afe3eea859",

+ 1 - 1
assets/resources/spine/effect_hecheng.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.27",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "6ce5edac-bb01-42eb-b03c-4edf2692d1e3",

+ 4 - 3
assets/scenes/loading.scene

@@ -285,7 +285,7 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 375.00000000000006,
+      "x": 374.99999999999994,
       "y": 667,
       "z": 0
     },
@@ -602,7 +602,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750.0000000000002,
+      "width": 750,
       "height": 1334
     },
     "_anchorPoint": {
@@ -695,7 +695,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750.0000000000002,
+      "width": 750,
       "height": 1334
     },
     "_anchorPoint": {
@@ -771,6 +771,7 @@
     "__type__": "3e27bLpQV9LjZgHxH5Nb2U0",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 7
     },

+ 1 - 1
assets/scripts/core/base/BaseExp.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "f72326c6-6fac-43cb-8174-398218680b05",

+ 1 - 1
assets/scripts/core/common/BusyLoading.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "f1cd9dff-5505-44f4-9902-c07552797157",

+ 1 - 1
assets/scripts/core/common/GameConst.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "e35ac454-07c2-4472-893e-21ac6fd731da",

+ 1 - 1
assets/scripts/core/component/BasePanel.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "7b279f54-6f87-4325-a364-46b0214afd5f",

+ 1 - 1
assets/scripts/core/component/BaseUI.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "b891a3ff-4206-447c-a91b-9a887a2e994f",

+ 1 - 1
assets/scripts/core/component/ComponentEx.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "819feae2-ec3c-4743-ad8c-1e6088e4a736",

+ 1 - 1
assets/scripts/core/component/UIEffect.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",

+ 1 - 1
assets/scripts/core/configs/BundleConfig.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "7c031a4d-9e45-4aaf-b744-b8cb3c559efa",

+ 1 - 1
assets/scripts/core/csv/CsvManager.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "d5fb90fe-e386-40cb-9887-82ec811b8cad",

+ 1 - 1
assets/scripts/core/csv/CsvParser.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "0b6bf73a-3491-4224-996a-97daabf9d47e",

+ 1 - 1
assets/scripts/core/event/EventEmitter.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "eef30682-3b88-48d1-9bef-009bd9686383",

+ 1 - 1
assets/scripts/core/extend/AutoBind.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "02dbc2f0-4336-42b2-9695-3218f2b7d763",

+ 1 - 1
assets/scripts/core/extend/DateTime.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "8cc6732a-2123-4e03-953b-6b6829aef7be",

+ 1 - 1
assets/scripts/core/extend/Logger.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "87f8acd6-3731-4dbe-b3b0-64a9b9661279",

+ 1 - 1
assets/scripts/core/extend/Nodes.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "6ad1a990-ee1a-44bc-8b03-ae2a3cfe8550",

+ 1 - 1
assets/scripts/core/extend/NumRaiseLable.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "3f43d5d1-106e-4fd4-b21c-a3bc3d9a4268",

+ 1 - 1
assets/scripts/core/extend/SensitiveWords.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "6423e135-1290-43de-9d74-dc10b203a26a",

+ 1 - 1
assets/scripts/core/extend/Verbatim.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "0a3efca1-b85b-4867-ab10-30715e5aff2e",

+ 1 - 1
assets/scripts/core/i18n/lan/en.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "c2ee7373-5c47-46d5-9dc2-5e57e3a0ef0c",

+ 1 - 1
assets/scripts/core/i18n/lan/zh.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "3c2acb11-044f-4a3b-8878-b064e206544b",

+ 1 - 1
assets/scripts/core/i18n/runtime-scripts/LanguageData.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "d659735e-473e-4eb9-9ea4-71e2641d6737",

+ 1 - 1
assets/scripts/core/i18n/runtime-scripts/LocalizedLabel.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "c4c1ac57-37e3-4be2-8610-12bd8ce2a9f6",

+ 1 - 1
assets/scripts/core/i18n/runtime-scripts/LocalizedSprite.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "28bd9c44-32fd-4628-b6d3-b808b8078748",

+ 1 - 1
assets/scripts/core/i18n/runtime-scripts/polyglot.min.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "2683925c-556a-4669-b13d-c40effb96270",

+ 1 - 1
assets/scripts/core/manager/AudioManager.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "f6afa925-219f-4d4c-9578-947fa03e0de9",

+ 1 - 1
assets/scripts/core/manager/BundleManager.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "b9fe723e-bf27-4283-acdf-06767b945ca5",

+ 1 - 1
assets/scripts/core/manager/BusyLoadingManager.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "e9a7ffb8-229a-4359-bef1-1e69a4292604",

+ 1 - 1
assets/scripts/core/manager/Data.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "1f51e66d-d680-4949-bfac-14d020934906",

+ 1 - 1
assets/scripts/core/manager/PoolManager.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "bdc3c605-0afa-42a3-b045-f0cd1fe26db1",

+ 1 - 1
assets/scripts/core/manager/Singleton.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "1aee6f52-660a-460e-9949-fa2265e48bb2",

+ 1 - 1
assets/scripts/core/manager/StateManager.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "09b0b8d5-cb1e-4f7c-b6e4-9784c2e2f549",

+ 1 - 1
assets/scripts/core/manager/UIManager.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "0147c6db-0eef-4e72-b6ef-b39845270006",

+ 1 - 1
assets/scripts/core/manager/WindowManager.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "6aa1de42-d53e-45e4-bd21-9b619295ccdf",

+ 1 - 1
assets/scripts/core/utils/DebugTools.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "1214652f-7ab9-4fef-863f-5239328b922b",

+ 1 - 1
assets/scripts/core/utils/MsgHints.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "de11689e-e89a-4407-b37e-c8fd86d5fc0b",

+ 1 - 1
assets/scripts/core/utils/QuickEnv.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "229fdbf3-2df2-41e6-948d-b5d019e598a0",

+ 1 - 1
assets/scripts/core/utils/ResUtil.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "3015eab0-e5a7-42f1-9a97-2e79c4932df7",

+ 1 - 1
assets/scripts/core/utils/Utils.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "d0788900-f82a-406f-b7c6-6c5e068f6955",

+ 107 - 1
assets/scripts/game/GameNode.ts

@@ -71,10 +71,46 @@ export class GameNode extends ComponentEx {
     
 
     moveToRightPos() {
+        return;
         //移动到正确位置
         this.collectTiles.map((a, i) => {
             let tileItem = a.getComponent(TileItem)
-            Tween.stopAllByTarget(a)
+            Tween.stopAllByTarget(a);
+            //抛物移动
+            /*this.parabolicMovementWithScale(
+                a,
+                a.position.clone(),
+                this.collectpos[i].clone(),
+                4, //高度
+                0.4, //时长
+                a.scale.clone(),
+                new Vec3(1, 1, 1),
+                ()=>{
+                    tileItem.auto_rotation = true;
+                    if (tileItem.removed) {
+                        Utils.remove(this.optionTiles,a);
+                        tween(a).to(0.25, { worldPosition: tileItem.removedPos }, { easing: 'backIn' }).call(async () => {
+                            //最中央的播放移除特效
+                            if (tileItem.playRmovedEff) {
+                                //增加星星
+                                let pos = this.GetNode("Main Camera").getComponent(Camera).convertToUINode(a.worldPosition, find("Canvas"));
+                                let node_ani = await ResUtil.playSkAni("spine/effect_hecheng", "effect", find("Canvas"), pos);
+                                audioMgr.playOneShot(GameConst.audios.starCollect);
+                                platformSystem.platform.vibrateShort();
+                                Utils.flyAnim(ITEM_TYPE.Star, node_ani, Main.Instance()._GameUI.starNode, 1, 0, (b) => {
+                                    if (b) {
+                                        node_ani.destroy();
+                                        Main.Instance()._GameUI.star++;
+                                    }
+                                });
+                            }
+                            a.destroy()
+                            this.moveToRightPos()
+                            this.checkResult()
+                        }).start()
+                    }
+                }
+            );*/
             tween(a).to(0.3, { worldPosition: this.collectpos[i].clone(), worldScale: v3(1, 1, 1) }).call(() => {
                 tileItem.auto_rotation = true;
                 if (tileItem.removed) {
@@ -554,4 +590,74 @@ export class GameNode extends ComponentEx {
         nomal_node.setWorldPosition(p);
         this.allTiles.push(nomal_node);
     }
+
+    /**
+     * 抛物线运动工具(带缩放动画)
+     * @param node 要移动的节点
+     * @param startPos 起始坐标(世界坐标)
+     * @param endPos 目标坐标(世界坐标)
+     * @param height 抛物线最高点高度(相对于起点)
+     * @param duration 动画时长(秒)
+     * @param startScale 起始缩放(默认原始大小)
+     * @param endScale 目标缩放(默认原始大小)
+     * @param onComplete 完成回调
+     */
+    public parabolicMovementWithScale(
+        node: Node,
+        startPos: Vec3,
+        endPos: Vec3,
+        height: number = 2,
+        duration: number = 1.5,
+        startScale: Vec3 = Vec3.ONE,
+        endScale: Vec3 = Vec3.ONE,
+        onComplete?: () => void
+    ): Tween<Node> {
+        if(Vec3.equals(startPos, endPos)) {
+            onComplete?.();
+            return;
+        }
+        //初始化节点状态
+        node.setWorldPosition(startPos.clone());
+        node.setScale(startScale);
+        //计算抛物线顶点
+        const midPoint = new Vec3(
+            (startPos.x + endPos.x) / 2,
+            Math.max(startPos.y, endPos.y) + height,
+            (startPos.z + endPos.z) / 2
+        );
+        //创建组合动画
+        return tween(node)
+            .to(duration, 
+                { 
+                    worldPosition: endPos,
+                    worldScale: endScale 
+                },
+                { 
+                    onUpdate: (target: Node, ratio: number) => {
+                        //1. 计算抛物线位置
+                        const t = ratio;
+                        const invT = 1 - t;
+                        const tempPos = new Vec3();
+                        // XZ轴线性插值
+                        Vec3.lerp(tempPos, startPos, endPos, t);
+                        //Y轴抛物线计算
+                        const y = invT * invT * startPos.y 
+                               + 2 * invT * t * midPoint.y 
+                               + t * t * endPos.y;
+                        //2. 计算当前缩放比例
+                        const currentScale = new Vec3();
+                        Vec3.lerp(currentScale, startScale, endScale, t);
+                        //更新节点状态
+                        target.worldPosition = new Vec3(tempPos.x, y, tempPos.z);
+                        target.setScale(currentScale);
+                    }
+                }
+            )
+            .call(() => {
+                // 最终确保缩放精确
+                node.setScale(endScale);
+                onComplete?.();
+            })
+            .start();
+    }
 }

+ 1 - 1
assets/scripts/game/GameNode.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "a2d9348f-41f2-4353-86ea-3491aafcf9c0",

+ 1 - 1
assets/scripts/game/GameUI.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "77bd12a7-e4d5-439a-b7dc-2a2da8cc7df7",

+ 1 - 1
assets/scripts/game/HallUI.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "de92eacc-389a-4ccf-aeed-3177d23ea0ab",

+ 1 - 1
assets/scripts/game/Main.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "7675dd59-1a35-40c6-9576-30329ec1852f",

+ 1 - 1
assets/scripts/game/TileItem.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "e57f3221-b15d-48ce-aa54-b8d5da256e5e",

+ 1 - 1
assets/scripts/gameui/BoxLayer.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "4b854678-310c-4c32-812f-fb59255479be",

+ 1 - 1
assets/scripts/gameui/BuyCoinLayer.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "ed0c2a4e-9bab-4aa0-ab9d-457fa22a811f",

+ 1 - 1
assets/scripts/gameui/BuyItemLayer.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "319a394d-1f46-4da8-960a-bc1c4fc4891f",

+ 1 - 1
assets/scripts/gameui/BuyLifeLayer.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "98a55aeb-76ca-4bb0-8de6-9086d13ae230",

+ 1 - 1
assets/scripts/gameui/DrawStarLayer.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "7afe5a2a-fe7f-43c2-b28d-3655141119bd",

+ 1 - 1
assets/scripts/gameui/FailLayer.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "26913ddd-91ad-4a60-979e-07aa9362f5ee",

+ 1 - 1
assets/scripts/gameui/LevelClearLayer.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "93baaef4-dac6-45c1-b64b-814374f038f3",

+ 1 - 1
assets/scripts/gameui/LevelLayer.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "72e803a1-e6d7-4958-97ec-7dd6fc3a493c",

+ 1 - 1
assets/scripts/gameui/NewPackOpenedLayer.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "95f08ea4-cc64-41ed-9c11-3950fa1aaa83",

+ 1 - 1
assets/scripts/gameui/OutOfBoxLayer.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "9ac6a2cb-3277-42bb-913c-e630e2218be7",

+ 1 - 1
assets/scripts/gameui/PauseLayer.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "93de81c2-0c8a-4ca2-8e6e-2bf15afbf764",

+ 1 - 1
assets/scripts/gameui/RoY.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "3bf69b2d-24b3-48c5-8ca9-a26cd266337b",

+ 1 - 1
assets/scripts/gameui/SettingLayer.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "c06a8490-1e52-4afa-b4d5-80d23962f72b",

+ 1 - 1
assets/scripts/loading/Loading.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "3e27b2e9-415f-4b8d-9807-c47e4d6f6534",

+ 1 - 1
assets/scripts/platform/platformBrowser.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "642c0e89-4f16-4239-81aa-f85fe3283c35",

+ 1 - 1
assets/scripts/platform/platformDefault.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "e773e451-cab2-4183-aed4-2f397c031e9e",

+ 1 - 1
assets/scripts/platform/platformSystem.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "f35f068e-fc9d-4fba-a784-d843e2412b2f",

+ 1 - 1
assets/scripts/platform/platformTT.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "1b9b3b15-e9c0-4a69-8398-0fb6baabf16c",

+ 1 - 1
assets/scripts/platform/platformWX.ts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "4.0.24",
+  "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
   "uuid": "ef013a9c-4fee-4801-88eb-70b16ac00f66",

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini