zenghaowei 3 年 前
コミット
dab2646acb
33 ファイル変更1217 行追加4049 行削除
  1. 47 42
      assets/resources/prefab/element/JG0108.prefab
  2. 1 1
      assets/resources/prefab/element/JG0108.prefab.meta
  3. 99 44
      assets/resources/prefab/element/JG0102.prefab
  4. 1 1
      assets/resources/prefab/element/JG0102.prefab.meta
  5. 97 42
      assets/resources/prefab/element/JG0103.prefab
  6. 1 1
      assets/resources/prefab/element/JG0103.prefab.meta
  7. 26 26
      assets/resources/prefab/element/JG0104.prefab
  8. 1 1
      assets/resources/prefab/element/JG0104.prefab.meta
  9. 343 30
      assets/resources/prefab/element/JG0106.prefab
  10. 1 1
      assets/resources/prefab/element/JG0106.prefab.meta
  11. 0 312
      assets/resources/prefab/element/JG0107.prefab
  12. 21 45
      assets/resources/prefab/element/JG0120.prefab
  13. 1 1
      assets/resources/prefab/element/JG0105_01.prefab.meta
  14. 0 0
      assets/resources/prefab/element/JG0110.prefab
  15. 0 0
      assets/resources/prefab/element/JG0110.prefab.meta
  16. 48 166
      assets/resources/prefab/element/JG0111.prefab
  17. 1 1
      assets/resources/prefab/element/JG0111.prefab.meta
  18. 0 0
      assets/resources/prefab/element/JG0112.prefab
  19. 0 0
      assets/resources/prefab/element/JG0112.prefab.meta
  20. 28 145
      assets/resources/prefab/element/JG0113.prefab
  21. 1 1
      assets/resources/prefab/element/JG0113.prefab.meta
  22. 426 74
      assets/resources/prefab/element/JG0114.prefab
  23. 1 1
      assets/resources/prefab/element/JG0114.prefab.meta
  24. 46 101
      assets/resources/prefab/element/JG0105_01.prefab
  25. 1 1
      assets/resources/prefab/element/JG0107.prefab.meta
  26. 0 8
      assets/resources/prefab/element/JG0120.prefab.meta
  27. 0 1877
      assets/resources/prefab/element/JG0122.prefab
  28. 0 8
      assets/resources/prefab/element/JG0122.prefab.meta
  29. 0 276
      assets/resources/prefab/element/JG0124.prefab
  30. 0 8
      assets/resources/prefab/element/JG0124.prefab.meta
  31. 0 821
      assets/resources/prefab/element/JG0126.prefab
  32. 0 8
      assets/resources/prefab/element/JG0126.prefab.meta
  33. 26 6
      local/local.json

+ 47 - 42
assets/resources/prefab/element/JG0108.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "JG0108",
+    "_name": "JG0101",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -45,8 +45,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 60,
-      "height": 60
+      "width": 34.09,
+      "height": 51.49
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -64,9 +64,9 @@
         0,
         0,
         1,
-        1,
-        1,
-        2
+        2,
+        2,
+        1
       ]
     },
     "_eulerAngles": {
@@ -83,7 +83,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "sp.Skeleton",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -92,26 +92,36 @@
     "_enabled": true,
     "_materials": [
       {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
       }
     ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "40e076cd-3e84-40da-9a86-a879b02f953f"
-    },
-    "_type": 0,
-    "_sizeMode": 0,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
+    "paused": false,
+    "defaultSkin": "default",
+    "defaultAnimation": "",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "loop": false,
+    "premultipliedAlpha": true,
+    "timeScale": 1,
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_skeletonCache": null,
+    "_animationName": "boom",
+    "_animationQueue": [],
+    "_headAniInfo": null,
+    "_playTimes": 1,
+    "_isAniComplete": true,
+    "_N$skeletonData": {
+      "__uuid__": "470a5397-fc77-481b-92bb-7232d1162284"
+    },
+    "_N$_defaultCacheMode": 0,
+    "_N$debugSlots": false,
+    "_N$debugBones": false,
+    "_N$debugMesh": false,
+    "_N$useTint": false,
+    "_N$enableBatch": false,
     "_id": ""
   },
   {
@@ -123,7 +133,7 @@
     },
     "_enabled": true,
     "_type": 0,
-    "_allowSleep": false,
+    "_allowSleep": true,
     "_gravityScale": 1,
     "_linearDamping": 0,
     "_angularDamping": 0,
@@ -149,43 +159,38 @@
     "_enabled": true,
     "tag": 0,
     "_density": 1,
-    "_sensor": true,
+    "_sensor": false,
     "_friction": 0.2,
     "_restitution": 0,
     "body": null,
     "_offset": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 0
+      "y": 24.4
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 20,
-      "height": 20
+      "width": 34,
+      "height": 45
     },
     "_id": ""
   },
   {
-    "__type__": "156feYqwT9Jjpg9j66KaLhO",
+    "__type__": "3768f8jiWJDQ427kxDEoPa6",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 1
     },
     "_enabled": true,
-    "mIcon": {
+    "spine": {
       "__id__": 2
     },
-    "mIcon0": {
-      "__uuid__": "40e076cd-3e84-40da-9a86-a879b02f953f"
+    "icon": null,
+    "hide": null,
+    "mTipsIcon": {
+      "__uuid__": "f6c30f3e-8392-4d4c-8398-8d7bea233bc5"
     },
-    "mIcon1": {
-      "__uuid__": "90602e55-ff15-4e46-b918-bdd28d4734c6"
-    },
-    "mButtons": [],
-    "mFenceTrigger": [
-      null
-    ],
     "_id": ""
   },
   {
@@ -194,7 +199,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "686bd299-de37-43fe-b735-f5a6dd1f9e13"
+      "__uuid__": "4445850f-898f-47e8-a574-c2c63a1e36a7"
     },
     "fileId": "",
     "sync": false

+ 1 - 1
assets/resources/prefab/element/JG0108.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "686bd299-de37-43fe-b735-f5a6dd1f9e13",
+  "uuid": "4445850f-898f-47e8-a574-c2c63a1e36a7",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

+ 99 - 44
assets/resources/prefab/element/JG0102.prefab

@@ -13,27 +13,25 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "JG0102",
+    "_name": "JG0104",
     "_objFlags": 0,
     "_parent": null,
-    "_children": [],
-    "_active": true,
-    "_components": [
+    "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 3
-      },
+      }
+    ],
+    "_active": true,
+    "_components": [
       {
-        "__id__": 4
+        "__id__": 5
       },
       {
-        "__id__": 5
+        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 6
+      "__id__": 7
     },
     "_opacity": 255,
     "_color": {
@@ -45,8 +43,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 65,
-      "height": 82
+      "width": 50,
+      "height": 66
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -64,8 +62,72 @@
         0,
         0,
         1,
-        1.5,
-        1.5,
+        2,
+        2,
+        0.5
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 6,
+    "groupIndex": 6,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "door",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 46.89,
+      "height": 66
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -20,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
         1
       ]
     },
@@ -87,7 +149,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 1
+      "__id__": 2
     },
     "_enabled": true,
     "_materials": [
@@ -100,7 +162,7 @@
     "defaultAnimation": "",
     "_preCacheMode": 0,
     "_cacheMode": 0,
-    "loop": false,
+    "loop": true,
     "premultipliedAlpha": true,
     "timeScale": 1,
     "_accTime": 0,
@@ -108,13 +170,13 @@
     "_frameCache": null,
     "_curFrame": null,
     "_skeletonCache": null,
-    "_animationName": "boom",
+    "_animationName": "",
     "_animationQueue": [],
     "_headAniInfo": null,
-    "_playTimes": 1,
+    "_playTimes": 0,
     "_isAniComplete": true,
     "_N$skeletonData": {
-      "__uuid__": "1413a798-2fad-4db1-91b7-04be4e606017"
+      "__uuid__": "9ce5c75f-48a7-42a7-ba84-3a0ce58c39dd"
     },
     "_N$_defaultCacheMode": 0,
     "_N$debugSlots": false,
@@ -124,6 +186,17 @@
     "_N$enableBatch": false,
     "_id": ""
   },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "35b14081-9e0f-45a5-a804-a787c942ff47"
+    },
+    "fileId": "43EZGgfjVOeK+oG6xeQSG7",
+    "sync": false
+  },
   {
     "__type__": "cc.RigidBody",
     "_name": "",
@@ -145,7 +218,7 @@
     "_angularVelocity": 0,
     "_fixedRotation": false,
     "enabledContactListener": true,
-    "bullet": false,
+    "bullet": true,
     "awakeOnLoad": true,
     "_id": ""
   },
@@ -165,31 +238,13 @@
     "body": null,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -0.2,
-      "y": 40.1
+      "x": 0,
+      "y": 0
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 49.5,
-      "height": 40.8
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "3768f8jiWJDQ427kxDEoPa6",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "spine": {
-      "__id__": 2
-    },
-    "icon": null,
-    "hide": null,
-    "mTipsIcon": {
-      "__uuid__": "f6c30f3e-8392-4d4c-8398-8d7bea233bc5"
+      "width": 50,
+      "height": 66
     },
     "_id": ""
   },
@@ -199,7 +254,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "e18cbf3b-5ab8-4c87-871a-a2c51ce55790"
+      "__uuid__": "35b14081-9e0f-45a5-a804-a787c942ff47"
     },
     "fileId": "",
     "sync": false

+ 1 - 1
assets/resources/prefab/element/JG0102.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "e18cbf3b-5ab8-4c87-871a-a2c51ce55790",
+  "uuid": "35b14081-9e0f-45a5-a804-a787c942ff47",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

+ 97 - 42
assets/resources/prefab/element/JG0103.prefab

@@ -16,24 +16,22 @@
     "_name": "JG0103",
     "_objFlags": 0,
     "_parent": null,
-    "_children": [],
-    "_active": true,
-    "_components": [
+    "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 3
-      },
+      }
+    ],
+    "_active": true,
+    "_components": [
       {
-        "__id__": 4
+        "__id__": 5
       },
       {
-        "__id__": 5
+        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 6
+      "__id__": 7
     },
     "_opacity": 255,
     "_color": {
@@ -45,8 +43,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 34.09,
-      "height": 51.49
+      "width": 46.89,
+      "height": 77.11
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -78,8 +76,72 @@
     "_skewX": 0,
     "_skewY": 0,
     "_is3DNode": false,
-    "_groupIndex": 1,
-    "groupIndex": 1,
+    "_groupIndex": 6,
+    "groupIndex": 6,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "spine",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 34,
+      "height": 77.11
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -20,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 6,
+    "groupIndex": 6,
     "_id": ""
   },
   {
@@ -87,7 +149,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 1
+      "__id__": 2
     },
     "_enabled": true,
     "_materials": [
@@ -100,7 +162,7 @@
     "defaultAnimation": "",
     "_preCacheMode": 0,
     "_cacheMode": 0,
-    "loop": false,
+    "loop": true,
     "premultipliedAlpha": true,
     "timeScale": 1,
     "_accTime": 0,
@@ -108,13 +170,13 @@
     "_frameCache": null,
     "_curFrame": null,
     "_skeletonCache": null,
-    "_animationName": "boom",
+    "_animationName": "",
     "_animationQueue": [],
     "_headAniInfo": null,
-    "_playTimes": 1,
+    "_playTimes": 0,
     "_isAniComplete": true,
     "_N$skeletonData": {
-      "__uuid__": "470a5397-fc77-481b-92bb-7232d1162284"
+      "__uuid__": "96b48c0d-833a-4796-8a5f-dda98162ea67"
     },
     "_N$_defaultCacheMode": 0,
     "_N$debugSlots": false,
@@ -124,6 +186,17 @@
     "_N$enableBatch": false,
     "_id": ""
   },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "69b3a8ee-9d9c-4120-8fa0-0e9aba59b472"
+    },
+    "fileId": "99gQkkJz1DY5iYwBsHkyp9",
+    "sync": false
+  },
   {
     "__type__": "cc.RigidBody",
     "_name": "",
@@ -145,7 +218,7 @@
     "_angularVelocity": 0,
     "_fixedRotation": false,
     "enabledContactListener": true,
-    "bullet": false,
+    "bullet": true,
     "awakeOnLoad": true,
     "_id": ""
   },
@@ -166,30 +239,12 @@
     "_offset": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 24.4
+      "y": 0
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 34,
-      "height": 45
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "3768f8jiWJDQ427kxDEoPa6",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "spine": {
-      "__id__": 2
-    },
-    "icon": null,
-    "hide": null,
-    "mTipsIcon": {
-      "__uuid__": "f6c30f3e-8392-4d4c-8398-8d7bea233bc5"
+      "width": 46.89,
+      "height": 77.11
     },
     "_id": ""
   },
@@ -199,7 +254,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "d14d519b-6493-4bf0-bbdd-1438c31926e2"
+      "__uuid__": "69b3a8ee-9d9c-4120-8fa0-0e9aba59b472"
     },
     "fileId": "",
     "sync": false

+ 1 - 1
assets/resources/prefab/element/JG0103.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "d14d519b-6493-4bf0-bbdd-1438c31926e2",
+  "uuid": "69b3a8ee-9d9c-4120-8fa0-0e9aba59b472",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

+ 26 - 26
assets/resources/prefab/element/JG0104.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "JG0104",
+    "_name": "JG0106",
     "_objFlags": 0,
     "_parent": null,
     "_children": [
@@ -43,8 +43,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 50,
-      "height": 66
+      "width": 100,
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -62,9 +62,9 @@
         0,
         0,
         1,
-        2,
-        2,
-        0.5
+        1.3,
+        1.3,
+        1
       ]
     },
     "_eulerAngles": {
@@ -76,13 +76,13 @@
     "_skewX": 0,
     "_skewY": 0,
     "_is3DNode": false,
-    "_groupIndex": 6,
-    "groupIndex": 6,
+    "_groupIndex": 1,
+    "groupIndex": 1,
     "_id": ""
   },
   {
     "__type__": "cc.Node",
-    "_name": "door",
+    "_name": "tengman",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -107,8 +107,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
-      "height": 66
+      "width": 73,
+      "height": 69
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -126,8 +126,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.5,
+        1.5,
         1
       ]
     },
@@ -140,8 +140,8 @@
     "_skewX": 0,
     "_skewY": 0,
     "_is3DNode": false,
-    "_groupIndex": 1,
-    "groupIndex": 1,
+    "_groupIndex": 0,
+    "groupIndex": 0,
     "_id": ""
   },
   {
@@ -162,7 +162,7 @@
     "defaultAnimation": "",
     "_preCacheMode": 0,
     "_cacheMode": 0,
-    "loop": true,
+    "loop": false,
     "premultipliedAlpha": true,
     "timeScale": 1,
     "_accTime": 0,
@@ -170,13 +170,13 @@
     "_frameCache": null,
     "_curFrame": null,
     "_skeletonCache": null,
-    "_animationName": "",
+    "_animationName": "close",
     "_animationQueue": [],
     "_headAniInfo": null,
-    "_playTimes": 0,
+    "_playTimes": 1,
     "_isAniComplete": true,
     "_N$skeletonData": {
-      "__uuid__": "9ce5c75f-48a7-42a7-ba84-3a0ce58c39dd"
+      "__uuid__": "a0cc8b5d-7840-4b3e-899c-f8194b4b8466"
     },
     "_N$_defaultCacheMode": 0,
     "_N$debugSlots": false,
@@ -192,9 +192,9 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "35b14081-9e0f-45a5-a804-a787c942ff47"
+      "__uuid__": "af111354-8962-48b7-93db-eee87d40b1fe"
     },
-    "fileId": "43EZGgfjVOeK+oG6xeQSG7",
+    "fileId": "b6AffY4gZPjK2oGGvBR8rw",
     "sync": false
   },
   {
@@ -217,8 +217,8 @@
     },
     "_angularVelocity": 0,
     "_fixedRotation": false,
-    "enabledContactListener": true,
-    "bullet": true,
+    "enabledContactListener": false,
+    "bullet": false,
     "awakeOnLoad": true,
     "_id": ""
   },
@@ -243,8 +243,8 @@
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 50,
-      "height": 66
+      "width": 100,
+      "height": 100
     },
     "_id": ""
   },
@@ -254,7 +254,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "35b14081-9e0f-45a5-a804-a787c942ff47"
+      "__uuid__": "af111354-8962-48b7-93db-eee87d40b1fe"
     },
     "fileId": "",
     "sync": false

+ 1 - 1
assets/resources/prefab/element/JG0104.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "35b14081-9e0f-45a5-a804-a787c942ff47",
+  "uuid": "af111354-8962-48b7-93db-eee87d40b1fe",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

+ 343 - 30
assets/resources/prefab/element/JG0106.prefab

@@ -19,19 +19,28 @@
     "_children": [
       {
         "__id__": 2
+      },
+      {
+        "__id__": 5
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 5
+        "__id__": 13
       },
       {
-        "__id__": 6
+        "__id__": 14
+      },
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 17
     },
     "_opacity": 255,
     "_color": {
@@ -43,8 +52,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 128,
+      "height": 128
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -62,8 +71,8 @@
         0,
         0,
         1,
-        1.3,
-        1.3,
+        1,
+        1,
         1
       ]
     },
@@ -76,13 +85,13 @@
     "_skewX": 0,
     "_skewY": 0,
     "_is3DNode": false,
-    "_groupIndex": 1,
-    "groupIndex": 1,
+    "_groupIndex": 6,
+    "groupIndex": 6,
     "_id": ""
   },
   {
     "__type__": "cc.Node",
-    "_name": "tengman",
+    "_name": "ani_guoshu",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -107,8 +116,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 73,
-      "height": 69
+      "width": 128,
+      "height": 113
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -120,15 +129,15 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -20,
+        -36.331,
         0,
         0,
         0,
         0,
         1,
-        1.5,
-        1.5,
-        1
+        1.2,
+        1.2,
+        0.75
       ]
     },
     "_eulerAngles": {
@@ -159,10 +168,10 @@
     ],
     "paused": false,
     "defaultSkin": "default",
-    "defaultAnimation": "",
+    "defaultAnimation": "idle",
     "_preCacheMode": 0,
     "_cacheMode": 0,
-    "loop": false,
+    "loop": true,
     "premultipliedAlpha": true,
     "timeScale": 1,
     "_accTime": 0,
@@ -170,13 +179,13 @@
     "_frameCache": null,
     "_curFrame": null,
     "_skeletonCache": null,
-    "_animationName": "close",
+    "_animationName": "idle",
     "_animationQueue": [],
     "_headAniInfo": null,
-    "_playTimes": 1,
+    "_playTimes": 0,
     "_isAniComplete": true,
     "_N$skeletonData": {
-      "__uuid__": "a0cc8b5d-7840-4b3e-899c-f8194b4b8466"
+      "__uuid__": "72347052-32d8-46b9-865e-99e188ab1afb"
     },
     "_N$_defaultCacheMode": 0,
     "_N$debugSlots": false,
@@ -192,9 +201,264 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "af111354-8962-48b7-93db-eee87d40b1fe"
+      "__uuid__": "147ce141-b17c-4434-87f7-2b12cb885bb7"
+    },
+    "fileId": "ceTQ7WfRtMr7Ygvp1YnTvO",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hp_monter",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 15
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -33.975,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 6,
+    "groupIndex": 6,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "bar",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 5
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 76.80000000000001,
+      "height": 10
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -47.992,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 6,
+    "groupIndex": 6,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a98f1690-d082-402d-ab76-ea3dce373f37"
+    },
+    "_type": 1,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 5
+    },
+    "asset": {
+      "__uuid__": "68a3997f-98c2-4008-8a2a-569dad5ab209"
+    },
+    "fileId": "18vm6q0v5N5ZOZNG2OLglY",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 5
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "57974ae0-351d-4c1e-bd6e-2bf47b0cae34"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ProgressBar",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 5
+    },
+    "_enabled": true,
+    "_N$totalLength": 96,
+    "_N$barSprite": {
+      "__id__": 7
+    },
+    "_N$mode": 0,
+    "_N$progress": 0.8,
+    "_N$reverse": false,
+    "_id": ""
+  },
+  {
+    "__type__": "0d350gXK3RDrKnYjpJgJHI+",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 5
+    },
+    "_enabled": true,
+    "mHPBar": {
+      "__id__": 10
+    },
+    "mLabel": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 5
+    },
+    "asset": {
+      "__uuid__": "68a3997f-98c2-4008-8a2a-569dad5ab209"
     },
-    "fileId": "b6AffY4gZPjK2oGGvBR8rw",
+    "fileId": "b94SLtYqtDk4u+bmO7QgpQ",
     "sync": false
   },
   {
@@ -217,7 +481,7 @@
     },
     "_angularVelocity": 0,
     "_fixedRotation": false,
-    "enabledContactListener": false,
+    "enabledContactListener": true,
     "bullet": false,
     "awakeOnLoad": true,
     "_id": ""
@@ -230,6 +494,32 @@
       "__id__": 1
     },
     "_enabled": true,
+    "tag": 1,
+    "_density": 1,
+    "_sensor": true,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "body": null,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 4,
+      "y": 40
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 161,
+      "height": 159
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PhysicsCircleCollider",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
     "tag": 0,
     "_density": 1,
     "_sensor": false,
@@ -239,13 +529,36 @@
     "_offset": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 0
+      "y": 20
     },
-    "_size": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+    "_radius": 40,
+    "_id": ""
+  },
+  {
+    "__type__": "2b575VOH5BBCbFqsbVQ/0RW",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "effect": {
+      "__uuid__": "1edbf86f-3486-408d-97ec-bc31fb6395d1"
+    },
+    "effectNumber": {
+      "__uuid__": "2a5e26e9-28f2-4a50-9c3a-33cd2b303ee1"
+    },
+    "spine": {
+      "__id__": 3
+    },
+    "icon": null,
+    "mTipsIcon": {
+      "__uuid__": "b1957a0d-b3d0-4e6b-ac36-00efde2b10a1"
+    },
+    "mProgressBar": {
+      "__id__": 10
     },
+    "guides": [],
     "_id": ""
   },
   {
@@ -254,7 +567,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "af111354-8962-48b7-93db-eee87d40b1fe"
+      "__uuid__": "147ce141-b17c-4434-87f7-2b12cb885bb7"
     },
     "fileId": "",
     "sync": false

+ 1 - 1
assets/resources/prefab/element/JG0106.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "af111354-8962-48b7-93db-eee87d40b1fe",
+  "uuid": "147ce141-b17c-4434-87f7-2b12cb885bb7",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

+ 0 - 312
assets/resources/prefab/element/JG0107.prefab

@@ -1,312 +0,0 @@
-[
-  {
-    "__type__": "cc.Prefab",
-    "_name": "",
-    "_objFlags": 0,
-    "_native": "",
-    "data": {
-      "__id__": 1
-    },
-    "optimizationPolicy": 0,
-    "asyncLoadAssets": false,
-    "readonly": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "BothwayOpen",
-    "_objFlags": 0,
-    "_parent": null,
-    "_children": [
-      {
-        "__id__": 2
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 6
-      },
-      {
-        "__id__": 7
-      },
-      {
-        "__id__": 8
-      }
-    ],
-    "_prefab": {
-      "__id__": 9
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 45,
-      "height": 44
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 1
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        3194,
-        4292,
-        0,
-        0,
-        0,
-        0,
-        1,
-        2,
-        2,
-        2
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 1,
-    "groupIndex": 1,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "spine",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 3
-      }
-    ],
-    "_prefab": {
-      "__id__": 4
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 42,
-      "height": 57.61
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        -35,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
-      }
-    ],
-    "paused": false,
-    "defaultSkin": "default",
-    "defaultAnimation": "idle",
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "loop": false,
-    "premultipliedAlpha": true,
-    "timeScale": 1,
-    "_accTime": 0,
-    "_playCount": 0,
-    "_frameCache": null,
-    "_curFrame": null,
-    "_skeletonCache": null,
-    "_animationName": "idle",
-    "_animationQueue": [],
-    "_headAniInfo": null,
-    "_playTimes": 1,
-    "_isAniComplete": true,
-    "_N$skeletonData": {
-      "__uuid__": "8711ddc0-8b56-4926-9d42-f4e69b07636f"
-    },
-    "_N$_defaultCacheMode": 0,
-    "_N$debugSlots": false,
-    "_N$debugBones": false,
-    "_N$debugMesh": false,
-    "_N$useTint": false,
-    "_N$enableBatch": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "99mM/IwH5EzJtiTGkSmQYJ",
-    "sync": false
-  },
-  {
-    "__type__": "cc.RigidBody",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "_type": 0,
-    "_allowSleep": false,
-    "_gravityScale": 1,
-    "_linearDamping": 0,
-    "_angularDamping": 0,
-    "_linearVelocity": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_angularVelocity": 0,
-    "_fixedRotation": false,
-    "enabledContactListener": true,
-    "bullet": false,
-    "awakeOnLoad": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PhysicsBoxCollider",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "tag": 0,
-    "_density": 1,
-    "_sensor": true,
-    "_friction": 0.2,
-    "_restitution": 0,
-    "body": null,
-    "_offset": {
-      "__type__": "cc.Vec2",
-      "x": -18.5,
-      "y": -20
-    },
-    "_size": {
-      "__type__": "cc.Size",
-      "width": 37,
-      "height": 83
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PhysicsBoxCollider",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "tag": 1,
-    "_density": 1,
-    "_sensor": true,
-    "_friction": 0.2,
-    "_restitution": 0,
-    "body": null,
-    "_offset": {
-      "__type__": "cc.Vec2",
-      "x": 18.5,
-      "y": -20
-    },
-    "_size": {
-      "__type__": "cc.Size",
-      "width": 37,
-      "height": 83
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cf43acOMyBNL54ykGGE5PJY",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "leftFenceTrigger": null,
-    "rightFenceTrigger": null,
-    "mTipsIcon": {
-      "__uuid__": "b1957a0d-b3d0-4e6b-ac36-00efde2b10a1"
-    },
-    "spine": {
-      "__id__": 3
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "",
-    "sync": false
-  }
-]

+ 21 - 45
assets/resources/prefab/element/JG0120.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "JG0120",
+    "_name": "store_1",
     "_objFlags": 0,
     "_parent": null,
     "_children": [],
@@ -27,13 +27,10 @@
       },
       {
         "__id__": 4
-      },
-      {
-        "__id__": 5
       }
     ],
     "_prefab": {
-      "__id__": 6
+      "__id__": 5
     },
     "_opacity": 255,
     "_color": {
@@ -45,13 +42,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 60,
-      "height": 60
+      "width": 32,
+      "height": 48
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 0.4
     },
     "_trs": {
       "__type__": "TypedArray",
@@ -64,8 +61,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        2.1,
+        2.1,
         2
       ]
     },
@@ -98,7 +95,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "40e076cd-3e84-40da-9a86-a879b02f953f"
+      "__uuid__": "8fc4b5e7-cb9a-416c-974e-c93160488947"
     },
     "_type": 0,
     "_sizeMode": 0,
@@ -122,10 +119,10 @@
       "__id__": 1
     },
     "_enabled": true,
-    "_type": 0,
-    "_allowSleep": false,
-    "_gravityScale": 1,
-    "_linearDamping": 0,
+    "_type": 2,
+    "_allowSleep": true,
+    "_gravityScale": 0,
+    "_linearDamping": 20,
     "_angularDamping": 0,
     "_linearVelocity": {
       "__type__": "cc.Vec2",
@@ -133,9 +130,9 @@
       "y": 0
     },
     "_angularVelocity": 0,
-    "_fixedRotation": false,
+    "_fixedRotation": true,
     "enabledContactListener": true,
-    "bullet": false,
+    "bullet": true,
     "awakeOnLoad": true,
     "_id": ""
   },
@@ -148,42 +145,21 @@
     },
     "_enabled": true,
     "tag": 0,
-    "_density": 1,
-    "_sensor": true,
-    "_friction": 0.2,
+    "_density": 8,
+    "_sensor": false,
+    "_friction": 0,
     "_restitution": 0,
     "body": null,
     "_offset": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 0
+      "y": 1
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 30,
-      "height": 30
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "4caffbFRp9GvZzhi73ukff7",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "mIcon": {
-      "__id__": 2
-    },
-    "mIcon0": {
-      "__uuid__": "40e076cd-3e84-40da-9a86-a879b02f953f"
-    },
-    "mIcon1": {
-      "__uuid__": "90602e55-ff15-4e46-b918-bdd28d4734c6"
+      "width": 31,
+      "height": 38
     },
-    "mButtons": [],
-    "mFenceTrigger": [],
     "_id": ""
   },
   {
@@ -192,7 +168,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "b026e3d7-1015-4a57-853d-b88c21e9c499"
+      "__uuid__": "13452eaf-a0d0-4b0a-82d2-f5fc7cf793bb"
     },
     "fileId": "",
     "sync": false

+ 1 - 1
assets/resources/prefab/element/JG0105_01.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "69b3a8ee-9d9c-4120-8fa0-0e9aba59b472",
+  "uuid": "13452eaf-a0d0-4b0a-82d2-f5fc7cf793bb",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/element/JG0119.prefab → assets/resources/prefab/element/JG0110.prefab


assets/resources/prefab/element/JG0119.prefab.meta → assets/resources/prefab/element/JG0110.prefab.meta


+ 48 - 166
assets/resources/prefab/element/JG0111.prefab

@@ -13,95 +13,27 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "bomb",
+    "_name": "JG0108",
     "_objFlags": 0,
     "_parent": null,
-    "_children": [
-      {
-        "__id__": 2
-      }
-    ],
+    "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 5
+        "__id__": 2
       },
       {
-        "__id__": 6
+        "__id__": 3
       },
       {
-        "__id__": 7
+        "__id__": 4
       },
       {
-        "__id__": 8
-      }
-    ],
-    "_prefab": {
-      "__id__": 9
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 94,
-      "height": 88
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        2664.409,
-        5866.434,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 6,
-    "groupIndex": 6,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "ani_dilei",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 3
+        "__id__": 5
       }
     ],
     "_prefab": {
-      "__id__": 4
+      "__id__": 6
     },
     "_opacity": 255,
     "_color": {
@@ -113,8 +45,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 94,
-      "height": 88
+      "width": 60,
+      "height": 60
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -134,7 +66,7 @@
         1,
         1,
         1,
-        1
+        2
       ]
     },
     "_eulerAngles": {
@@ -146,62 +78,41 @@
     "_skewX": 0,
     "_skewY": 0,
     "_is3DNode": false,
-    "_groupIndex": 6,
-    "groupIndex": 6,
+    "_groupIndex": 1,
+    "groupIndex": 1,
     "_id": ""
   },
   {
-    "__type__": "sp.Skeleton",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 1
     },
     "_enabled": true,
     "_materials": [
       {
-        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
       }
     ],
-    "paused": false,
-    "defaultSkin": "default",
-    "defaultAnimation": "idle",
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "loop": true,
-    "premultipliedAlpha": true,
-    "timeScale": 1,
-    "_accTime": 0,
-    "_playCount": 0,
-    "_frameCache": null,
-    "_curFrame": null,
-    "_skeletonCache": null,
-    "_animationName": "idle",
-    "_animationQueue": [],
-    "_headAniInfo": null,
-    "_playTimes": 0,
-    "_isAniComplete": true,
-    "_N$skeletonData": {
-      "__uuid__": "adbb14c0-380f-42f0-b2eb-3f8b265a0d61"
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "40e076cd-3e84-40da-9a86-a879b02f953f"
     },
-    "_N$_defaultCacheMode": 0,
-    "_N$debugSlots": false,
-    "_N$debugBones": false,
-    "_N$debugMesh": false,
-    "_N$useTint": false,
-    "_N$enableBatch": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
     },
-    "fileId": "98t6wju0pBLqa0vHaOTgia",
-    "sync": false
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
   },
   {
     "__type__": "cc.RigidBody",
@@ -212,7 +123,7 @@
     },
     "_enabled": true,
     "_type": 0,
-    "_allowSleep": true,
+    "_allowSleep": false,
     "_gravityScale": 1,
     "_linearDamping": 0,
     "_angularDamping": 0,
@@ -244,66 +155,37 @@
     "body": null,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": -1.6,
-      "y": 10.3
-    },
-    "_size": {
-      "__type__": "cc.Size",
-      "width": 210,
-      "height": 190
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PhysicsBoxCollider",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "tag": 1,
-    "_density": 1,
-    "_sensor": true,
-    "_friction": 0.2,
-    "_restitution": 0,
-    "body": null,
-    "_offset": {
-      "__type__": "cc.Vec2",
-      "x": 0.4,
-      "y": 15.5
+      "x": 0,
+      "y": 0
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 170,
-      "height": 150
+      "width": 20,
+      "height": 20
     },
     "_id": ""
   },
   {
-    "__type__": "6161b3CRMVIoofH3gZlG35U",
+    "__type__": "156feYqwT9Jjpg9j66KaLhO",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 1
     },
     "_enabled": true,
-    "monsterId": 2005,
-    "spine": {
-      "__id__": 3
+    "mIcon": {
+      "__id__": 2
     },
-    "warningArea": {
-      "__type__": "cc.Vec2",
-      "x": 210,
-      "y": 190
+    "mIcon0": {
+      "__uuid__": "40e076cd-3e84-40da-9a86-a879b02f953f"
     },
-    "boomArea": {
-      "__type__": "cc.Vec2",
-      "x": 170,
-      "y": 150
+    "mIcon1": {
+      "__uuid__": "90602e55-ff15-4e46-b918-bdd28d4734c6"
     },
-    "warningTime": 1,
-    "boomTime": 0.7,
+    "mButtons": [],
+    "mFenceTrigger": [
+      null
+    ],
     "_id": ""
   },
   {
@@ -312,7 +194,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "686bd299-de37-43fe-b735-f5a6dd1f9e13"
     },
     "fileId": "",
     "sync": false

+ 1 - 1
assets/resources/prefab/element/JG0111.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "e3612138-ec3b-404f-8232-0cabe743bcc7",
+  "uuid": "686bd299-de37-43fe-b735-f5a6dd1f9e13",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/prefab/element/JG0123.prefab → assets/resources/prefab/element/JG0112.prefab


assets/resources/prefab/element/JG0123.prefab.meta → assets/resources/prefab/element/JG0112.prefab.meta


+ 28 - 145
assets/resources/prefab/element/JG0113.prefab

@@ -13,31 +13,28 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New Node",
+    "_name": "JG0124",
     "_objFlags": 0,
     "_parent": null,
     "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 5
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 8
+        "__id__": 5
       },
       {
-        "__id__": 9
+        "__id__": 6
       },
       {
-        "__id__": 10
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
@@ -61,8 +58,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        2233.908,
-        3631.312,
+        0,
+        0,
         0,
         0,
         0,
@@ -88,7 +85,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "ani_shikuai",
+    "_name": "skeleton",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -113,8 +110,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 154,
-      "height": 1066.74
+      "width": 0,
+      "height": 0
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -146,8 +143,8 @@
     "_skewX": 0,
     "_skewY": 0,
     "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
+    "_groupIndex": 6,
+    "groupIndex": 6,
     "_id": ""
   },
   {
@@ -165,10 +162,10 @@
     ],
     "paused": false,
     "defaultSkin": "default",
-    "defaultAnimation": "",
+    "defaultAnimation": "fire_lan",
     "_preCacheMode": 0,
     "_cacheMode": 0,
-    "loop": false,
+    "loop": true,
     "premultipliedAlpha": true,
     "timeScale": 1,
     "_accTime": 0,
@@ -176,13 +173,13 @@
     "_frameCache": null,
     "_curFrame": null,
     "_skeletonCache": null,
-    "_animationName": "atk",
+    "_animationName": "fire_lan",
     "_animationQueue": [],
     "_headAniInfo": null,
-    "_playTimes": 1,
+    "_playTimes": 0,
     "_isAniComplete": true,
     "_N$skeletonData": {
-      "__uuid__": "65799d37-ab01-4ff3-919c-e3d13aa1df9a"
+      "__uuid__": "7932f0a7-06bb-463d-a218-8df4043fbd8f"
     },
     "_N$_defaultCacheMode": 0,
     "_N$debugSlots": false,
@@ -198,116 +195,9 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
-    },
-    "fileId": "10/gcOyttBiovK6s/kpHnQ",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "yujing",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 6
-      }
-    ],
-    "_prefab": {
-      "__id__": 7
-    },
-    "_opacity": 0,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 140,
-      "height": 102
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        1.841,
-        45.397,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 5
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "9f8cc765-dcb6-430b-b69f-76de1f501396"
-    },
-    "_type": 0,
-    "_sizeMode": 0,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
+      "__uuid__": "4fa20b44-a925-4cf5-b13a-14c21e455b02"
     },
-    "fileId": "dd1CdSKxZLpoZ6CkgddTdM",
+    "fileId": "feHxvRygdCp7ket8BpENTr",
     "sync": false
   },
   {
@@ -343,40 +233,33 @@
       "__id__": 1
     },
     "_enabled": true,
-    "tag": 1,
+    "tag": 0,
     "_density": 1,
-    "_sensor": true,
+    "_sensor": false,
     "_friction": 0.2,
     "_restitution": 0,
     "body": null,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 45
+      "x": 0.9,
+      "y": -7.4
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 140,
-      "height": 100
+      "width": 32,
+      "height": 32
     },
     "_id": ""
   },
   {
-    "__type__": "ae49bisQD9GL47J/Gpqh3tx",
+    "__type__": "2991eOR3OpH5oN5xKI1Ogf8",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 1
     },
     "_enabled": true,
-    "monsterId": 2006,
-    "interval": 2,
-    "spine": {
-      "__id__": 3
-    },
-    "warnNode": {
-      "__id__": 5
-    },
+    "goodId": 2001,
     "_id": ""
   },
   {
@@ -385,7 +268,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "4fa20b44-a925-4cf5-b13a-14c21e455b02"
     },
     "fileId": "",
     "sync": false

+ 1 - 1
assets/resources/prefab/element/JG0113.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "f2080fbe-88d8-4c80-ae21-8df41f73b1ee",
+  "uuid": "4fa20b44-a925-4cf5-b13a-14c21e455b02",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

+ 426 - 74
assets/resources/prefab/element/JG0114.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "JG0114",
+    "_name": "JG0126",
     "_objFlags": 0,
     "_parent": null,
     "_children": [
@@ -22,25 +22,22 @@
       },
       {
         "__id__": 5
-      },
-      {
-        "__id__": 7
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 16
       },
       {
-        "__id__": 11
+        "__id__": 17
       },
       {
-        "__id__": 12
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 19
     },
     "_opacity": 255,
     "_color": {
@@ -52,8 +49,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 120,
-      "height": 120
+      "width": 30,
+      "height": 30
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -64,16 +61,16 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        6436.103,
-        5619.986,
+        0,
+        0,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
-        1
+        4,
+        4,
+        4
       ]
     },
     "_eulerAngles": {
@@ -85,13 +82,13 @@
     "_skewX": 0,
     "_skewY": 0,
     "_is3DNode": false,
-    "_groupIndex": 6,
-    "groupIndex": 6,
+    "_groupIndex": 1,
+    "groupIndex": 1,
     "_id": ""
   },
   {
     "__type__": "cc.Node",
-    "_name": "ani_gunshi",
+    "_name": "map01_jg_09",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -116,8 +113,185 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 135,
-      "height": 149.79
+      "width": 96,
+      "height": 90
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 1
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        21.70475,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.5,
+        0.5,
+        0.5
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "95ec3fc6-566d-4e5c-b391-1e32bb0dac0a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 2
+    },
+    "asset": {
+      "__uuid__": "1148d8dc-4d1c-4960-8aa7-bdd5fb6053c9"
+    },
+    "fileId": "6bLyeVaTBPmq+vW+Ibn4ZL",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "fazhen",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 12
+      }
+    ],
+    "_active": false,
+    "_components": [],
+    "_prefab": {
+      "__id__": 15
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0.052,
+        2.2515,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.5,
+        0.5,
+        0.5
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "fazhen",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 5
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 300,
+      "height": 302.98
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -158,7 +332,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 6
     },
     "_enabled": true,
     "_materials": [
@@ -168,7 +342,7 @@
     ],
     "paused": false,
     "defaultSkin": "default",
-    "defaultAnimation": "animation",
+    "defaultAnimation": "fazhen",
     "_preCacheMode": 0,
     "_cacheMode": 0,
     "loop": true,
@@ -179,13 +353,13 @@
     "_frameCache": null,
     "_curFrame": null,
     "_skeletonCache": null,
-    "_animationName": "animation",
+    "_animationName": "fazhen",
     "_animationQueue": [],
     "_headAniInfo": null,
     "_playTimes": 0,
     "_isAniComplete": true,
     "_N$skeletonData": {
-      "__uuid__": "a624eeb1-da26-4d34-9f65-58b66519852f"
+      "__uuid__": "88731006-92bc-48fc-9fc3-9f6ec0603620"
     },
     "_N$_defaultCacheMode": 0,
     "_N$debugSlots": false,
@@ -201,23 +375,27 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "41ffe928-29fe-4bd7-933b-6deda3500016"
+      "__uuid__": "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c"
     },
-    "fileId": "7cH8dQGMVOjoEvWDNTjolB",
+    "fileId": "9fJ7Cn0vJKn5IrhQoCAHvf",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "target",
+    "_name": "lizi_dian_fz",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 5
     },
     "_children": [],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 10
+      }
+    ],
     "_prefab": {
-      "__id__": 6
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -241,8 +419,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -2477,
-        0,
+        5.923,
+        11.275,
         0,
         0,
         0,
@@ -266,35 +444,136 @@
     "groupIndex": 0,
     "_id": ""
   },
+  {
+    "__type__": "cc.ParticleSystem",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 1,
+    "_custom": true,
+    "_file": {
+      "__uuid__": "b6361123-e036-4770-8efb-c3002e88cafd"
+    },
+    "_spriteFrame": null,
+    "_texture": null,
+    "_stopped": true,
+    "playOnLoad": true,
+    "autoRemoveOnFinish": false,
+    "totalParticles": 5,
+    "duration": -1,
+    "emissionRate": 20,
+    "life": 0.5,
+    "lifeVar": 0.4,
+    "_startColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_startColorVar": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 51,
+      "a": 25
+    },
+    "_endColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_endColorVar": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 0
+    },
+    "angle": 90,
+    "angleVar": 10,
+    "startSize": 30,
+    "startSizeVar": 10,
+    "endSize": 20,
+    "endSizeVar": 10,
+    "startSpin": 0,
+    "startSpinVar": 0,
+    "endSpin": 0,
+    "endSpinVar": 0,
+    "sourcePos": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "posVar": {
+      "__type__": "cc.Vec2",
+      "x": 50,
+      "y": 60
+    },
+    "_positionType": 1,
+    "positionType": 1,
+    "emitterMode": 0,
+    "gravity": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "speed": 200,
+    "speedVar": 10,
+    "tangentialAccel": 0,
+    "tangentialAccelVar": 0,
+    "radialAccel": 0,
+    "radialAccelVar": 0,
+    "rotationIsDir": false,
+    "startRadius": 0,
+    "startRadiusVar": 0,
+    "endRadius": 0,
+    "endRadiusVar": 0,
+    "rotatePerS": 0,
+    "rotatePerSVar": 0,
+    "_N$preview": true,
+    "_id": ""
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "41ffe928-29fe-4bd7-933b-6deda3500016"
+      "__uuid__": "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c"
     },
-    "fileId": "d73/ycKKNGYIqZieB9PaJt",
+    "fileId": "8b4Py2Y2VEMZFGkfk7O9QN",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "New Sprite",
+    "_name": "lizi_xian_fz",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 5
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 8
+        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 14
     },
-    "_opacity": 0,
+    "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
@@ -304,20 +583,20 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 2500,
-      "height": 120
+      "width": 0,
+      "height": 0
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 1,
+      "x": 0.5,
       "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        -15,
+        10.983,
+        64.148,
         0,
         0,
         0,
@@ -342,11 +621,11 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.ParticleSystem",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 7
+      "__id__": 12
     },
     "_enabled": true,
     "_materials": [
@@ -355,22 +634,91 @@
       }
     ],
     "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "41271eb7-3c59-4352-93c1-07fc8f4d0ea6"
+    "_dstBlendFactor": 1,
+    "_custom": true,
+    "_file": {
+      "__uuid__": "b9d23106-6779-4ec8-b16e-fc5315d1b838"
+    },
+    "_spriteFrame": null,
+    "_texture": null,
+    "_stopped": true,
+    "playOnLoad": true,
+    "autoRemoveOnFinish": false,
+    "totalParticles": 8,
+    "duration": -1,
+    "emissionRate": 16,
+    "life": 0.4,
+    "lifeVar": 0.2,
+    "_startColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 201
     },
-    "_type": 1,
-    "_sizeMode": 0,
-    "_fillType": 0,
-    "_fillCenter": {
+    "_startColorVar": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_endColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 0
+    },
+    "_endColorVar": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 0
+    },
+    "angle": 90,
+    "angleVar": 0,
+    "startSize": 100,
+    "startSizeVar": 10,
+    "endSize": 80,
+    "endSizeVar": 5,
+    "startSpin": 0,
+    "startSpinVar": 0,
+    "endSpin": 0,
+    "endSpinVar": 0,
+    "sourcePos": {
       "__type__": "cc.Vec2",
       "x": 0,
       "y": 0
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
+    "posVar": {
+      "__type__": "cc.Vec2",
+      "x": 50,
+      "y": 80
+    },
+    "_positionType": 1,
+    "positionType": 1,
+    "emitterMode": 0,
+    "gravity": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "speed": 244,
+    "speedVar": 10,
+    "tangentialAccel": 0,
+    "tangentialAccelVar": 0,
+    "radialAccel": 0,
+    "radialAccelVar": 0,
+    "rotationIsDir": false,
+    "startRadius": 0,
+    "startRadiusVar": 0,
+    "endRadius": 0,
+    "endRadiusVar": 0,
+    "rotatePerS": 0,
+    "rotatePerSVar": 0,
+    "_N$preview": true,
     "_id": ""
   },
   {
@@ -379,9 +727,20 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "41ffe928-29fe-4bd7-933b-6deda3500016"
+      "__uuid__": "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c"
+    },
+    "fileId": "3fks1HXA1ChYLhlceWjExk",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c"
     },
-    "fileId": "605K/WoUBCb44yZTfA+5rt",
+    "fileId": "082RseCj9C6qD4u6BLGIwz",
     "sync": false
   },
   {
@@ -403,7 +762,7 @@
       "y": 0
     },
     "_angularVelocity": 0,
-    "_fixedRotation": false,
+    "_fixedRotation": true,
     "enabledContactListener": true,
     "bullet": false,
     "awakeOnLoad": true,
@@ -417,7 +776,7 @@
       "__id__": 1
     },
     "_enabled": true,
-    "tag": 0,
+    "tag": 1,
     "_density": 1,
     "_sensor": true,
     "_friction": 0.2,
@@ -430,28 +789,21 @@
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 120,
-      "height": 120
+      "width": 30,
+      "height": 30
     },
     "_id": ""
   },
   {
-    "__type__": "2d187U3W8RPV65wVEErqYXV",
+    "__type__": "72dd2Av1ktEx5SAo//c4wLp",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 1
     },
     "_enabled": true,
-    "monsterId": 2006,
-    "time": 3,
-    "interval": 6,
-    "target": {
-      "__id__": 5
-    },
-    "spine": null,
-    "warnNode": {
-      "__id__": 7
+    "mTipsIcon": {
+      "__uuid__": "1a8970b8-6424-4b90-bd05-7724050b7153"
     },
     "_id": ""
   },
@@ -461,7 +813,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "41ffe928-29fe-4bd7-933b-6deda3500016"
+      "__uuid__": "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c"
     },
     "fileId": "",
     "sync": false

+ 1 - 1
assets/resources/prefab/element/JG0114.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "41ffe928-29fe-4bd7-933b-6deda3500016",
+  "uuid": "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

+ 46 - 101
assets/resources/prefab/element/JG0105_01.prefab

@@ -13,89 +13,27 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "JG0105_01",
+    "_name": "JG0102",
     "_objFlags": 0,
     "_parent": null,
-    "_children": [
-      {
-        "__id__": 2
-      }
-    ],
+    "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 5
+        "__id__": 2
       },
-      {
-        "__id__": 6
-      }
-    ],
-    "_prefab": {
-      "__id__": 7
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 46.89,
-      "height": 77.11
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        2,
-        2,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 6,
-    "groupIndex": 6,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "spine",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
       {
         "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 5
       }
     ],
     "_prefab": {
-      "__id__": 4
+      "__id__": 6
     },
     "_opacity": 255,
     "_color": {
@@ -107,8 +45,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
-      "height": 77.11
+      "width": 65,
+      "height": 82
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -120,14 +58,14 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -20,
+        0,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.5,
+        1.5,
         1
       ]
     },
@@ -140,8 +78,8 @@
     "_skewX": 0,
     "_skewY": 0,
     "_is3DNode": false,
-    "_groupIndex": 6,
-    "groupIndex": 6,
+    "_groupIndex": 1,
+    "groupIndex": 1,
     "_id": ""
   },
   {
@@ -149,7 +87,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 1
     },
     "_enabled": true,
     "_materials": [
@@ -162,7 +100,7 @@
     "defaultAnimation": "",
     "_preCacheMode": 0,
     "_cacheMode": 0,
-    "loop": true,
+    "loop": false,
     "premultipliedAlpha": true,
     "timeScale": 1,
     "_accTime": 0,
@@ -170,13 +108,13 @@
     "_frameCache": null,
     "_curFrame": null,
     "_skeletonCache": null,
-    "_animationName": "",
+    "_animationName": "boom",
     "_animationQueue": [],
     "_headAniInfo": null,
-    "_playTimes": 0,
+    "_playTimes": 1,
     "_isAniComplete": true,
     "_N$skeletonData": {
-      "__uuid__": "96b48c0d-833a-4796-8a5f-dda98162ea67"
+      "__uuid__": "1413a798-2fad-4db1-91b7-04be4e606017"
     },
     "_N$_defaultCacheMode": 0,
     "_N$debugSlots": false,
@@ -186,17 +124,6 @@
     "_N$enableBatch": false,
     "_id": ""
   },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "69b3a8ee-9d9c-4120-8fa0-0e9aba59b472"
-    },
-    "fileId": "99gQkkJz1DY5iYwBsHkyp9",
-    "sync": false
-  },
   {
     "__type__": "cc.RigidBody",
     "_name": "",
@@ -218,7 +145,7 @@
     "_angularVelocity": 0,
     "_fixedRotation": false,
     "enabledContactListener": true,
-    "bullet": true,
+    "bullet": false,
     "awakeOnLoad": true,
     "_id": ""
   },
@@ -238,13 +165,31 @@
     "body": null,
     "_offset": {
       "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+      "x": -0.2,
+      "y": 40.1
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 46.89,
-      "height": 77.11
+      "width": 49.5,
+      "height": 40.8
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "3768f8jiWJDQ427kxDEoPa6",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "spine": {
+      "__id__": 2
+    },
+    "icon": null,
+    "hide": null,
+    "mTipsIcon": {
+      "__uuid__": "f6c30f3e-8392-4d4c-8398-8d7bea233bc5"
     },
     "_id": ""
   },
@@ -254,7 +199,7 @@
       "__id__": 1
     },
     "asset": {
-      "__uuid__": "69b3a8ee-9d9c-4120-8fa0-0e9aba59b472"
+      "__uuid__": "e18cbf3b-5ab8-4c87-871a-a2c51ce55790"
     },
     "fileId": "",
     "sync": false

+ 1 - 1
assets/resources/prefab/element/JG0107.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "99605191-cf27-4d54-a9d4-acb3805dc45d",
+  "uuid": "2777c629-901f-467d-b9c5-838129207240",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

+ 0 - 8
assets/resources/prefab/element/JG0120.prefab.meta

@@ -1,8 +0,0 @@
-{
-  "ver": "1.2.9",
-  "uuid": "b026e3d7-1015-4a57-853d-b88c21e9c499",
-  "optimizationPolicy": "AUTO",
-  "asyncLoadAssets": false,
-  "readonly": false,
-  "subMetas": {}
-}

ファイルの差分が大きいため隠しています
+ 0 - 1877
assets/resources/prefab/element/JG0122.prefab


+ 0 - 8
assets/resources/prefab/element/JG0122.prefab.meta

@@ -1,8 +0,0 @@
-{
-  "ver": "1.2.9",
-  "uuid": "7ac1727a-906d-447e-84b1-ca14a649311c",
-  "optimizationPolicy": "AUTO",
-  "asyncLoadAssets": false,
-  "readonly": false,
-  "subMetas": {}
-}

+ 0 - 276
assets/resources/prefab/element/JG0124.prefab

@@ -1,276 +0,0 @@
-[
-  {
-    "__type__": "cc.Prefab",
-    "_name": "",
-    "_objFlags": 0,
-    "_native": "",
-    "data": {
-      "__id__": 1
-    },
-    "optimizationPolicy": 0,
-    "asyncLoadAssets": false,
-    "readonly": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "JG0124",
-    "_objFlags": 0,
-    "_parent": null,
-    "_children": [
-      {
-        "__id__": 2
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 6
-      },
-      {
-        "__id__": 7
-      }
-    ],
-    "_prefab": {
-      "__id__": 8
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 6,
-    "groupIndex": 6,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "skeleton",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 3
-      }
-    ],
-    "_prefab": {
-      "__id__": 4
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 6,
-    "groupIndex": 6,
-    "_id": ""
-  },
-  {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
-      }
-    ],
-    "paused": false,
-    "defaultSkin": "default",
-    "defaultAnimation": "fire_lan",
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "loop": true,
-    "premultipliedAlpha": true,
-    "timeScale": 1,
-    "_accTime": 0,
-    "_playCount": 0,
-    "_frameCache": null,
-    "_curFrame": null,
-    "_skeletonCache": null,
-    "_animationName": "fire_lan",
-    "_animationQueue": [],
-    "_headAniInfo": null,
-    "_playTimes": 0,
-    "_isAniComplete": true,
-    "_N$skeletonData": {
-      "__uuid__": "7932f0a7-06bb-463d-a218-8df4043fbd8f"
-    },
-    "_N$_defaultCacheMode": 0,
-    "_N$debugSlots": false,
-    "_N$debugBones": false,
-    "_N$debugMesh": false,
-    "_N$useTint": false,
-    "_N$enableBatch": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "4fa20b44-a925-4cf5-b13a-14c21e455b02"
-    },
-    "fileId": "feHxvRygdCp7ket8BpENTr",
-    "sync": false
-  },
-  {
-    "__type__": "cc.RigidBody",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "_type": 0,
-    "_allowSleep": true,
-    "_gravityScale": 1,
-    "_linearDamping": 0,
-    "_angularDamping": 0,
-    "_linearVelocity": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_angularVelocity": 0,
-    "_fixedRotation": false,
-    "enabledContactListener": true,
-    "bullet": false,
-    "awakeOnLoad": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PhysicsBoxCollider",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "tag": 0,
-    "_density": 1,
-    "_sensor": false,
-    "_friction": 0.2,
-    "_restitution": 0,
-    "body": null,
-    "_offset": {
-      "__type__": "cc.Vec2",
-      "x": 0.9,
-      "y": -7.4
-    },
-    "_size": {
-      "__type__": "cc.Size",
-      "width": 32,
-      "height": 32
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "2991eOR3OpH5oN5xKI1Ogf8",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "goodId": 2001,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "4fa20b44-a925-4cf5-b13a-14c21e455b02"
-    },
-    "fileId": "",
-    "sync": false
-  }
-]

+ 0 - 8
assets/resources/prefab/element/JG0124.prefab.meta

@@ -1,8 +0,0 @@
-{
-  "ver": "1.2.9",
-  "uuid": "4fa20b44-a925-4cf5-b13a-14c21e455b02",
-  "optimizationPolicy": "AUTO",
-  "asyncLoadAssets": false,
-  "readonly": false,
-  "subMetas": {}
-}

+ 0 - 821
assets/resources/prefab/element/JG0126.prefab

@@ -1,821 +0,0 @@
-[
-  {
-    "__type__": "cc.Prefab",
-    "_name": "",
-    "_objFlags": 0,
-    "_native": "",
-    "data": {
-      "__id__": 1
-    },
-    "optimizationPolicy": 0,
-    "asyncLoadAssets": false,
-    "readonly": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "JG0126",
-    "_objFlags": 0,
-    "_parent": null,
-    "_children": [
-      {
-        "__id__": 2
-      },
-      {
-        "__id__": 5
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 16
-      },
-      {
-        "__id__": 17
-      },
-      {
-        "__id__": 18
-      }
-    ],
-    "_prefab": {
-      "__id__": 19
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 30,
-      "height": 30
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        4,
-        4,
-        4
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 1,
-    "groupIndex": 1,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "map01_jg_09",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 3
-      }
-    ],
-    "_prefab": {
-      "__id__": 4
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 96,
-      "height": 90
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 1
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        21.70475,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0.5,
-        0.5,
-        0.5
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "95ec3fc6-566d-4e5c-b391-1e32bb0dac0a"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 2
-    },
-    "asset": {
-      "__uuid__": "1148d8dc-4d1c-4960-8aa7-bdd5fb6053c9"
-    },
-    "fileId": "6bLyeVaTBPmq+vW+Ibn4ZL",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "fazhen",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [
-      {
-        "__id__": 6
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 12
-      }
-    ],
-    "_active": false,
-    "_components": [],
-    "_prefab": {
-      "__id__": 15
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0.052,
-        2.2515,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0.5,
-        0.5,
-        0.5
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "fazhen",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 5
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 7
-      }
-    ],
-    "_prefab": {
-      "__id__": 8
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 300,
-      "height": 302.98
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 6
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
-      }
-    ],
-    "paused": false,
-    "defaultSkin": "default",
-    "defaultAnimation": "fazhen",
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "loop": true,
-    "premultipliedAlpha": true,
-    "timeScale": 1,
-    "_accTime": 0,
-    "_playCount": 0,
-    "_frameCache": null,
-    "_curFrame": null,
-    "_skeletonCache": null,
-    "_animationName": "fazhen",
-    "_animationQueue": [],
-    "_headAniInfo": null,
-    "_playTimes": 0,
-    "_isAniComplete": true,
-    "_N$skeletonData": {
-      "__uuid__": "88731006-92bc-48fc-9fc3-9f6ec0603620"
-    },
-    "_N$_defaultCacheMode": 0,
-    "_N$debugSlots": false,
-    "_N$debugBones": false,
-    "_N$debugMesh": false,
-    "_N$useTint": false,
-    "_N$enableBatch": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c"
-    },
-    "fileId": "9fJ7Cn0vJKn5IrhQoCAHvf",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "lizi_dian_fz",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 5
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 10
-      }
-    ],
-    "_prefab": {
-      "__id__": 11
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        5.923,
-        11.275,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.ParticleSystem",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 9
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 1,
-    "_custom": true,
-    "_file": {
-      "__uuid__": "b6361123-e036-4770-8efb-c3002e88cafd"
-    },
-    "_spriteFrame": null,
-    "_texture": null,
-    "_stopped": true,
-    "playOnLoad": true,
-    "autoRemoveOnFinish": false,
-    "totalParticles": 5,
-    "duration": -1,
-    "emissionRate": 20,
-    "life": 0.5,
-    "lifeVar": 0.4,
-    "_startColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_startColorVar": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 51,
-      "a": 25
-    },
-    "_endColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_endColorVar": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 0
-    },
-    "angle": 90,
-    "angleVar": 10,
-    "startSize": 30,
-    "startSizeVar": 10,
-    "endSize": 20,
-    "endSizeVar": 10,
-    "startSpin": 0,
-    "startSpinVar": 0,
-    "endSpin": 0,
-    "endSpinVar": 0,
-    "sourcePos": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "posVar": {
-      "__type__": "cc.Vec2",
-      "x": 50,
-      "y": 60
-    },
-    "_positionType": 1,
-    "positionType": 1,
-    "emitterMode": 0,
-    "gravity": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "speed": 200,
-    "speedVar": 10,
-    "tangentialAccel": 0,
-    "tangentialAccelVar": 0,
-    "radialAccel": 0,
-    "radialAccelVar": 0,
-    "rotationIsDir": false,
-    "startRadius": 0,
-    "startRadiusVar": 0,
-    "endRadius": 0,
-    "endRadiusVar": 0,
-    "rotatePerS": 0,
-    "rotatePerSVar": 0,
-    "_N$preview": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c"
-    },
-    "fileId": "8b4Py2Y2VEMZFGkfk7O9QN",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "lizi_xian_fz",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 5
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 13
-      }
-    ],
-    "_prefab": {
-      "__id__": 14
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        10.983,
-        64.148,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.ParticleSystem",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 12
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 1,
-    "_custom": true,
-    "_file": {
-      "__uuid__": "b9d23106-6779-4ec8-b16e-fc5315d1b838"
-    },
-    "_spriteFrame": null,
-    "_texture": null,
-    "_stopped": true,
-    "playOnLoad": true,
-    "autoRemoveOnFinish": false,
-    "totalParticles": 8,
-    "duration": -1,
-    "emissionRate": 16,
-    "life": 0.4,
-    "lifeVar": 0.2,
-    "_startColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 201
-    },
-    "_startColorVar": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_endColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 0
-    },
-    "_endColorVar": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 0
-    },
-    "angle": 90,
-    "angleVar": 0,
-    "startSize": 100,
-    "startSizeVar": 10,
-    "endSize": 80,
-    "endSizeVar": 5,
-    "startSpin": 0,
-    "startSpinVar": 0,
-    "endSpin": 0,
-    "endSpinVar": 0,
-    "sourcePos": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "posVar": {
-      "__type__": "cc.Vec2",
-      "x": 50,
-      "y": 80
-    },
-    "_positionType": 1,
-    "positionType": 1,
-    "emitterMode": 0,
-    "gravity": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "speed": 244,
-    "speedVar": 10,
-    "tangentialAccel": 0,
-    "tangentialAccelVar": 0,
-    "radialAccel": 0,
-    "radialAccelVar": 0,
-    "rotationIsDir": false,
-    "startRadius": 0,
-    "startRadiusVar": 0,
-    "endRadius": 0,
-    "endRadiusVar": 0,
-    "rotatePerS": 0,
-    "rotatePerSVar": 0,
-    "_N$preview": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c"
-    },
-    "fileId": "3fks1HXA1ChYLhlceWjExk",
-    "sync": false
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c"
-    },
-    "fileId": "082RseCj9C6qD4u6BLGIwz",
-    "sync": false
-  },
-  {
-    "__type__": "cc.RigidBody",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "_type": 2,
-    "_allowSleep": true,
-    "_gravityScale": 0,
-    "_linearDamping": 0,
-    "_angularDamping": 0,
-    "_linearVelocity": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_angularVelocity": 0,
-    "_fixedRotation": true,
-    "enabledContactListener": true,
-    "bullet": false,
-    "awakeOnLoad": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PhysicsBoxCollider",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "tag": 1,
-    "_density": 1,
-    "_sensor": true,
-    "_friction": 0.2,
-    "_restitution": 0,
-    "body": null,
-    "_offset": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_size": {
-      "__type__": "cc.Size",
-      "width": 30,
-      "height": 30
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "72dd2Av1ktEx5SAo//c4wLp",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "mTipsIcon": {
-      "__uuid__": "1a8970b8-6424-4b90-bd05-7724050b7153"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c"
-    },
-    "fileId": "",
-    "sync": false
-  }
-]

+ 0 - 8
assets/resources/prefab/element/JG0126.prefab.meta

@@ -1,8 +0,0 @@
-{
-  "ver": "1.2.9",
-  "uuid": "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c",
-  "optimizationPolicy": "AUTO",
-  "asyncLoadAssets": false,
-  "readonly": false,
-  "subMetas": {}
-}

+ 26 - 6
local/local.json

@@ -16,12 +16,6 @@
     "aa4d574e-420c-47ae-bfa1-768309e25aa0",
     "3d970ea4-c1a7-4b5e-a794-be2a897474f0",
     "1fbc18b8-3bde-4f5f-8f1d-e7ce637b6616",
-    "35b14081-9e0f-45a5-a804-a787c942ff47",
-    "c1fa2217-e454-46ca-ad7b-31c2afa8adc4",
-    "1cc87fa7-097b-4f10-aecb-49dcb1713bac",
-    "e18cbf3b-5ab8-4c87-871a-a2c51ce55790",
-    "81823765-7aef-47ac-b793-287673d47aa3",
-    "d14d519b-6493-4bf0-bbdd-1438c31926e2",
     "00e7d7b2-4a8c-47e2-be29-2a79dee2c720",
     "2d2f792f-a40c-49bb-a189-ed176a246e49",
     "ff982981-097a-4e0e-8734-bfc340c5f129",
@@ -31,6 +25,32 @@
     "11364221-35d8-475e-b9ec-43ab3aa2993d",
     "68a3997f-98c2-4008-8a2a-569dad5ab209",
     "c41951b4-1379-413b-84ba-62e45c5e4561",
+    "e3612138-ec3b-404f-8232-0cabe743bcc7",
+    "e18cbf3b-5ab8-4c87-871a-a2c51ce55790",
+    "d14d519b-6493-4bf0-bbdd-1438c31926e2",
+    "99605191-cf27-4d54-a9d4-acb3805dc45d",
+    "b026e3d7-1015-4a57-853d-b88c21e9c499",
+    "d1a2ef47-969e-4cde-a796-a3cd475d8bed",
+    "1051392c-148f-41a1-9267-9ef5f129a6e9",
+    "41ffe928-29fe-4bd7-933b-6deda3500016",
+    "d109550d-0d11-4e32-90e1-bf0c2e80f637",
+    "2777c629-901f-467d-b9c5-838129207240",
+    "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c",
+    "4fa20b44-a925-4cf5-b13a-14c21e455b02",
+    "39a60824-c678-4b33-a8e7-c5c2f8f7bb9e",
+    "686bd299-de37-43fe-b735-f5a6dd1f9e13",
+    "7ac1727a-906d-447e-84b1-ca14a649311c",
+    "81823765-7aef-47ac-b793-287673d47aa3",
+    "c1fa2217-e454-46ca-ad7b-31c2afa8adc4",
+    "1cc87fa7-097b-4f10-aecb-49dcb1713bac",
+    "4445850f-898f-47e8-a574-c2c63a1e36a7",
+    "35b14081-9e0f-45a5-a804-a787c942ff47",
+    "69b3a8ee-9d9c-4120-8fa0-0e9aba59b472",
+    "13452eaf-a0d0-4b0a-82d2-f5fc7cf793bb",
+    "fb1460ea-e74b-47b2-8467-efbbba57a4ca",
+    "af111354-8962-48b7-93db-eee87d40b1fe",
+    "165d9521-f2fa-40d9-bbe9-1d4f4c5d4775",
+    "147ce141-b17c-4434-87f7-2b12cb885bb7",
     "1dd1b738-6fcc-472c-aef0-635d214a6118"
   ]
 }