Merge pull request #3 from Gadgame/feature/box2d-wasm

Feature/box2d wasm

.vscode/settings.json

@@ -1,6 +1,9 @@
 {
     "editor.formatOnSave": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.codeActionsOnSave": {
+        "source.sortImports": "explicit"
+    },
     "files.exclude": {
         "**/*.meta": true
     },

assets/_Game.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "7beb751f-720d-4d3f-b404-7130c61a1dea",

assets/_Game/Animations.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "8670cb90-7797-4574-b557-379a46b2bc37",

assets/_Game/Animations/City.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "e98bd0d7-bb92-44e9-a475-2ef43d4fa35b",

assets/_Game/Animations/Farm.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "c8cf4bf6-10ee-4edd-81da-5f5e70656b56",

assets/_Game/Animations/Park.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "785a8661-045c-4799-a6f3-cd883ad0c540",

assets/_Game/Fonts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "a9d33536-4c0f-45c2-8888-46f13c69a5fd",

assets/_Game/Materials.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "ac37de03-472a-4f50-b416-d69ec65dad2f",

assets/_Game/Materials/mai_trail.mtl.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.20",
+  "ver": "1.0.21",
   "importer": "material",
   "imported": true,
   "uuid": "bcb27fc3-3d3f-4d2d-b878-d0b9535f7123",

assets/_Game/Materials/mat_ball_buff.mtl.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.20",
+  "ver": "1.0.21",
   "importer": "material",
   "imported": true,
   "uuid": "989f9732-56aa-468a-9c87-d59761501c3e",

assets/_Game/Materials/mat_buff.mtl.meta

@@ -1 +1,11 @@
-{"ver":"1.0.20","importer":"material","imported":true,"uuid":"08b0dafd-3f2c-4d0f-a9ec-edf75ca0a191","files":[".json"],"subMetas":{},"userData":{}}
+{
+  "ver": "1.0.21",
+  "importer": "material",
+  "imported": true,
+  "uuid": "08b0dafd-3f2c-4d0f-a9ec-edf75ca0a191",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/_Game/Materials/mat_goal.mtl.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.20",
+  "ver": "1.0.21",
   "importer": "material",
   "imported": true,
   "uuid": "601118ed-3a55-4d36-9364-79083615a5d6",

assets/_Game/Materials/mat_render_trail.mtl.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.20",
+  "ver": "1.0.21",
   "importer": "material",
   "imported": true,
   "uuid": "68fe4177-a5f3-4391-a70a-669c9757d400",

assets/_Game/Materials/mat_ring.mtl.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.20",
+  "ver": "1.0.21",
   "importer": "material",
   "imported": true,
   "uuid": "9aa5d037-ec4c-4f5a-9513-4a423d576110",

assets/_Game/Materials/mat_star.mtl.meta

@@ -1 +1,11 @@
-{"ver":"1.0.20","importer":"material","imported":true,"uuid":"96242f22-674f-4a2c-a9c2-0a51b5bbf8ba","files":[".json"],"subMetas":{},"userData":{}}
+{
+  "ver": "1.0.21",
+  "importer": "material",
+  "imported": true,
+  "uuid": "96242f22-674f-4a2c-a9c2-0a51b5bbf8ba",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/_Game/Materials/material.mtl.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.20",
+  "ver": "1.0.21",
   "importer": "material",
   "imported": true,
   "uuid": "e2d4d20d-0036-4158-a94c-66c01a53006c",

assets/_Game/Prefabs.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "730ca6ee-2864-4f40-a17c-4eb910458473",

assets/_Game/Prefabs/Ball.prefab

@@ -3,6 +3,7 @@
     "__type__": "cc.Prefab",
     "_name": "Ball",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_native": "",
     "data": {
       "__id__": 1
@@ -81,6 +82,7 @@
     "__type__": "cc.Node",
     "_name": "Graphics",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
@@ -149,6 +151,7 @@
     "__type__": "cc.Node",
     "_name": "shadow",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 2
     },
@@ -198,6 +201,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 3
     },
@@ -225,6 +229,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 3
     },
@@ -359,7 +364,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": 10
     }
   },
   {
@@ -566,6 +571,7 @@
     "__type__": "cc.Node",
     "_name": "Sprite",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 2
     },
@@ -615,6 +621,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 30
     },
@@ -642,6 +649,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 30
     },
@@ -699,6 +707,7 @@
     "__type__": "cc.Node",
     "_name": "CheeseModeSprite",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 2
     },
@@ -748,6 +757,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 36
     },
@@ -775,6 +785,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 36
     },
@@ -951,7 +962,7 @@
     "propertyPath": [
       "_active"
     ],
-    "value": false
+    "value": true
   },
   {
     "__type__": "cc.Node",
@@ -1046,7 +1057,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": -30,
-      "z": 0
+      "z": 10
     }
   },
   {
@@ -1142,12 +1153,13 @@
     "propertyPath": [
       "_active"
     ],
-    "value": false
+    "value": true
   },
   {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
@@ -1280,6 +1292,7 @@
     "__type__": "2b7c2ePr+dMuYseum/QYECs",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1340,6 +1353,7 @@
     "__type__": "cc.Animation",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1368,6 +1382,7 @@
     "__type__": "02a884WNWtExrO21yAjQDWZ",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1440,6 +1455,7 @@
     "__type__": "02a884WNWtExrO21yAjQDWZ",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },

assets/_Game/Prefabs/Ball.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "9b471c78-2e1d-4db8-ab08-b3df7c938d64",

assets/_Game/Prefabs/Booster.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "dbeb478b-2f4c-4307-9a55-7342461c65f4",

assets/_Game/Prefabs/Booster/CumulativeBooster.prefab

@@ -3,6 +3,7 @@
     "__type__": "cc.Prefab",
     "_name": "CumulativeBooster",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_native": "",
     "data": {
       "__id__": 1
@@ -75,6 +76,7 @@
     "__type__": "cc.Node",
     "_name": "Sprite",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
@@ -128,6 +130,7 @@
     "__type__": "cc.Node",
     "_name": "Particle",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 2
     },
@@ -151,7 +154,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": 10
     },
     "_lrot": {
       "__type__": "cc.Quat",
@@ -180,6 +183,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 3
     },
@@ -207,6 +211,7 @@
     "__type__": "cc.ParticleSystem",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 3
     },
@@ -965,6 +970,7 @@
     "__type__": "cc.UIMeshRenderer",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 3
     },
@@ -995,6 +1001,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
@@ -1022,6 +1029,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
@@ -1079,6 +1087,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1106,6 +1115,7 @@
     "__type__": "366a4horc9BIpj097ERzLW3",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1123,6 +1133,7 @@
     "_animation": {
       "__id__": 82
     },
+    "displayName": "CHEESE",
     "time": 10,
     "_id": ""
   },
@@ -1134,6 +1145,7 @@
     "__type__": "cc.BoxCollider2D",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1167,6 +1179,7 @@
     "__type__": "cc.Animation",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1195,6 +1208,7 @@
     "__type__": "cc.RigidBody2D",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },

assets/_Game/Prefabs/Booster/CumulativeBooster.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "fefef5ec-f5cc-45f8-8e6f-4489f610b249",

assets/_Game/Prefabs/Carrot.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "f5073081-8dd5-444f-b755-d18d38aa98fb",

assets/_Game/Prefabs/Clock.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "c32eb90e-312b-4fb1-bbdb-dab9e9b14691",

assets/_Game/Prefabs/Label.prefab

@@ -307,7 +307,16 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_id": ""
+    "_id": "",
+    "_enableOutline": true,
+    "_outlineWidth": 2,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 102,
+      "b": 0,
+      "a": 255
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -392,14 +401,6 @@
     "__prefab": {
       "__id__": 19
     },
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 102,
-      "b": 0,
-      "a": 255
-    },
-    "_width": 2,
     "_id": ""
   },
   {

assets/_Game/Prefabs/Label.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "fadb66db-6899-45d0-a28c-4e3709c86180",

assets/_Game/Prefabs/Star.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "35274179-f40e-4de9-a5d5-43fba9c12669",

assets/_Game/Prefabs/Themes.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "a5c11bee-d3d4-4f5d-84ce-2054776abb20",

assets/_Game/Prefabs/Themes/City.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "452ca236-9682-47e9-a382-55f3160680ab",

assets/_Game/Prefabs/Themes/City/City_Ball.prefab

@@ -3,6 +3,7 @@
     "__type__": "cc.Prefab",
     "_name": "City_Ball",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_native": "",
     "data": {
       "__id__": 1
@@ -81,6 +82,7 @@
     "__type__": "cc.Node",
     "_name": "Graphics",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
@@ -149,6 +151,7 @@
     "__type__": "cc.Node",
     "_name": "shadow",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 2
     },
@@ -198,6 +201,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 3
     },
@@ -225,6 +229,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 3
     },
@@ -371,7 +376,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": 10
     }
   },
   {
@@ -619,6 +624,7 @@
     "__type__": "cc.Node",
     "_name": "Sprite",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 2
     },
@@ -668,6 +674,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 34
     },
@@ -695,6 +702,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 34
     },
@@ -752,6 +760,7 @@
     "__type__": "cc.Node",
     "_name": "CheeseModeSprite",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 2
     },
@@ -801,6 +810,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 40
     },
@@ -828,6 +838,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 40
     },
@@ -1077,7 +1088,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": -30,
-      "z": 0
+      "z": 10
     }
   },
   {
@@ -1148,6 +1159,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
@@ -1280,6 +1292,7 @@
     "__type__": "2b7c2ePr+dMuYseum/QYECs",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1340,6 +1353,7 @@
     "__type__": "cc.Animation",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1368,6 +1382,7 @@
     "__type__": "02a884WNWtExrO21yAjQDWZ",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1440,6 +1455,7 @@
     "__type__": "02a884WNWtExrO21yAjQDWZ",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },

assets/_Game/Prefabs/Themes/City/City_Ball.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "0cd776f0-7ca6-4891-a6d8-bb3782891e63",

assets/_Game/Prefabs/Themes/City/City_Clock.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "e3309c9f-67dd-42ff-b1d6-18dad8407c40",

assets/_Game/Prefabs/Themes/City/City_Fish.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "6a1dc8c3-35ca-47a5-b9ee-64558ae690d4",

assets/_Game/Prefabs/Themes/Farm.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "a0916114-d7f4-4bb9-8c3a-87957c1fa852",

assets/_Game/Prefabs/Themes/Farm/Farm_Clock.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "30ede18e-3c82-42d5-849f-f0b53b133ed6",

assets/_Game/Prefabs/Themes/Farm/Farm_Egg.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "d9b3cb1b-c496-4947-aed1-f22aba4161ae",

assets/_Game/Prefabs/Themes/Park.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "461cb9c6-863e-4dff-968f-0e97d84bb991",

assets/_Game/Prefabs/Themes/Park/Park_Ball.prefab

@@ -3,6 +3,7 @@
     "__type__": "cc.Prefab",
     "_name": "Park_Ball",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_native": "",
     "data": {
       "__id__": 1
@@ -81,6 +82,7 @@
     "__type__": "cc.Node",
     "_name": "Graphics",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
@@ -149,6 +151,7 @@
     "__type__": "cc.Node",
     "_name": "shadow",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 2
     },
@@ -198,6 +201,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 3
     },
@@ -225,6 +229,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 3
     },
@@ -374,7 +379,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": 10
     }
   },
   {
@@ -595,7 +600,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": 10
     }
   },
   {
@@ -742,6 +747,7 @@
     "__type__": "cc.Node",
     "_name": "Sprite",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 2
     },
@@ -791,6 +797,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 43
     },
@@ -818,6 +825,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 43
     },
@@ -875,6 +883,7 @@
     "__type__": "cc.Node",
     "_name": "CheeseModeSprite",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 2
     },
@@ -924,6 +933,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 49
     },
@@ -951,6 +961,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 49
     },
@@ -1206,7 +1217,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": -30,
-      "z": 0
+      "z": 10
     }
   },
   {
@@ -1298,6 +1309,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
@@ -1430,6 +1442,7 @@
     "__type__": "2b7c2ePr+dMuYseum/QYECs",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1490,6 +1503,7 @@
     "__type__": "cc.Animation",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1515,6 +1529,7 @@
     "__type__": "02a884WNWtExrO21yAjQDWZ",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -1587,6 +1602,7 @@
     "__type__": "02a884WNWtExrO21yAjQDWZ",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },

assets/_Game/Prefabs/Themes/Park/Park_Ball.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "f7143e14-a2af-4464-b0d1-51f2e6b899a9",

assets/_Game/Prefabs/Themes/Park/Park_Clock.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "cf4f5f1a-d297-4dd2-baa1-29ed8e2d8e60",

assets/_Game/Prefabs/Themes/Park/Park_ballObject.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "09f45312-0d7e-4b6b-9807-b280adddff31",

assets/_Game/Prefabs/UI.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "5461daf7-e832-44cd-a5e2-e9611e3434c9",

assets/_Game/Prefabs/UI/itemNormal.prefab

@@ -380,7 +380,16 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_id": ""
+    "_id": "",
+    "_enableOutline": true,
+    "_outlineWidth": 4,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 96,
+      "g": 96,
+      "b": 96,
+      "a": 255
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -432,14 +441,6 @@
     "__prefab": {
       "__id__": 17
     },
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 96,
-      "g": 96,
-      "b": 96,
-      "a": 255
-    },
-    "_width": 4,
     "_id": ""
   },
   {

assets/_Game/Prefabs/UI/itemNormal.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "45fbee0e-e0ae-4e69-828e-ee8e725f3c5c",

assets/_Game/Prefabs/UI/itemTop1.prefab

@@ -250,7 +250,16 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_id": ""
+    "_id": "",
+    "_enableOutline": true,
+    "_outlineWidth": 4,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 102,
+      "b": 0,
+      "a": 255
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -302,14 +311,6 @@
     "__prefab": {
       "__id__": 11
     },
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 102,
-      "b": 0,
-      "a": 255
-    },
-    "_width": 4,
     "_id": ""
   },
   {

assets/_Game/Prefabs/UI/itemTop1.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "44541b9d-0cbe-4e00-8819-64b15d93dea7",

assets/_Game/Prefabs/UI/itemTop2.prefab

@@ -247,7 +247,16 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_id": ""
+    "_id": "",
+    "_enableOutline": true,
+    "_outlineWidth": 4,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 99,
+      "g": 113,
+      "b": 133,
+      "a": 255
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -299,14 +308,6 @@
     "__prefab": {
       "__id__": 11
     },
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 99,
-      "g": 113,
-      "b": 133,
-      "a": 255
-    },
-    "_width": 4,
     "_id": ""
   },
   {

assets/_Game/Prefabs/UI/itemTop2.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "a1083c12-2895-4ff8-8f0c-012f9d6684f5",

assets/_Game/Prefabs/UI/itemTop3.prefab

@@ -247,7 +247,16 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_id": ""
+    "_id": "",
+    "_enableOutline": true,
+    "_outlineWidth": 4,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 126,
+      "g": 41,
+      "b": 19,
+      "a": 255
+    }
   },
   {
     "__type__": "cc.CompPrefabInfo",
@@ -299,14 +308,6 @@
     "__prefab": {
       "__id__": 11
     },
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 126,
-      "g": 41,
-      "b": 19,
-      "a": 255
-    },
-    "_width": 4,
     "_id": ""
   },
   {

assets/_Game/Prefabs/UI/itemTop3.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
   "uuid": "731196cb-d101-433a-9fa5-90699deb0d37",

assets/_Game/RenderTexture.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "07b6adc0-8dd7-436d-998b-0b17e557c245",

assets/_Game/Scenes.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "0eceae98-c740-447e-a39b-70f6d695ceb6",

assets/_Game/Scenes/City-theme.scene.meta

@@ -1 +1,11 @@
-{"ver":"1.1.43","importer":"scene","imported":true,"uuid":"1e498311-fccb-4ff2-9dcb-01b2626287c2","files":[".json"],"subMetas":{},"userData":{}}
+{
+  "ver": "1.1.50",
+  "importer": "scene",
+  "imported": true,
+  "uuid": "1e498311-fccb-4ff2-9dcb-01b2626287c2",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/_Game/Scenes/Default-theme.scene.meta

@@ -1 +1,11 @@
-{"ver":"1.1.43","importer":"scene","imported":true,"uuid":"aa17106a-0b45-4280-a91c-9650d0c417b3","files":[".json"],"subMetas":{},"userData":{}}
+{
+  "ver": "1.1.50",
+  "importer": "scene",
+  "imported": true,
+  "uuid": "aa17106a-0b45-4280-a91c-9650d0c417b3",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/_Game/Scenes/Farm-theme.scene.meta

@@ -1 +1,11 @@
-{"ver":"1.1.43","importer":"scene","imported":true,"uuid":"07421189-8ae9-4f94-a7dd-707b0dae75df","files":[".json"],"subMetas":{},"userData":{}}
+{
+  "ver": "1.1.50",
+  "importer": "scene",
+  "imported": true,
+  "uuid": "07421189-8ae9-4f94-a7dd-707b0dae75df",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/_Game/Scenes/Park-theme.scene.meta

@@ -1 +1,11 @@
-{"ver":"1.1.43","importer":"scene","imported":true,"uuid":"0c199331-f6e2-464b-bda1-8545faafa882","files":[".json"],"subMetas":{},"userData":{}}
+{
+  "ver": "1.1.50",
+  "importer": "scene",
+  "imported": true,
+  "uuid": "0c199331-f6e2-464b-bda1-8545faafa882",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/_Game/Scripts.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "e96f2577-0b37-40e8-908f-29359e31dde5",

assets/_Game/Scripts/API.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "46ab7167-6eec-4756-9dfb-67301f88f4ad",

assets/_Game/Scripts/Booster.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "d404fb8f-f4c8-4ae6-a7da-3b89343e5730",

assets/_Game/Scripts/Booster/BoosterBase.ts

@@ -1,10 +1,10 @@
-import { _decorator, CCFloat, Collider2D, Component, Contact2DType, Animation, AudioClip, CCString } from 'cc';
+import { _decorator, Animation, AudioClip, CCFloat, CCString, Collider2D, Component, Contact2DType } from 'cc';
-import ObjectPool from '../Pool/ObjectPool';
-import { EventManger } from '../Manager/EventManger';
 import GameEvent from '../Events/GameEvent';
-import IPoolable from '../Pool/IPoolable';
+import { EventManger } from '../Manager/EventManger';
-import Utilities from '../Utilities';
 import { SoundManager } from '../Manager/SoundManager';
+import IPoolable from '../Pool/IPoolable';
+import ObjectPool from '../Pool/ObjectPool';
+import Utilities from '../Utilities';
 const { ccclass, property } = _decorator;
 
 @ccclass('BoosterBase')
@@ -17,18 +17,20 @@ export class BoosterBase extends Component implements IPoolable {
     private _animation: Animation;
     @property(CCString)
     public readonly displayName: string = 'CHEESE';
-
     @property(CCFloat)
     protected time: number = 10;
 
+    private _enabled: boolean = true;
+
     protected onLoad(): void {
         this._collider.on(Contact2DType.BEGIN_CONTACT, this.onContactBegin, this);
-        this._collider.enabled = false;
+        this._enabled = false;
     }
 
     private onContactBegin(self: Collider2D, other: Collider2D) {
+        if (!this._enabled) return;
         this.boosterActive();
-        this._collider.enabled = false;
+        this._enabled = false;
         SoundManager.instance.playSfx(this._collectSound);
         EventManger.instance.emit(GameEvent.ObjectRelease, this.node);
         ObjectPool.release(this.node);
@@ -39,9 +41,9 @@ export class BoosterBase extends Component implements IPoolable {
     async onGet() {
         this._animation.play();
         await Utilities.delay(this._animation.defaultClip.duration);
-        this._collider.enabled = true;
+        this._enabled = true;
     }
     onRelease() {
-        this._collider.enabled = false;
+        this._enabled = false;
     }
 }

assets/_Game/Scripts/Enum.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "ade0f387-95dc-431a-85db-7cab3149bae2",

assets/_Game/Scripts/Environments.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "0d010146-70ff-4b4b-a3cc-143f843657b1",

assets/_Game/Scripts/Environments/CumulativeBar.ts

@@ -1,29 +1,29 @@
 import {
     _decorator,
+    AudioClip,
+    CCFloat,
     CCInteger,
     clamp,
+    clamp01,
     Component,
     lerp,
-    Sprite,
     Node,
-    tween,
+    ParticleSystem,
     Prefab,
+    randomRange,
+    Sprite,
+    tween,
     Tween,
     Vec3,
-    AudioClip,
-    randomRange,
-    CCFloat,
-    clamp01,
-    ParticleSystem,
 } from 'cc';
-import { EventManger } from '../Manager/EventManger';
-import GameEvent from '../Events/GameEvent';
-import ScoreType from '../Enum/ScoreType';
-import Utilities from '../Utilities';
-import { GameManager } from '../Manager/GameManager';
 import BoosterType from '../Enum/BoosterType';
-import ObjectPool from '../Pool/ObjectPool';
+import ScoreType from '../Enum/ScoreType';
+import GameEvent from '../Events/GameEvent';
+import { EventManger } from '../Manager/EventManger';
+import { GameManager } from '../Manager/GameManager';
 import { SoundManager } from '../Manager/SoundManager';
+import ObjectPool from '../Pool/ObjectPool';
+import Utilities from '../Utilities';
 import { SequenceSound } from './SequenceSound';
 const { ccclass, property } = _decorator;
 
@@ -145,8 +145,10 @@ export class CumulativeBar extends Component {
                         },
                     )
                     .call(async () => {
-                        const fx = this._fxPool.get(ParticleSystem, this.node);
+                        const fx = this._fxPool.get(ParticleSystem, GameManager.instance.topContainer);
-                        fx.node.setWorldPosition(star.worldPosition);
+                        const pos = star.getWorldPosition();
+                        pos.z = 10;
+                        fx.node.setWorldPosition(pos);
                         this._starPool.release(star);
                         SoundManager.instance.playSfx(this._collectStartSoundFx);
                         await Utilities.waitUntil(() => {
@@ -234,7 +236,9 @@ export class CumulativeBar extends Component {
         }
         if (selectReward) {
             const fx = selectReward.pool.get(ParticleSystem, GameManager.instance.topContainer);
-            fx.node.setWorldPosition(this.node.worldPosition);
+            const pos = this.node.getWorldPosition();
+            pos.z = 10;
+            fx.node.setWorldPosition(pos);
             SoundManager.instance.playSfx(selectReward.sound);
             await Utilities.waitUntil(() => fx.isStopped, 0.1);
             selectReward.pool.release(fx);

assets/_Game/Scripts/Environments/ScoreObject.ts

@@ -1,6 +1,7 @@
 import {
     _decorator,
     Animation,
+    AudioClip,
     CCInteger,
     Collider2D,
     Color,
@@ -8,15 +9,14 @@ import {
     Contact2DType,
     Sprite,
     Vec3,
-    AudioClip,
 } from 'cc';
+import GameEvent from '../Events/GameEvent';
+import { EventManger } from '../Manager/EventManger';
 import { GameManager } from '../Manager/GameManager';
+import { SoundManager } from '../Manager/SoundManager';
 import IPoolable from '../Pool/IPoolable';
 import ObjectPool from '../Pool/ObjectPool';
 import Utilities from '../Utilities';
-import { EventManger } from '../Manager/EventManger';
-import GameEvent from '../Events/GameEvent';
-import { SoundManager } from '../Manager/SoundManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('ScoreObject')
@@ -40,10 +40,12 @@ export class ScoreObject extends Component implements IPoolable {
     private _originColor: Color;
     private _isHit = false;
 
+    private _enabled: boolean = true;
+
     protected onLoad(): void {
         this._collider.on(Contact2DType.BEGIN_CONTACT, this.onContactBegin, this);
         this._originColor = this._sprite.color.clone();
-        this._collider.enabled = false;
+        this._enabled = false;
     }
 
     protected update(dt: number): void {
@@ -66,9 +68,10 @@ export class ScoreObject extends Component implements IPoolable {
     }
 
     private async onContactBegin(selfCollider: Collider2D, otherCollider: Collider2D) {
+        if (!this._enabled) return;
         if (this._isHit) return;
         if (this._hitSound) SoundManager.instance.playSfx(this._hitSound);
-        this._collider.enabled = false;
+        this._enabled = false;
         // let center = this.node.getWorldPosition();
         // let other = otherCollider.node.getWorldPosition();
         // this._flyDirection = center.subtract(other);
@@ -88,12 +91,12 @@ export class ScoreObject extends Component implements IPoolable {
     public async onGet() {
         this._animation.play(this._animation.clips[0].name);
         await Utilities.delay(this._animation.clips[0].duration);
-        this._collider.enabled = true;
+        this._enabled = true;
     }
 
     public onRelease() {
         this._isHit = false;
-        this._collider.enabled = false;
+        this._enabled = false;
         this.node.angle = 0;
         this.node.setScale(Vec3.ONE);
         this._sprite.color = this._originColor;

assets/_Game/Scripts/Events.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "2337eea2-81d3-4031-842a-83912dd198d5",

assets/_Game/Scripts/Extension.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "28df4abf-05c0-49c1-8d10-2657ddc1df26",

assets/_Game/Scripts/Extension/Extension.ts

@@ -23,6 +23,9 @@ declare module 'cc' {
         setPositionX(x: number): void;
         setPositionY(y: number): void;
         setPositionZ(z: number): void;
+        setWorldPositionX(x: number): void;
+        setWorldPositionY(y: number): void;
+        setWorldPositionZ(z: number): void;
         translateX(x: number, ns?: NodeSpace): void;
         translateY(y: number, ns?: NodeSpace): void;
         translateZ(z: number, ns?: NodeSpace): void;
@@ -87,6 +90,18 @@ Node.prototype.setPositionZ = function (z: number): void {
     this.position = new Vec3(this.position.x, this.position.y, z);
 };
 
+Node.prototype.setWorldPositionX = function (x: number): void {
+    this.worldPosition = new Vec3(x, this.worldPosition.y, this.worldPosition.z);
+};
+
+Node.prototype.setWorldPositionY = function (y: number): void {
+    this.worldPosition = new Vec3(this.worldPosition.x, y, this.worldPosition.z);
+};
+
+Node.prototype.setWorldPositionZ = function (z: number): void {
+    this.worldPosition = new Vec3(this.worldPosition.x, this.worldPosition.y, z);
+};
+
 Node.prototype.translateX = function (x: number, ns?: NodeSpace): void {
     this.translate(new Vec3(x, 0), ns);
 };

assets/_Game/Scripts/GamePlay/Cannon.ts

@@ -1,5 +1,7 @@
 import {
     _decorator,
+    Animation,
+    AudioClip,
     CCInteger,
     Collider2D,
     Component,
@@ -7,17 +9,15 @@ import {
     EventHandler,
     tween,
     Vec2,
-    Animation,
     Vec3,
-    AudioClip,
 } from 'cc';
+import TimeConfig from '../Enum/TimeConfig';
+import { CameraController } from '../Environments/CameraController';
+import GameEvent from '../Events/GameEvent';
+import { EventManger } from '../Manager/EventManger';
+import { SoundManager } from '../Manager/SoundManager';
 import Utilities from '../Utilities';
 import { Ball } from './Ball';
-import TimeConfig from '../Enum/TimeConfig';
-import { EventManger } from '../Manager/EventManger';
-import GameEvent from '../Events/GameEvent';
-import { CameraController } from '../Environments/CameraController';
-import { SoundManager } from '../Manager/SoundManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('Cannon')
@@ -35,21 +35,24 @@ export class Cannon extends Component {
     @property({ type: EventHandler, visible: true })
     private onDone: EventHandler[] = [];
 
+    private _enabled: boolean = true;
+
     protected onLoad(): void {
         this._collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this);
         EventManger.instance.on(GameEvent.BallOut, this.onBallOut, this);
     }
 
     private async onBeginContact(self: Collider2D, other: Collider2D) {
+        if (!this._enabled) return;
         const ball = other.getComponent(Ball);
-        this._collider.enabled = false;
+        this._enabled = false;
         if (ball) {
-            ball.setActiveRigi(false);
+            ball.clearRigiState(false);
             tween(ball.node).to(0.1, { worldPosition: this.node.worldPosition }).start();
             await Utilities.delay(TimeConfig.DelayCannonFire);
             CameraController.instance.shake(0.2);
             this._animation.play();
-            ball.setActiveRigi(true);
+            ball.clearRigiState(true);
             ball.throwBall(new Vec2(0, this._force));
             SoundManager.instance.playSfx(this._soundFx);
             await Utilities.delay(TimeConfig.DelayCannonDone);
@@ -60,7 +63,7 @@ export class Cannon extends Component {
 
     private onBallOut() {
         tween(this._collider.node)
-            .to(0.5, { scale: Vec3.ONE }, { easing: 'backOut', onComplete: () => (this._collider.enabled = true) })
+            .to(0.5, { scale: Vec3.ONE }, { easing: 'backOut', onComplete: () => (this._enabled = true) })
             .start();
     }
 }

assets/_Game/Scripts/GamePlay/Goal.ts

@@ -1,5 +1,6 @@
 import {
     _decorator,
+    Animation,
     AudioClip,
     CCInteger,
     Collider2D,
@@ -7,17 +8,16 @@ import {
     Contact2DType,
     ParticleSystem,
     Prefab,
-    Animation,
 } from 'cc';
-import { GameManager } from '../Manager/GameManager';
-import Utilities from '../Utilities';
-import ObjectPool from '../Pool/ObjectPool';
-import { Ball } from './Ball';
-import { SoundManager } from '../Manager/SoundManager';
-import { CameraController } from '../Environments/CameraController';
 import TimeConfig from '../Enum/TimeConfig';
-import { EventManger } from '../Manager/EventManger';
+import { CameraController } from '../Environments/CameraController';
 import GameEvent from '../Events/GameEvent';
+import { EventManger } from '../Manager/EventManger';
+import { GameManager } from '../Manager/GameManager';
+import { SoundManager } from '../Manager/SoundManager';
+import ObjectPool from '../Pool/ObjectPool';
+import Utilities from '../Utilities';
+import { Ball } from './Ball';
 const { ccclass, property } = _decorator;
 
 @ccclass('Goal')
@@ -42,8 +42,8 @@ export class Goal extends Component {
         const ball = otherCollider.getComponent(Ball);
         if (ball) {
             GameManager.instance.goal(this._score, ball.node.getWorldPosition());
-            ball.setActiveRigi(false);
+            ball.clearRigiState(false);
-            const fx = this._goalFxPool.get(ParticleSystem, this.node);
+            const fx = this._goalFxPool.get(ParticleSystem, GameManager.instance.topContainer);
             const pos = ball.node.getWorldPosition();
             pos.z = 10;
             fx.node.setWorldPosition(pos);

assets/_Game/Scripts/GamePlay/MutilBall.ts

@@ -1,11 +1,11 @@
-import { _decorator, Collider2D, Component, Contact2DType, Vec2, Node, ParticleSystem, Prefab, AudioClip } from 'cc';
+import { _decorator, AudioClip, Collider2D, Component, Contact2DType, Node, ParticleSystem, Prefab, Vec2 } from 'cc';
+import TimeConfig from '../Enum/TimeConfig';
+import { CameraController } from '../Environments/CameraController';
 import { GameManager } from '../Manager/GameManager';
+import { SoundManager } from '../Manager/SoundManager';
+import ObjectPool from '../Pool/ObjectPool';
 import Utilities from '../Utilities';
 import { Ball } from './Ball';
-import TimeConfig from '../Enum/TimeConfig';
-import ObjectPool from '../Pool/ObjectPool';
-import { CameraController } from '../Environments/CameraController';
-import { SoundManager } from '../Manager/SoundManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('MultiBall')
@@ -26,6 +26,8 @@ export class MultiBall extends Component {
     private _trigged = false;
     private _fxPool: ObjectPool;
 
+    private _enabled: boolean = true;
+
     protected onLoad(): void {
         this._fxPool = new ObjectPool(this._fx, 2, true);
         this._collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this);
@@ -34,13 +36,17 @@ export class MultiBall extends Component {
     protected lateUpdate(dt: number): void {
         if (this._trigged) {
             CameraController.instance.shake(0.2);
-            this._originBall.setActiveRigi(true);
             const ball1 = this._originBall;
+            ball1.clearRigiState(false);
             const ball2 = GameManager.instance.spawnBall(false, false);
+            ball2.clearRigiState(false);
+
             ball1.node.setWorldPosition(this._portRight.worldPosition);
+            ball1.clearRigiState(true);
             ball1.addForce(new Vec2(20, 0));
 
             ball2.node.setWorldPosition(this._portLeft.worldPosition);
+            ball2.clearRigiState(true);
             ball2.addForce(new Vec2(-20, 0));
 
             this._trigged = false;
@@ -48,16 +54,18 @@ export class MultiBall extends Component {
     }
 
     private async onBeginContact(selfCollider: Collider2D, otherCollider: Collider2D) {
+        if (!this._enabled) return;
         if (this._trigged) return;
-        this._collider.enabled = false;
+        this._enabled = false;
         this._originBall = otherCollider.getComponent(Ball);
-        this._originBall.setActiveRigi(false);
         this._trigged = true;
-        const fx = this._fxPool.get(ParticleSystem, this.node);
+        const fx = this._fxPool.get(ParticleSystem, GameManager.instance.topContainer);
-        fx.node.setWorldPosition(this.node.worldPosition);
+        const pos = this.node.getWorldPosition();
+        pos.z = 10;
+        fx.node.setWorldPosition(pos);
         SoundManager.instance.playSfx(this._soundFX);
         await Utilities.delay(TimeConfig.DelayMultiBall);
-        this._collider.enabled = true;
+        this._enabled = true;
         await Utilities.waitUntil(() => fx.isStopped);
         this._fxPool.release(fx);
     }

assets/_Game/Scripts/Gameplay.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "6f3c79a3-69f3-449e-8b6e-1c4028c2f7f3",

assets/_Game/Scripts/Gameplay/Ball.ts

@@ -1,35 +1,34 @@
 import {
     _decorator,
+    Animation,
     AudioClip,
     CCFloat,
+    CircleCollider2D,
     Collider2D,
     Component,
     Contact2DType,
     Director,
     director,
-    EventTarget,
+    ERigidBody2DType,
-    IPhysics2DContact,
-    RigidBody2D,
-    Vec2,
     geometry,
+    IPhysics2DContact,
     math,
-    Vec3,
+    Node,
     ParticleSystem,
     Prefab,
-    CircleCollider2D,
+    RigidBody2D,
-    Animation,
     Sprite,
-    Node,
+    Vec2,
-    SpriteFrame,
+    Vec3,
 } from 'cc';
-import IPoolable from '../Pool/IPoolable';
-import { SoundManager } from '../Manager/SoundManager';
 import PhysicsGroup from '../Enum/PhysicGroup';
+import { SequenceSound } from '../Environments/SequenceSound';
+import GameEvent from '../Events/GameEvent';
+import { EventManger } from '../Manager/EventManger';
+import { SoundManager } from '../Manager/SoundManager';
+import IPoolable from '../Pool/IPoolable';
 import ObjectPool from '../Pool/ObjectPool';
 import Utilities from '../Utilities';
-import { EventManger } from '../Manager/EventManger';
-import GameEvent from '../Events/GameEvent';
-import { SequenceSound } from '../Environments/SequenceSound';
 const { ccclass, property } = _decorator;
 
 @ccclass('Ball')
@@ -226,18 +225,16 @@ export class Ball extends Component implements IPoolable {
         this._buffParticle.play();
     }
 
-    public setActiveRigi(value: boolean) {
+    public clearRigiState(active: boolean) {
-        this._rigidBody.enabled = value;
+        this._rigidBody.type = active ? ERigidBody2DType.Dynamic : ERigidBody2DType.Kinematic;
-        if (!value) {
+        this._rigidBody.linearVelocity = Vec2.ZERO.clone();
-            this._rigidBody.linearVelocity = Vec2.ZERO.clone();
+        this._rigidBody.angularVelocity = 0;
-            this._rigidBody.angularVelocity = 0;
-        }
     }
 
     onGet() {
+        this.clearRigiState(true);
         this._isJumping = false;
         this._isHit = false;
-        this._rigidBody.enabled = true;
         this._parent = this.node.getParent();
         this._fireParticle.rateOverDistance.constant = 0;
         this._fireParticle.rateOverTime.constant = 0;

assets/_Game/Scripts/Manager.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "df276c5e-5e31-4499-8818-1d119c265881",

assets/_Game/Scripts/Plugins.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "6ae044bb-dbd0-486b-83a1-ca4fbefbd254",

assets/_Game/Scripts/Pool.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "817bbd10-9209-47cb-8df3-f5e9b0e396b1",

assets/_Game/Scripts/Singleton.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "12993aad-2e72-407d-8568-829c74efdbbc",

assets/_Game/Scripts/UI.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "df03dc40-3e2b-4190-8ffb-253238758590",

assets/_Game/Scripts/Utilities.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "98007d4c-5f1f-4bf2-a5fa-ad07f4be4471",

assets/_Game/Sounds.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "2f95ff08-f9dc-4a09-8173-d3844886c858",

assets/_Game/Sounds/cheese_collect.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "8f7e58bf-c725-4c3d-a1e0-1b7f5e68dde0",

assets/_Game/Sounds/collect.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "8c7c9a3d-d40c-40e4-b2de-117f563e7123",

assets/_Game/Sounds/text.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "2d050786-71af-422b-836e-4da8a4b47be9",

assets/_Game/Sprites.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "78b85539-ce17-48d8-b265-ae4db4c51cc0",

assets/_Game/Sprites/Background.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "df281d35-384d-4201-a7b3-0d539a3e7a0a",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "df281d35-384d-4201-a7b3-0d539a3e7a0a@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

assets/_Game/Sprites/Cannon.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "c447cc4f-e204-44d4-9248-3f2063a0f914",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "c447cc4f-e204-44d4-9248-3f2063a0f914@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

assets/_Game/Sprites/Cheese.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "461cbbbe-573a-4553-9ddc-f8723c11206a",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "461cbbbe-573a-4553-9ddc-f8723c11206a@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

assets/_Game/Sprites/Clock.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "f7bd5166-9d5f-4d43-a3d3-58ae9a4957fc",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "f7bd5166-9d5f-4d43-a3d3-58ae9a4957fc@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

assets/_Game/Sprites/Ear.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "7bf69df0-eb9e-4e6c-8180-2262e14dd089",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "7bf69df0-eb9e-4e6c-8180-2262e14dd089@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

assets/_Game/Sprites/Field.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "d9f03762-01f5-453e-a28d-afc72541f26b",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "d9f03762-01f5-453e-a28d-afc72541f26b@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

assets/_Game/Sprites/Field_logo.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "a6918c93-d0ff-4b8c-8bbe-ed0ad1bc8c09",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "a6918c93-d0ff-4b8c-8bbe-ed0ad1bc8c09@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

assets/_Game/Sprites/Field_logo2.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "dfdb8acd-61ab-4316-a8d7-695503dab666",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "dfdb8acd-61ab-4316-a8d7-695503dab666@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

assets/_Game/Sprites/Flipper_L.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "d5a56802-cf55-4ffb-820a-6100f5c1ba0a",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "d5a56802-cf55-4ffb-820a-6100f5c1ba0a@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

assets/_Game/Sprites/Flipper_R.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "c394c902-7f41-44b0-81c6-4695e9ec873e",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "c394c902-7f41-44b0-81c6-4695e9ec873e@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

assets/_Game/Sprites/Object_1.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "483ec166-493b-43a4-885a-f5051af6a6c7",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "483ec166-493b-43a4-885a-f5051af6a6c7@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

assets/_Game/Sprites/Object_2.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "b221282a-61b6-4dc7-806a-1b65d15301ad",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "b221282a-61b6-4dc7-806a-1b65d15301ad@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

assets/_Game/Sprites/Object_3.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "7f202036-9f44-45eb-a85c-76a839f7f38a",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "7f202036-9f44-45eb-a85c-76a839f7f38a@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"