Quellcode durchsuchen

冰块spine添加

woso_javan vor 3 Monaten
Ursprung
Commit
f2efbdf2c9
28 geänderte Dateien mit 1342 neuen und 2431 gelöschten Zeilen
  1. 159 1085
      assets/module_take_goblet/Prefabs/Cup/Original/OriginalFour.prefab
  2. 158 783
      assets/module_take_goblet/Prefabs/Cup/Original/OriginalThree.prefab
  3. 87 413
      assets/module_take_goblet/Prefabs/Cup/Original/OriginalTwo.prefab
  4. 180 141
      assets/module_take_goblet/Prefabs/Levels/lvl_1.prefab
  5. 8 6
      assets/module_take_goblet/Script/Component/OriginCup.ts
  6. 9 0
      assets/module_take_goblet/Spines/2color/freeze.meta
  7. 76 0
      assets/module_take_goblet/Spines/2color/freeze/skeleton.atlas
  8. 12 0
      assets/module_take_goblet/Spines/2color/freeze/skeleton.atlas.meta
  9. 0 0
      assets/module_take_goblet/Spines/2color/freeze/skeleton.json
  10. 11 0
      assets/module_take_goblet/Spines/2color/freeze/skeleton.json.meta
  11. BIN
      assets/module_take_goblet/Spines/2color/freeze/skeleton.png
  12. 134 0
      assets/module_take_goblet/Spines/2color/freeze/skeleton.png.meta
  13. 9 0
      assets/module_take_goblet/Spines/3color/freeze.meta
  14. 83 0
      assets/module_take_goblet/Spines/3color/freeze/skeleton.atlas
  15. 12 0
      assets/module_take_goblet/Spines/3color/freeze/skeleton.atlas.meta
  16. 0 0
      assets/module_take_goblet/Spines/3color/freeze/skeleton.json
  17. 11 0
      assets/module_take_goblet/Spines/3color/freeze/skeleton.json.meta
  18. BIN
      assets/module_take_goblet/Spines/3color/freeze/skeleton.png
  19. 134 0
      assets/module_take_goblet/Spines/3color/freeze/skeleton.png.meta
  20. 9 0
      assets/module_take_goblet/Spines/4color/freeze.meta
  21. 90 0
      assets/module_take_goblet/Spines/4color/freeze/skeleton.atlas
  22. 12 0
      assets/module_take_goblet/Spines/4color/freeze/skeleton.atlas.meta
  23. 0 0
      assets/module_take_goblet/Spines/4color/freeze/skeleton.json
  24. 11 0
      assets/module_take_goblet/Spines/4color/freeze/skeleton.json.meta
  25. BIN
      assets/module_take_goblet/Spines/4color/freeze/skeleton.png
  26. 134 0
      assets/module_take_goblet/Spines/4color/freeze/skeleton.png.meta
  27. 2 2
      assets/module_take_goblet/rooster_takegoblet.scene
  28. 1 1
      assets/start/Start.ts

Datei-Diff unterdrückt, da er zu groß ist
+ 159 - 1085
assets/module_take_goblet/Prefabs/Cup/Original/OriginalFour.prefab


Datei-Diff unterdrückt, da er zu groß ist
+ 158 - 783
assets/module_take_goblet/Prefabs/Cup/Original/OriginalThree.prefab


+ 87 - 413
assets/module_take_goblet/Prefabs/Cup/Original/OriginalTwo.prefab

@@ -28,20 +28,20 @@
         "__id__": 42
       },
       {
-        "__id__": 70
+        "__id__": 58
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 76
+        "__id__": 64
       },
       {
-        "__id__": 78
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 68
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -905,78 +905,24 @@
         "__id__": 43
       },
       {
-        "__id__": 55
+        "__id__": 49
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 57
     },
     "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 75.79,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
       "z": 0
     },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Freeze1",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 42
-    },
-    "_children": [
-      {
-        "__id__": 44
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 50
-      },
-      {
-        "__id__": 52
-      }
-    ],
-    "_prefab": {
-      "__id__": 54
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -95,
-      "z": 0
-    },
     "_lrot": {
       "__type__": "cc.Quat",
       "x": 0,
@@ -1002,24 +948,24 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "cup",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 43
+      "__id__": 42
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 44
       },
       {
-        "__id__": 47
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 48
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1056,39 +1002,39 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 45
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40,
-      "height": 50.4
+      "width": 201.72000122070312,
+      "height": 309.5299987792969
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
+      "x": 0.48854849521805044,
+      "y": 0.5452783234094266
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "6fTNZI3mZFrZHlZD4cnlLN"
+    "fileId": "3fKnQr/zBOE6AjwPi6zYHS"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "sp.Skeleton",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 47
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1100,137 +1046,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "冰冻",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
-      "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
-    },
-    "_shadowBlur": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "4aDReKQ3ZO5KdXyffw/B12"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "1e9UX5W6ZDC5johf4vEkti",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 43
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 51
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 35
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "dbVBIO3lBKzoVBYpyNoIAp"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 43
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 53
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 15,
-      "g": 126,
-      "b": 247,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+    "_skeletonData": {
+      "__uuid__": "08630fab-5741-495d-b90a-02455de9978e",
+      "__expectedType__": "sp.SkeletonData"
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
+    "defaultSkin": "all",
+    "defaultAnimation": "idle",
+    "_premultipliedAlpha": false,
+    "_timeScale": 1,
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "_sockets": [],
+    "_useTint": false,
+    "_debugMesh": false,
+    "_debugBones": false,
+    "_debugSlots": false,
+    "_enableBatch": false,
+    "loop": true,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "bc28Tq6aFFP6IIU7QMpKcT"
+    "fileId": "9eH7q5NCZE17BfdcFiP4QU"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1240,85 +1077,31 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "1cwprjIjhMmbZw8Vc0ckq9",
+    "fileId": "5ei7a+BWVJi6WdHwZ/vsjw",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "Freeze2",
+    "_name": "piece",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 42
     },
-    "_children": [
-      {
-        "__id__": 56
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 62
-      },
-      {
-        "__id__": 64
-      }
-    ],
-    "_prefab": {
-      "__id__": 66
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -55,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Label",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 55
-    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 50
       },
       {
-        "__id__": 59
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 61
+      "__id__": 54
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1355,39 +1138,39 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 56
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 58
+      "__id__": 51
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40,
-      "height": 50.4
+      "width": 201.72000122070312,
+      "height": 309.5299987792969
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
+      "x": 0.48854849521805044,
+      "y": 0.5452783234094266
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "49plZXVGBOspb4SBkol6KB"
+    "fileId": "faYbN6309E94HLFigb9Z+I"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "sp.Skeleton",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 56
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 53
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1399,137 +1182,28 @@
       "b": 255,
       "a": 255
     },
-    "_string": "冰冻",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
-      "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
-    },
-    "_shadowBlur": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "0b7+peicVNJJinJPPDt0Jt"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "77TFZvKbRE5K+mNh9EINBu",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 55
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 63
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 35
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "cf/PeHG1pKyZmnzZCVQEZp"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 55
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 65
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 15,
-      "g": 126,
-      "b": 247,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+    "_skeletonData": {
+      "__uuid__": "08630fab-5741-495d-b90a-02455de9978e",
+      "__expectedType__": "sp.SkeletonData"
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
+    "defaultSkin": "piece",
+    "defaultAnimation": "idle",
+    "_premultipliedAlpha": false,
+    "_timeScale": 1,
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "_sockets": [],
+    "_useTint": false,
+    "_debugMesh": false,
+    "_debugBones": false,
+    "_debugSlots": false,
+    "_enableBatch": false,
+    "loop": false,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "95bmaWLsdNC4deq0fLzznK"
+    "fileId": "672P9GWCNG56eXalA7A/um"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1539,7 +1213,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "d8vDZEIKpGQZfF5IOXslPJ",
+    "fileId": "2cbbqFMFpGh49IAB3Vun66",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1554,12 +1228,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 205.6199951171875,
+      "height": 367.45001220703125
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1570,7 +1244,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "09+uSaNbFEeLIhsDLz4fZX"
+    "fileId": "e8CztHlnRGYJ7RxLYLooC1"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1580,7 +1254,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "c8zFvKltdD+7aR1I+NdcJV",
+    "fileId": "e3hWUzrB5IXqQN9Wbv7BuA",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1597,14 +1271,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 71
+        "__id__": 59
       },
       {
-        "__id__": 73
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 63
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1641,11 +1315,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 58
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 72
+      "__id__": 60
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1669,11 +1343,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 58
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 74
+      "__id__": 62
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1731,7 +1405,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 65
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1759,10 +1433,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 67
     },
     "cupSkeleton": {
-      "__id__": 73
+      "__id__": 61
     },
     "cupHeight": 2,
     "waters": {

Datei-Diff unterdrückt, da er zu groß ist
+ 180 - 141
assets/module_take_goblet/Prefabs/Levels/lvl_1.prefab


+ 8 - 6
assets/module_take_goblet/Script/Component/OriginCup.ts

@@ -37,6 +37,8 @@ export class OriginCup extends Component {
     @property(Node)
     freeze: Node = null!;  //冰冻节点
 
+    freezeCount: number = 0;
+
     get freezeActive() {
         return this.freeze.active;
     }
@@ -123,13 +125,13 @@ export class OriginCup extends Component {
 
     //解除冰冻
     unFreeze() {
-        const nextIndex = this.freeze.children.filter(n => n.active).length - 1;
-        console.log(`解冻的索引:${nextIndex}`);
-        const freezeNode = this.freeze.children[nextIndex];
-        freezeNode.active = false;
+        TakeGobletAudioMgr.playOneShot(TakeGobletAudioMgr.getMusicIdName(9), 1.0);
+        this.freezeCount++;
+        this.freeze.children.forEach((freezeNode, i) => {
+            freezeNode.getComponent(sp.Skeleton)!.setAnimation(0, `freeze_0${this.freezeCount}`, false);
+        })
 
-        const freezeCount = this.freeze.children.filter(n => n.active).length;
-        if (freezeCount == 0) {
+        if (this.freezeCount >= this.cupHeight) {
             this.freezeActive = false;
         }
     }

+ 9 - 0
assets/module_take_goblet/Spines/2color/freeze.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "812dca0b-2e27-4f75-9ade-ea9b0fdecc9f",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 76 - 0
assets/module_take_goblet/Spines/2color/freeze/skeleton.atlas

@@ -0,0 +1,76 @@
+
+skeleton.png
+size: 267,269
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: false
+  xy: 220, 13
+  size: 21, 23
+  orig: 21, 23
+  offset: 0, 0
+  index: -1
+2
+  rotate: false
+  xy: 139, 126
+  size: 13, 12
+  orig: 13, 12
+  offset: 0, 0
+  index: -1
+3
+  rotate: false
+  xy: 139, 105
+  size: 11, 19
+  orig: 11, 19
+  offset: 0, 0
+  index: -1
+4
+  rotate: false
+  xy: 155, 10
+  size: 23, 26
+  orig: 23, 26
+  offset: 0, 0
+  index: -1
+5
+  rotate: false
+  xy: 180, 13
+  size: 38, 23
+  orig: 38, 23
+  offset: 0, 0
+  index: -1
+Xiao_1
+  rotate: false
+  xy: 2, 61
+  size: 135, 206
+  orig: 135, 206
+  offset: 0, 0
+  index: -1
+Xiao_2
+  rotate: true
+  xy: 139, 140
+  size: 127, 126
+  orig: 127, 126
+  offset: 0, 0
+  index: -1
+cloud
+  rotate: false
+  xy: 2, 2
+  size: 99, 57
+  orig: 100, 100
+  offset: 0, 23
+  index: -1
+cloud2
+  rotate: true
+  xy: 155, 38
+  size: 100, 89
+  orig: 100, 100
+  offset: 0, 10
+  index: -1
+snow
+  rotate: false
+  xy: 103, 9
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1

+ 12 - 0
assets/module_take_goblet/Spines/2color/freeze/skeleton.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "eff64e25-a589-48cc-9b03-37466211fdf9",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
assets/module_take_goblet/Spines/2color/freeze/skeleton.json


+ 11 - 0
assets/module_take_goblet/Spines/2color/freeze/skeleton.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "08630fab-5741-495d-b90a-02455de9978e",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

BIN
assets/module_take_goblet/Spines/2color/freeze/skeleton.png


+ 134 - 0
assets/module_take_goblet/Spines/2color/freeze/skeleton.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "bb2b3dd7-edcf-4123-b3e9-520ccd500cb9",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "bb2b3dd7-edcf-4123-b3e9-520ccd500cb9@6c48a",
+      "displayName": "skeleton",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "bb2b3dd7-edcf-4123-b3e9-520ccd500cb9",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "nearest",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "bb2b3dd7-edcf-4123-b3e9-520ccd500cb9@f9941",
+      "displayName": "skeleton",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 2,
+        "trimY": 2,
+        "width": 263,
+        "height": 265,
+        "rawWidth": 267,
+        "rawHeight": 269,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -131.5,
+            -132.5,
+            0,
+            131.5,
+            -132.5,
+            0,
+            -131.5,
+            132.5,
+            0,
+            131.5,
+            132.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            2,
+            267,
+            265,
+            267,
+            2,
+            2,
+            265,
+            2
+          ],
+          "nuv": [
+            0.00749063670411985,
+            0.007434944237918215,
+            0.9925093632958801,
+            0.007434944237918215,
+            0.00749063670411985,
+            0.9925650557620818,
+            0.9925093632958801,
+            0.9925650557620818
+          ],
+          "minPos": [
+            -131.5,
+            -132.5,
+            0
+          ],
+          "maxPos": [
+            131.5,
+            132.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "bb2b3dd7-edcf-4123-b3e9-520ccd500cb9@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "bb2b3dd7-edcf-4123-b3e9-520ccd500cb9@f9941"
+  }
+}

+ 9 - 0
assets/module_take_goblet/Spines/3color/freeze.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "5c47e1de-2e24-462c-9fa2-b17ed77608d9",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 83 - 0
assets/module_take_goblet/Spines/3color/freeze/skeleton.atlas

@@ -0,0 +1,83 @@
+
+skeleton.png
+size: 370,269
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: false
+  xy: 70, 2
+  size: 21, 23
+  orig: 21, 23
+  offset: 0, 0
+  index: -1
+2
+  rotate: true
+  xy: 106, 12
+  size: 13, 12
+  orig: 13, 12
+  offset: 0, 0
+  index: -1
+3
+  rotate: false
+  xy: 93, 6
+  size: 11, 19
+  orig: 11, 19
+  offset: 0, 0
+  index: -1
+4
+  rotate: true
+  xy: 42, 2
+  size: 23, 26
+  orig: 23, 26
+  offset: 0, 0
+  index: -1
+5
+  rotate: false
+  xy: 2, 2
+  size: 38, 23
+  orig: 38, 23
+  offset: 0, 0
+  index: -1
+Zhong_1
+  rotate: false
+  xy: 2, 27
+  size: 140, 240
+  orig: 140, 240
+  offset: 0, 0
+  index: -1
+Zhong_2
+  rotate: true
+  xy: 144, 131
+  size: 136, 165
+  orig: 136, 165
+  offset: 0, 0
+  index: -1
+Zhong_3
+  rotate: false
+  xy: 144, 21
+  size: 132, 108
+  orig: 132, 108
+  offset: 0, 0
+  index: -1
+cloud
+  rotate: true
+  xy: 311, 168
+  size: 99, 57
+  orig: 100, 100
+  offset: 0, 23
+  index: -1
+cloud2
+  rotate: true
+  xy: 278, 14
+  size: 100, 89
+  orig: 100, 100
+  offset: 0, 10
+  index: -1
+snow
+  rotate: false
+  xy: 311, 116
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1

+ 12 - 0
assets/module_take_goblet/Spines/3color/freeze/skeleton.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "c17faad1-6b34-449a-8a16-7ac73dd5b9ca",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
assets/module_take_goblet/Spines/3color/freeze/skeleton.json


+ 11 - 0
assets/module_take_goblet/Spines/3color/freeze/skeleton.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "54720e6f-a6c1-4cc0-98b3-8c347256ab82",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

BIN
assets/module_take_goblet/Spines/3color/freeze/skeleton.png


+ 134 - 0
assets/module_take_goblet/Spines/3color/freeze/skeleton.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "0b0904b4-dda7-48f1-b8e1-4d0fc5c84bd5",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "0b0904b4-dda7-48f1-b8e1-4d0fc5c84bd5@6c48a",
+      "displayName": "skeleton",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "0b0904b4-dda7-48f1-b8e1-4d0fc5c84bd5",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "nearest",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "0b0904b4-dda7-48f1-b8e1-4d0fc5c84bd5@f9941",
+      "displayName": "skeleton",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 2,
+        "trimY": 2,
+        "width": 366,
+        "height": 265,
+        "rawWidth": 370,
+        "rawHeight": 269,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -183,
+            -132.5,
+            0,
+            183,
+            -132.5,
+            0,
+            -183,
+            132.5,
+            0,
+            183,
+            132.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            2,
+            267,
+            368,
+            267,
+            2,
+            2,
+            368,
+            2
+          ],
+          "nuv": [
+            0.005405405405405406,
+            0.007434944237918215,
+            0.9945945945945946,
+            0.007434944237918215,
+            0.005405405405405406,
+            0.9925650557620818,
+            0.9945945945945946,
+            0.9925650557620818
+          ],
+          "minPos": [
+            -183,
+            -132.5,
+            0
+          ],
+          "maxPos": [
+            183,
+            132.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "0b0904b4-dda7-48f1-b8e1-4d0fc5c84bd5@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "0b0904b4-dda7-48f1-b8e1-4d0fc5c84bd5@f9941"
+  }
+}

+ 9 - 0
assets/module_take_goblet/Spines/4color/freeze.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "87fc8e09-ea5c-4465-b0a5-583b66011f51",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 90 - 0
assets/module_take_goblet/Spines/4color/freeze/skeleton.atlas

@@ -0,0 +1,90 @@
+
+skeleton.png
+size: 300,424
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 271, 38
+  size: 21, 23
+  orig: 21, 23
+  offset: 0, 0
+  index: -1
+2
+  rotate: false
+  xy: 284, 389
+  size: 13, 12
+  orig: 13, 12
+  offset: 0, 0
+  index: -1
+3
+  rotate: false
+  xy: 284, 403
+  size: 11, 19
+  orig: 11, 19
+  offset: 0, 0
+  index: -1
+4
+  rotate: true
+  xy: 243, 36
+  size: 23, 26
+  orig: 23, 26
+  offset: 0, 0
+  index: -1
+5
+  rotate: false
+  xy: 142, 61
+  size: 38, 23
+  orig: 38, 23
+  offset: 0, 0
+  index: -1
+Da_1
+  rotate: true
+  xy: 2, 281
+  size: 141, 280
+  orig: 141, 280
+  offset: 0, 0
+  index: -1
+Da_2
+  rotate: true
+  xy: 2, 138
+  size: 141, 193
+  orig: 141, 193
+  offset: 0, 0
+  index: -1
+Da_3
+  rotate: true
+  xy: 2, 3
+  size: 133, 138
+  orig: 133, 138
+  offset: 0, 0
+  index: -1
+Da_4
+  rotate: true
+  xy: 197, 152
+  size: 127, 101
+  orig: 127, 101
+  offset: 0, 0
+  index: -1
+cloud
+  rotate: false
+  xy: 142, 2
+  size: 99, 57
+  orig: 100, 100
+  offset: 0, 23
+  index: -1
+cloud2
+  rotate: false
+  xy: 197, 61
+  size: 100, 89
+  orig: 100, 100
+  offset: 0, 10
+  index: -1
+snow
+  rotate: false
+  xy: 142, 86
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1

+ 12 - 0
assets/module_take_goblet/Spines/4color/freeze/skeleton.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "ed25db33-37e0-48b6-a7cb-16a48205e47d",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
assets/module_take_goblet/Spines/4color/freeze/skeleton.json


+ 11 - 0
assets/module_take_goblet/Spines/4color/freeze/skeleton.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "53478c81-aac9-44db-b837-a485346c5793",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

BIN
assets/module_take_goblet/Spines/4color/freeze/skeleton.png


+ 134 - 0
assets/module_take_goblet/Spines/4color/freeze/skeleton.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "0571dfef-c6b4-4d73-9a97-6af278e0470d",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "0571dfef-c6b4-4d73-9a97-6af278e0470d@6c48a",
+      "displayName": "skeleton",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "0571dfef-c6b4-4d73-9a97-6af278e0470d",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "nearest",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "0571dfef-c6b4-4d73-9a97-6af278e0470d@f9941",
+      "displayName": "skeleton",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 2,
+        "trimY": 2,
+        "width": 296,
+        "height": 420,
+        "rawWidth": 300,
+        "rawHeight": 424,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -148,
+            -210,
+            0,
+            148,
+            -210,
+            0,
+            -148,
+            210,
+            0,
+            148,
+            210,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            2,
+            422,
+            298,
+            422,
+            2,
+            2,
+            298,
+            2
+          ],
+          "nuv": [
+            0.006666666666666667,
+            0.0047169811320754715,
+            0.9933333333333333,
+            0.0047169811320754715,
+            0.006666666666666667,
+            0.9952830188679245,
+            0.9933333333333333,
+            0.9952830188679245
+          ],
+          "minPos": [
+            -148,
+            -210,
+            0
+          ],
+          "maxPos": [
+            148,
+            210,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "0571dfef-c6b4-4d73-9a97-6af278e0470d@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "0571dfef-c6b4-4d73-9a97-6af278e0470d@f9941"
+  }
+}

+ 2 - 2
assets/module_take_goblet/rooster_takegoblet.scene

@@ -258,7 +258,7 @@
       "__type__": "cc.Vec3",
       "x": 1,
       "y": 1,
-      "z": 1
+      "z": 0
     },
     "_mobility": 0,
     "_layer": 33554432,
@@ -3228,7 +3228,7 @@
     },
     "_enabled": true,
     "__prefab": null,
-    "_flags": 1,
+    "_flags": 3,
     "_top": 0,
     "_bottom": 0,
     "_left": 0,

+ 1 - 1
assets/start/Start.ts

@@ -146,7 +146,7 @@ export class Start extends Component {
                 bundle: 'module_take_goblet',
                 entryScene: 'rooster_takegoblet'
             }
-            tgxUIWaiting.show();
+            // tgxUIWaiting.show();
             assetManager.loadBundle(info.bundle, (err, bundle: AssetManager.Bundle) => {
                 if (bundle) {
                     director.loadScene(info.entryScene, () => {

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.