Selaa lähdekoodia

优化小细节

zouyong 5 vuotta sitten
vanhempi
commit
a947cb4f05

+ 218 - 82
assets/resources/module/login/login.prefab

@@ -24,23 +24,17 @@
         "__id__": 5
       },
       {
-        "__id__": 8
-      },
-      {
-        "__id__": 11
-      },
-      {
-        "__id__": 23
+        "__id__": 9
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -218,10 +212,13 @@
     "_components": [
       {
         "__id__": 6
+      },
+      {
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
@@ -246,7 +243,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        250,
+        412,
         0,
         0,
         0,
@@ -303,6 +300,33 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 5
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 1,
+    "_left": 0,
+    "_right": 0,
+    "_top": 100,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -315,20 +339,94 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New Label",
+    "_name": "New Node",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
     },
+    "_children": [
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 25
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 40
+      }
+    ],
+    "_prefab": {
+      "__id__": 41
+    },
+    "_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,
+        -592,
+        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.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 9
+    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 12
     },
     "_opacity": 255,
     "_color": {
@@ -340,7 +438,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 294.56,
+      "width": 257.74,
       "height": 40.32
     },
     "_anchorPoint": {
@@ -352,8 +450,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -146,
-        -350,
+        -153.797,
+        101.732,
         0,
         0,
         0,
@@ -382,7 +480,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "_materials": [
@@ -394,7 +492,7 @@
     "_dstBlendFactor": 771,
     "_string": "加载不消耗流量 11%",
     "_N$string": "加载不消耗流量 11%",
-    "_fontSize": 32,
+    "_fontSize": 28,
     "_lineHeight": 32,
     "_enableWrapText": true,
     "_N$file": null,
@@ -413,12 +511,12 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 1
+      "__id__": 13
     },
     "asset": {
-      "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
+      "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
     },
-    "fileId": "30Wgp76k9OxpMRH7NOr80p",
+    "fileId": "39wNmXM8NI4q4sJUt5JvJu",
     "sync": false
   },
   {
@@ -426,24 +524,24 @@
     "_name": "progressbar",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 9
     },
     "_children": [
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 15
+        "__id__": 17
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -468,7 +566,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -400,
+        48,
         0,
         0,
         0,
@@ -497,17 +595,17 @@
     "_name": "jindu1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 15
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 16
     },
     "_opacity": 255,
     "_color": {
@@ -561,7 +659,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "_materials": [
@@ -591,7 +689,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 11
+      "__id__": 13
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -604,21 +702,21 @@
     "_name": "jindu2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [
       {
-        "__id__": 16
+        "__id__": 18
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 21
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 22
     },
     "_opacity": 255,
     "_color": {
@@ -672,17 +770,17 @@
     "_name": "jindu2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 15
+      "__id__": 17
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 17
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -736,7 +834,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [
@@ -766,7 +864,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 11
+      "__id__": 13
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -779,7 +877,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 17
     },
     "_enabled": true,
     "_materials": [
@@ -799,7 +897,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 11
+      "__id__": 13
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -812,23 +910,23 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "bar": {
-      "__id__": 17
+      "__id__": 19
     },
     "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 11
+      "__id__": 13
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
     },
-    "fileId": "e2Kok419pI77OJ0gMBTris",
+    "fileId": "22+Ks22MtLML9dNeTqa3DQ",
     "sync": false
   },
   {
@@ -836,30 +934,30 @@
     "_name": "New Layout",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 9
     },
     "_children": [
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 27
+        "__id__": 29
       },
       {
-        "__id__": 30
+        "__id__": 32
       },
       {
-        "__id__": 33
+        "__id__": 35
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -884,7 +982,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -460,
+        0,
         0,
         0,
         0,
@@ -913,17 +1011,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 28
     },
     "_opacity": 200,
     "_color": {
@@ -977,7 +1075,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 26
     },
     "_enabled": true,
     "_materials": [
@@ -1013,7 +1111,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "e51obx80dFdojZY0tWKho7",
+    "fileId": "2a2bHbGPxNzaBkOiZarCDH",
     "sync": false
   },
   {
@@ -1021,17 +1119,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "_opacity": 200,
     "_color": {
@@ -1085,7 +1183,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 29
     },
     "_enabled": true,
     "_materials": [
@@ -1121,7 +1219,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "e4/fM3JyBIg7YHZ2rFZpV8",
+    "fileId": "95GeoX59ZJp5spv7GVBgna",
     "sync": false
   },
   {
@@ -1129,17 +1227,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_opacity": 200,
     "_color": {
@@ -1193,7 +1291,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 32
     },
     "_enabled": true,
     "_materials": [
@@ -1229,7 +1327,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "be5nb7dexJTKbXMHlwBmHP",
+    "fileId": "d0mRVEO1hIbr+7MG290nvm",
     "sync": false
   },
   {
@@ -1237,17 +1335,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 37
     },
     "_opacity": 200,
     "_color": {
@@ -1301,7 +1399,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "_materials": [
@@ -1337,7 +1435,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "8dN0+bb3dDLJ8R7GebdnIH",
+    "fileId": "achmLhzuBIo7UMLFoBN/Wg",
     "sync": false
   },
   {
@@ -1345,7 +1443,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 23
+      "__id__": 25
     },
     "_enabled": true,
     "_layoutSize": {
@@ -1380,7 +1478,45 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "07XcFI1dBFo5DvNXSz4pHI",
+    "fileId": "d8iZnhBxlN6Z+tevwjWta7",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 4,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 75,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
+    },
+    "fileId": "eaO0OvzchGqY/YK6jBmI7t",
     "sync": false
   },
   {
@@ -1392,16 +1528,16 @@
     },
     "_enabled": true,
     "bar": {
-      "__id__": 21
+      "__id__": 23
     },
     "lbl_progress": {
-      "__id__": 9
+      "__id__": 11
     },
     "lbl_server": {
-      "__id__": 28
+      "__id__": 30
     },
     "lbl_privacy": {
-      "__id__": 34
+      "__id__": 36
     },
     "_id": ""
   },

+ 6 - 6
assets/resources/module/setting/rule.prefab

@@ -114,7 +114,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1334
+      "height": 1700
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -231,7 +231,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 600,
-      "height": 800
+      "height": 1000
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -500,7 +500,7 @@
   {
     "__type__": "cc.Node",
     "_name": "content",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "_parent": {
       "__id__": 13
     },
@@ -568,7 +568,7 @@
   {
     "__type__": "cc.Node",
     "_name": "view",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "_parent": {
       "__id__": 5
     },
@@ -597,7 +597,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 600,
-      "height": 800
+      "height": 1000
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -971,7 +971,7 @@
       "ctor": "Float64Array",
       "array": [
         309.323,
-        413.911,
+        505.644,
         0,
         0,
         0,

+ 3 - 3
assets/resources/module/setting/setting.prefab

@@ -730,8 +730,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 117,
-      "height": 117
+      "width": 106,
+      "height": 106
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -783,7 +783,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "91323dba-2538-4897-b309-77ebd33f3368"
+      "__uuid__": "66810a82-f3a8-4023-90b7-c83a87a2e4a1"
     },
     "_type": 0,
     "_sizeMode": 1,

+ 162 - 42
assets/resources/module/sign/sign.prefab

@@ -21,26 +21,26 @@
         "__id__": 2
       },
       {
-        "__id__": 40
+        "__id__": 43
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 48
       },
       {
-        "__id__": 46
+        "__id__": 49
       },
       {
-        "__id__": 47
+        "__id__": 50
       },
       {
-        "__id__": 48
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 52
     },
     "_opacity": 255,
     "_color": {
@@ -111,16 +111,19 @@
       },
       {
         "__id__": 24
+      },
+      {
+        "__id__": 27
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 42
     },
     "_opacity": 255,
     "_color": {
@@ -668,8 +671,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 295,
-      "height": 87
+      "width": 313,
+      "height": 96
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -799,7 +802,7 @@
       "__id__": 2
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 22
@@ -900,6 +903,123 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "熊猫",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 25
+      }
+    ],
+    "_prefab": {
+      "__id__": 26
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1067.8,
+      "height": 691.36
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.39,
+      "y": 0
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        295.698,
+        -379.526,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.4,
+        0.4,
+        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__": 24
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
+      }
+    ],
+    "paused": false,
+    "defaultSkin": "default",
+    "defaultAnimation": "ue_2",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "loop": true,
+    "premultipliedAlpha": true,
+    "timeScale": 1,
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_skeletonCache": null,
+    "_animationName": "ue_2",
+    "_animationQueue": [],
+    "_headAniInfo": null,
+    "_playTimes": 0,
+    "_isAniComplete": true,
+    "_N$skeletonData": {
+      "__uuid__": "8de08dc2-a439-4a3c-b667-a56bec3c0f5d"
+    },
+    "_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__": "336fd143-f8e6-438c-bc88-e4fdf40e9791"
+    },
+    "fileId": "e2EUqd0uNOtqjmnhosXrMU",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "按钮_签到",
     "_objFlags": 0,
     "_parent": {
@@ -907,29 +1027,29 @@
     },
     "_children": [
       {
-        "__id__": 25
+        "__id__": 28
       },
       {
-        "__id__": 28
+        "__id__": 31
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 35
       },
       {
-        "__id__": 33
+        "__id__": 36
       },
       {
-        "__id__": 34
+        "__id__": 37
       },
       {
-        "__id__": 36
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -983,17 +1103,17 @@
     "_name": "视频图标",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 27
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 30
     },
     "_opacity": 255,
     "_color": {
@@ -1047,7 +1167,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 28
     },
     "_enabled": true,
     "_materials": [
@@ -1090,20 +1210,20 @@
     "_name": "按钮描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 27
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 32
       },
       {
-        "__id__": 30
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -1157,7 +1277,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 31
     },
     "_enabled": true,
     "_materials": [
@@ -1192,7 +1312,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 31
     },
     "_enabled": true,
     "_color": {
@@ -1221,7 +1341,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 27
     },
     "_enabled": true,
     "_materials": [
@@ -1253,7 +1373,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 27
     },
     "_enabled": true,
     "_defaultClip": {
@@ -1272,7 +1392,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 27
     },
     "_enabled": true,
     "_normalMaterial": {
@@ -1285,7 +1405,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 35
+        "__id__": 38
       }
     ],
     "_N$interactable": true,
@@ -1341,7 +1461,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 24
+      "__id__": 27
     },
     "_id": ""
   },
@@ -1360,7 +1480,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 27
     },
     "_enabled": true,
     "normal": {
@@ -1432,17 +1552,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 44
       },
       {
-        "__id__": 42
+        "__id__": 45
       },
       {
-        "__id__": 43
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1496,7 +1616,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 40
+      "__id__": 43
     },
     "_enabled": true,
     "_materials": [
@@ -1528,7 +1648,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 40
+      "__id__": 43
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1596,7 +1716,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 40
+      "__id__": 43
     },
     "_enabled": true,
     "node_panel": {
@@ -1656,7 +1776,7 @@
       "__id__": 12
     },
     "anim_btn": {
-      "__id__": 33
+      "__id__": 36
     },
     "_id": ""
   },

+ 213 - 93
assets/resources/module/turnable/turnable.prefab

@@ -14,7 +14,7 @@
   {
     "__type__": "cc.Node",
     "_name": "turnable",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "_parent": null,
     "_children": [
       {
@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 92
       },
       {
-        "__id__": 90
+        "__id__": 93
       },
       {
-        "__id__": 91
+        "__id__": 94
       }
     ],
     "_prefab": {
-      "__id__": 92
+      "__id__": 95
     },
     "_opacity": 255,
     "_color": {
@@ -110,16 +110,19 @@
         "__id__": 39
       },
       {
-        "__id__": 54
+        "__id__": 42
       },
       {
-        "__id__": 60
+        "__id__": 57
+      },
+      {
+        "__id__": 63
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 88
+      "__id__": 91
     },
     "_opacity": 255,
     "_color": {
@@ -1221,7 +1224,7 @@
       "__id__": 2
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 37
@@ -1322,6 +1325,123 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "panda",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 40
+      }
+    ],
+    "_prefab": {
+      "__id__": 41
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1498.81,
+      "height": 754.66
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -229.1,
+        -333.167,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.4,
+        0.4,
+        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__": 39
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
+      }
+    ],
+    "paused": false,
+    "defaultSkin": "default",
+    "defaultAnimation": "ue_2",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "loop": true,
+    "premultipliedAlpha": true,
+    "timeScale": 1,
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_skeletonCache": null,
+    "_animationName": "ue_2",
+    "_animationQueue": [],
+    "_headAniInfo": null,
+    "_playTimes": 0,
+    "_isAniComplete": true,
+    "_N$skeletonData": {
+      "__uuid__": "35d03fbf-2b63-4d0e-b621-be53decefa7f"
+    },
+    "_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__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
+    },
+    "fileId": "66EJi4gotBLaRbfWp2mT2T",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "说明文字",
     "_objFlags": 0,
     "_parent": {
@@ -1329,23 +1449,23 @@
     },
     "_children": [
       {
-        "__id__": 40
+        "__id__": 43
       },
       {
-        "__id__": 44
+        "__id__": 47
       },
       {
-        "__id__": 48
+        "__id__": 51
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -1399,20 +1519,20 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 39
+      "__id__": 42
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 44
       },
       {
-        "__id__": 42
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 46
     },
     "_opacity": 255,
     "_color": {
@@ -1467,7 +1587,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 40
+      "__id__": 43
     },
     "_enabled": true,
     "_materials": [
@@ -1502,7 +1622,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 40
+      "__id__": 43
     },
     "_enabled": true,
     "_color": {
@@ -1523,7 +1643,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "d9qXROJJxDhbMRURw8TQOW",
+    "fileId": "f6tuJ5jFlFip6nHjrduQFd",
     "sync": false
   },
   {
@@ -1531,20 +1651,20 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 39
+      "__id__": 42
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 48
       },
       {
-        "__id__": 46
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -1599,7 +1719,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 47
     },
     "_enabled": true,
     "_materials": [
@@ -1634,7 +1754,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 47
     },
     "_enabled": true,
     "_color": {
@@ -1655,7 +1775,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "e89W13bEZM7owIrR1QGuv0",
+    "fileId": "5cJIFvj6lPG7/GTYY5N1B2",
     "sync": false
   },
   {
@@ -1663,20 +1783,20 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 39
+      "__id__": 42
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 49
+        "__id__": 52
       },
       {
-        "__id__": 50
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -1731,7 +1851,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 51
     },
     "_enabled": true,
     "_materials": [
@@ -1766,7 +1886,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 51
     },
     "_enabled": true,
     "_color": {
@@ -1787,7 +1907,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "4at8zBI49L8LbfNwS85Dzj",
+    "fileId": "abkHafjuBMLblyahQ/y9qY",
     "sync": false
   },
   {
@@ -1795,7 +1915,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 42
     },
     "_enabled": true,
     "_fontFamily": "Arial",
@@ -1833,17 +1953,17 @@
     },
     "_children": [
       {
-        "__id__": 55
+        "__id__": 58
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 62
     },
     "_opacity": 255,
     "_color": {
@@ -1897,17 +2017,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 54
+      "__id__": 57
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 59
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 60
     },
     "_opacity": 255,
     "_color": {
@@ -1962,7 +2082,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 55
+      "__id__": 58
     },
     "_enabled": true,
     "_materials": [
@@ -2000,7 +2120,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "1f18lEFXVA07dbnzDQdg5r",
+    "fileId": "beaxjWMHJC3bTK6u5mpzp9",
     "sync": false
   },
   {
@@ -2008,7 +2128,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 54
+      "__id__": 57
     },
     "_enabled": true,
     "_fontFamily": "Arial",
@@ -2046,23 +2166,23 @@
     },
     "_children": [
       {
-        "__id__": 61
+        "__id__": 64
       },
       {
-        "__id__": 69
+        "__id__": 72
       },
       {
-        "__id__": 77
+        "__id__": 80
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 85
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 87
+      "__id__": 90
     },
     "_opacity": 255,
     "_color": {
@@ -2116,20 +2236,20 @@
     "_name": "正常",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 60
+      "__id__": 63
     },
     "_children": [
       {
-        "__id__": 62
+        "__id__": 65
       },
       {
-        "__id__": 65
+        "__id__": 68
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 68
+      "__id__": 71
     },
     "_opacity": 255,
     "_color": {
@@ -2183,17 +2303,17 @@
     "_name": "button_cj",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 61
+      "__id__": 64
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 63
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 67
     },
     "_opacity": 255,
     "_color": {
@@ -2247,7 +2367,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 62
+      "__id__": 65
     },
     "_enabled": true,
     "_materials": [
@@ -2290,17 +2410,17 @@
     "_name": "icon_tv",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 61
+      "__id__": 64
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 70
     },
     "_opacity": 255,
     "_color": {
@@ -2354,7 +2474,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 65
+      "__id__": 68
     },
     "_enabled": true,
     "_materials": [
@@ -2408,20 +2528,20 @@
     "_name": "按下",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 60
+      "__id__": 63
     },
     "_children": [
       {
-        "__id__": 70
+        "__id__": 73
       },
       {
-        "__id__": 73
+        "__id__": 76
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 76
+      "__id__": 79
     },
     "_opacity": 255,
     "_color": {
@@ -2475,17 +2595,17 @@
     "_name": "button_cj",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 69
+      "__id__": 72
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 71
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 75
     },
     "_opacity": 255,
     "_color": {
@@ -2539,7 +2659,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 70
+      "__id__": 73
     },
     "_enabled": true,
     "_materials": [
@@ -2582,17 +2702,17 @@
     "_name": "icon_tv",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 69
+      "__id__": 72
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2646,7 +2766,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 73
+      "__id__": 76
     },
     "_enabled": true,
     "_materials": [
@@ -2700,20 +2820,20 @@
     "_name": "禁用",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 60
+      "__id__": 63
     },
     "_children": [
       {
-        "__id__": 78
+        "__id__": 81
       },
       {
-        "__id__": 81
+        "__id__": 84
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 84
+      "__id__": 87
     },
     "_opacity": 255,
     "_color": {
@@ -2767,17 +2887,17 @@
     "_name": "button_cj",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 77
+      "__id__": 80
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 79
+        "__id__": 82
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 83
     },
     "_opacity": 255,
     "_color": {
@@ -2831,7 +2951,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 78
+      "__id__": 81
     },
     "_enabled": true,
     "_materials": [
@@ -2874,17 +2994,17 @@
     "_name": "icon_tv",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 77
+      "__id__": 80
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 85
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 86
     },
     "_opacity": 255,
     "_color": {
@@ -2938,7 +3058,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 81
+      "__id__": 84
     },
     "_enabled": true,
     "_materials": [
@@ -2992,21 +3112,21 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 60
+      "__id__": 63
     },
     "_enabled": true,
     "node_normal": {
-      "__id__": 61
+      "__id__": 64
     },
     "node_pressed": {
-      "__id__": 69
+      "__id__": 72
     },
     "node_disabled": {
-      "__id__": 77
+      "__id__": 80
     },
     "onClick": [
       {
-        "__id__": 86
+        "__id__": 89
       }
     ],
     "_id": ""
@@ -3075,13 +3195,13 @@
       }
     ],
     "btn_draw": {
-      "__id__": 60
+      "__id__": 63
     },
     "btn_close": {
       "__id__": 7
     },
     "lbl_left": {
-      "__id__": 58
+      "__id__": 61
     },
     "_id": ""
   },

+ 335 - 0
assets/resources/spine/chengnian.atlas

@@ -0,0 +1,335 @@
+
+chengnian.png
+size: 1609,780
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+01
+  rotate: true
+  xy: 1201, 339
+  size: 165, 273
+  orig: 165, 273
+  offset: 0, 0
+  index: -1
+03
+  rotate: true
+  xy: 1228, 506
+  size: 272, 291
+  orig: 272, 291
+  offset: 0, 0
+  index: -1
+04
+  rotate: false
+  xy: 2, 109
+  size: 356, 356
+  orig: 356, 356
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 401, 269
+  size: 152, 196
+  orig: 152, 196
+  offset: 0, 0
+  index: -1
+erduo
+  rotate: false
+  xy: 814, 366
+  size: 385, 166
+  orig: 385, 166
+  offset: 0, 0
+  index: -1
+erji1
+  rotate: false
+  xy: 814, 534
+  size: 412, 244
+  orig: 414, 248
+  offset: 1, 3
+  index: -1
+erji2
+  rotate: false
+  xy: 434, 2
+  size: 80, 154
+  orig: 82, 157
+  offset: 1, 1
+  index: -1
+eye1-1
+  rotate: true
+  xy: 1232, 17
+  size: 73, 87
+  orig: 75, 89
+  offset: 1, 1
+  index: -1
+eye1-2
+  rotate: false
+  xy: 1469, 42
+  size: 73, 87
+  orig: 75, 89
+  offset: 1, 1
+  index: -1
+eye1-3
+  rotate: false
+  xy: 660, 2
+  size: 109, 104
+  orig: 111, 106
+  offset: 1, 1
+  index: -1
+eye1-4
+  rotate: false
+  xy: 771, 2
+  size: 109, 104
+  orig: 112, 106
+  offset: 2, 1
+  index: -1
+eye2-1
+  rotate: true
+  xy: 1406, 37
+  size: 105, 61
+  orig: 107, 63
+  offset: 1, 1
+  index: -1
+eye2-2
+  rotate: true
+  xy: 1544, 39
+  size: 90, 61
+  orig: 92, 63
+  offset: 1, 1
+  index: -1
+eye3
+  rotate: false
+  xy: 1350, 209
+  size: 122, 128
+  orig: 127, 133
+  offset: 3, 2
+  index: -1
+eye3-2
+  rotate: false
+  xy: 1474, 196
+  size: 128, 128
+  orig: 132, 133
+  offset: 2, 2
+  index: -1
+eye4-1
+  rotate: false
+  xy: 2, 20
+  size: 337, 87
+  orig: 344, 98
+  offset: 2, 5
+  index: -1
+eye4-2
+  rotate: true
+  xy: 360, 194
+  size: 271, 39
+  orig: 274, 41
+  offset: 1, 1
+  index: -1
+face
+  rotate: false
+  xy: 447, 473
+  size: 365, 305
+  orig: 367, 307
+  offset: 1, 1
+  index: -1
+kuzi
+  rotate: false
+  xy: 962, 137
+  size: 153, 87
+  orig: 153, 87
+  offset: 0, 0
+  index: -1
+meimao1
+  rotate: true
+  xy: 360, 122
+  size: 70, 22
+  orig: 72, 24
+  offset: 1, 1
+  index: -1
+meimao2
+  rotate: false
+  xy: 1145, 27
+  size: 60, 21
+  orig: 62, 23
+  offset: 1, 1
+  index: -1
+shou-jita
+  rotate: false
+  xy: 1321, 42
+  size: 83, 100
+  orig: 86, 103
+  offset: 2, 2
+  index: -1
+shou-jita2
+  rotate: false
+  xy: 341, 2
+  size: 91, 105
+  orig: 94, 108
+  offset: 1, 1
+  index: -1
+shou-jita3
+  rotate: false
+  xy: 2, 467
+  size: 443, 311
+  orig: 445, 313
+  offset: 1, 1
+  index: -1
+shou-jita4
+  rotate: false
+  xy: 1232, 92
+  size: 87, 105
+  orig: 113, 111
+  offset: 1, 5
+  index: -1
+shou1
+  rotate: true
+  xy: 555, 243
+  size: 90, 171
+  orig: 98, 173
+  offset: 1, 1
+  index: -1
+shou10
+  rotate: true
+  xy: 728, 235
+  size: 98, 75
+  orig: 100, 77
+  offset: 1, 1
+  index: -1
+shou11
+  rotate: true
+  xy: 401, 158
+  size: 109, 152
+  orig: 112, 154
+  offset: 2, 1
+  index: -1
+shou12
+  rotate: false
+  xy: 1145, 50
+  size: 85, 147
+  orig: 85, 147
+  offset: 0, 0
+  index: -1
+shou2
+  rotate: false
+  xy: 1521, 639
+  size: 86, 139
+  orig: 97, 141
+  offset: 10, 1
+  index: -1
+shou3
+  rotate: false
+  xy: 1521, 498
+  size: 86, 139
+  orig: 96, 141
+  offset: 1, 1
+  index: -1
+shou4
+  rotate: false
+  xy: 1474, 131
+  size: 130, 63
+  orig: 132, 65
+  offset: 1, 1
+  index: -1
+shou5
+  rotate: false
+  xy: 555, 118
+  size: 155, 123
+  orig: 155, 123
+  offset: 0, 0
+  index: -1
+shou6
+  rotate: false
+  xy: 810, 241
+  size: 155, 123
+  orig: 155, 123
+  offset: 0, 0
+  index: -1
+shou7
+  rotate: true
+  xy: 967, 226
+  size: 138, 151
+  orig: 138, 151
+  offset: 0, 0
+  index: -1
+shou8
+  rotate: true
+  xy: 1198, 199
+  size: 138, 150
+  orig: 138, 150
+  offset: 0, 0
+  index: -1
+shou9
+  rotate: false
+  xy: 1476, 326
+  size: 123, 170
+  orig: 123, 170
+  offset: 0, 0
+  index: -1
+toufa
+  rotate: false
+  xy: 516, 7
+  size: 142, 109
+  orig: 142, 109
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 1120, 243
+  size: 76, 121
+  orig: 76, 121
+  offset: 0, 0
+  index: -1
+tui2
+  rotate: true
+  xy: 1350, 144
+  size: 63, 122
+  orig: 63, 122
+  offset: 0, 0
+  index: -1
+weijin1
+  rotate: false
+  xy: 1098, 10
+  size: 45, 125
+  orig: 45, 125
+  offset: 0, 0
+  index: -1
+weijin2
+  rotate: true
+  xy: 726, 335
+  size: 136, 82
+  orig: 139, 85
+  offset: 2, 2
+  index: -1
+yifu
+  rotate: false
+  xy: 555, 335
+  size: 169, 136
+  orig: 169, 136
+  offset: 0, 0
+  index: -1
+zui1-2
+  rotate: false
+  xy: 712, 108
+  size: 117, 125
+  orig: 133, 131
+  offset: 5, 5
+  index: -1
+zui1-2-2
+  rotate: false
+  xy: 882, 3
+  size: 117, 109
+  orig: 133, 112
+  offset: 5, 2
+  index: -1
+zui1-3
+  rotate: true
+  xy: 1001, 14
+  size: 121, 95
+  orig: 133, 101
+  offset: 5, 5
+  index: -1
+zui2-1
+  rotate: false
+  xy: 831, 114
+  size: 129, 125
+  orig: 158, 131
+  offset: 6, 5
+  index: -1

+ 5 - 0
assets/resources/spine/chengnian.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "580216f6-a0b4-45df-89d5-849ddcb562f3",
+  "subMetas": {}
+}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 169 - 0
assets/resources/spine/chengnian.json


+ 9 - 0
assets/resources/spine/chengnian.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "35d03fbf-2b63-4d0e-b621-be53decefa7f",
+  "textures": [
+    "fa33082c-b4f3-436c-b235-64e49d1c00fe"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

BIN
assets/resources/spine/chengnian.png


+ 36 - 0
assets/resources/spine/chengnian.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "fa33082c-b4f3-436c-b235-64e49d1c00fe",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 1609,
+  "height": 780,
+  "platformSettings": {},
+  "subMetas": {
+    "chengnian": {
+      "ver": "1.0.4",
+      "uuid": "f94dc61d-4cdd-4533-98aa-b8af17343295",
+      "rawTextureUuid": "fa33082c-b4f3-436c-b235-64e49d1c00fe",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 1605,
+      "height": 776,
+      "rawWidth": 1609,
+      "rawHeight": 780,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 251 - 0
assets/resources/spine/shaonian.atlas

@@ -0,0 +1,251 @@
+
+shaonian.png
+size: 1137,528
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+body
+  rotate: true
+  xy: 815, 368
+  size: 158, 173
+  orig: 158, 173
+  offset: 0, 0
+  index: -1
+dengpao
+  rotate: false
+  xy: 2, 3
+  size: 188, 230
+  orig: 201, 236
+  offset: 8, 1
+  index: -1
+erduo
+  rotate: false
+  xy: 387, 362
+  size: 426, 164
+  orig: 426, 164
+  offset: 0, 0
+  index: -1
+eye1-1
+  rotate: false
+  xy: 1057, 264
+  size: 76, 93
+  orig: 78, 95
+  offset: 1, 1
+  index: -1
+eye1-2
+  rotate: true
+  xy: 513, 135
+  size: 77, 92
+  orig: 79, 94
+  offset: 1, 1
+  index: -1
+eye1-3
+  rotate: true
+  xy: 510, 16
+  size: 117, 111
+  orig: 119, 113
+  offset: 1, 1
+  index: -1
+eye1-4
+  rotate: true
+  xy: 738, 178
+  size: 117, 111
+  orig: 120, 113
+  offset: 2, 1
+  index: -1
+eye2-1
+  rotate: true
+  xy: 731, 57
+  size: 114, 65
+  orig: 116, 68
+  offset: 1, 2
+  index: -1
+eye2-2
+  rotate: true
+  xy: 957, 66
+  size: 97, 65
+  orig: 99, 68
+  offset: 1, 2
+  index: -1
+face
+  rotate: false
+  xy: 2, 235
+  size: 383, 291
+  orig: 385, 293
+  offset: 1, 1
+  index: -1
+kuzi
+  rotate: false
+  xy: 355, 147
+  size: 156, 78
+  orig: 156, 78
+  offset: 0, 0
+  index: -1
+lingjin
+  rotate: true
+  xy: 869, 7
+  size: 57, 105
+  orig: 59, 107
+  offset: 1, 1
+  index: -1
+meimao1
+  rotate: false
+  xy: 798, 55
+  size: 69, 24
+  orig: 73, 26
+  offset: 2, 1
+  index: -1
+meimao2
+  rotate: true
+  xy: 780, 298
+  size: 62, 23
+  orig: 64, 25
+  offset: 1, 1
+  index: -1
+shou1-2
+  rotate: false
+  xy: 192, 123
+  size: 161, 110
+  orig: 161, 110
+  offset: 0, 0
+  index: -1
+shou2-2-copy
+  rotate: true
+  xy: 607, 173
+  size: 122, 129
+  orig: 122, 129
+  offset: 0, 0
+  index: -1
+shou3-2
+  rotate: true
+  xy: 387, 227
+  size: 94, 152
+  orig: 101, 154
+  offset: 1, 1
+  index: -1
+shou4-2
+  rotate: true
+  xy: 192, 2
+  size: 119, 122
+  orig: 119, 122
+  offset: 0, 0
+  index: -1
+shou4-3
+  rotate: true
+  xy: 316, 2
+  size: 119, 122
+  orig: 119, 122
+  offset: 0, 0
+  index: -1
+shou5-1
+  rotate: false
+  xy: 1044, 179
+  size: 84, 83
+  orig: 86, 85
+  offset: 1, 1
+  index: -1
+shou5-2
+  rotate: false
+  xy: 798, 81
+  size: 85, 82
+  orig: 87, 85
+  offset: 1, 1
+  index: -1
+shou6-1
+  rotate: true
+  xy: 440, 18
+  size: 127, 68
+  orig: 129, 70
+  offset: 1, 1
+  index: -1
+shou6-2
+  rotate: true
+  xy: 885, 67
+  size: 96, 70
+  orig: 98, 72
+  offset: 1, 1
+  index: -1
+shou6-3
+  rotate: false
+  xy: 387, 323
+  size: 218, 37
+  orig: 220, 39
+  offset: 1, 1
+  index: -1
+shou6-4
+  rotate: true
+  xy: 623, 5
+  size: 40, 103
+  orig: 42, 105
+  offset: 1, 1
+  index: -1
+shou6-5
+  rotate: false
+  xy: 976, 3
+  size: 87, 61
+  orig: 89, 63
+  offset: 1, 1
+  index: -1
+shou7-1
+  rotate: true
+  xy: 607, 297
+  size: 63, 171
+  orig: 65, 173
+  offset: 1, 1
+  index: -1
+toufa
+  rotate: false
+  xy: 851, 165
+  size: 112, 93
+  orig: 112, 93
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 541, 214
+  size: 64, 107
+  orig: 66, 109
+  offset: 1, 1
+  index: -1
+tui2
+  rotate: false
+  xy: 1024, 66
+  size: 61, 106
+  orig: 63, 108
+  offset: 1, 1
+  index: -1
+yifu
+  rotate: true
+  xy: 990, 359
+  size: 167, 145
+  orig: 168, 146
+  offset: 1, 1
+  index: -1
+zui1-2
+  rotate: false
+  xy: 851, 260
+  size: 101, 106
+  orig: 112, 112
+  offset: 4, 4
+  index: -1
+zui1-3
+  rotate: false
+  xy: 954, 277
+  size: 101, 80
+  orig: 112, 87
+  offset: 4, 5
+  index: -1
+zui1-4
+  rotate: true
+  xy: 965, 174
+  size: 101, 77
+  orig: 112, 84
+  offset: 4, 5
+  index: -1
+zui2-1
+  rotate: true
+  xy: 623, 47
+  size: 124, 106
+  orig: 134, 112
+  offset: 5, 4
+  index: -1

+ 5 - 0
assets/resources/spine/shaonian.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "6c81d684-e6d4-47f3-8c1d-4879a72ddbb7",
+  "subMetas": {}
+}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 110 - 0
assets/resources/spine/shaonian.json


+ 9 - 0
assets/resources/spine/shaonian.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "8de08dc2-a439-4a3c-b667-a56bec3c0f5d",
+  "textures": [
+    "c4f1ee35-0cc8-4281-a7d2-ee5001d181a3"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

BIN
assets/resources/spine/shaonian.png


+ 36 - 0
assets/resources/spine/shaonian.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c4f1ee35-0cc8-4281-a7d2-ee5001d181a3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 1137,
+  "height": 528,
+  "platformSettings": {},
+  "subMetas": {
+    "shaonian": {
+      "ver": "1.0.4",
+      "uuid": "8b9bfd1d-30cd-4544-a7f7-b8db54c9c14c",
+      "rawTextureUuid": "c4f1ee35-0cc8-4281-a7d2-ee5001d181a3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 2,
+      "trimY": 3,
+      "width": 1133,
+      "height": 523,
+      "rawWidth": 1137,
+      "rawHeight": 528,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 1 - 0
assets/script/game/data/AppData.ts

@@ -48,6 +48,7 @@ export class AppData {
      * @param info  info(Java返回)
      */
     public updateDeviceInfo(info) {
+        mk.console.logSingle("updateDeviceInfo",info)
         let arr = info.split('#')
         this.machineInfo.android_id = arr[0];
         this.machineInfo.idfa = arr[1];

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä