baowen 4 днів тому
батько
коміт
4d737b2281
41 змінених файлів з 781 додано та 449 видалено
  1. BIN
      assets/hall/image/levelbg/level106.png
  2. 1 1
      assets/hall/image/levelbg/level106.png.meta
  3. 23 4
      assets/hall/script/BaseZhaocha.ts
  4. BIN
      assets/unit104/image/bg.jpg
  5. 26 26
      assets/unit104/image/bg.jpg.meta
  6. BIN
      assets/unit104/image/item0.png
  7. BIN
      assets/unit104/image/item1.png
  8. BIN
      assets/unit104/image/item10.png
  9. BIN
      assets/unit104/image/item11.png
  10. BIN
      assets/unit104/image/item2.png
  11. BIN
      assets/unit104/image/item3.png
  12. BIN
      assets/unit104/image/item4.png
  13. BIN
      assets/unit104/image/item5.png
  14. BIN
      assets/unit104/image/item6.png
  15. BIN
      assets/unit104/image/item7.png
  16. BIN
      assets/unit104/image/item8.png
  17. BIN
      assets/unit104/image/item9.png
  18. BIN
      assets/unit104/image/zhangai.png
  19. 1 1
      assets/unit104/image/zhangai.png.meta
  20. BIN
      assets/unit104/image/病鸡乱投医.jpg
  21. 0 134
      assets/unit104/image/病鸡乱投医.jpg.meta
  22. BIN
      assets/unit105/image/bg.png
  23. 33 33
      assets/unit105/image/bg.png.meta
  24. BIN
      assets/unit105/image/悬壶济世.jpg
  25. 575 158
      assets/unit105/prefab/game.prefab
  26. 1 1
      assets/unit105/script/unit105.ts
  27. 6 6
      assets/unit106/image/bg.png.meta
  28. 29 13
      assets/unit106/prefab/game.prefab
  29. 2 2
      assets/unit106/script/unit106.ts
  30. 12 5
      assets/unit106/spine/7.1_sr.atlas
  31. 1 1
      assets/unit106/spine/7.1_sr.atlas.meta
  32. 0 0
      assets/unit106/spine/7.1_sr.json
  33. 2 2
      assets/unit106/spine/7.1_sr.json.meta
  34. BIN
      assets/unit106/spine/7.1_sr.png
  35. 20 20
      assets/unit106/spine/7.1_sr.png.meta
  36. 12 5
      assets/unit106/spine/7.1_ss.atlas
  37. 1 1
      assets/unit106/spine/7.1_ss.atlas.meta
  38. 0 0
      assets/unit106/spine/7.1_ss.json
  39. 2 2
      assets/unit106/spine/7.1_ss.json.meta
  40. BIN
      assets/unit106/spine/7.1_ss.png
  41. 34 34
      assets/unit106/spine/7.1_ss.png.meta

BIN
assets/hall/image/levelbg/level106.png


+ 1 - 1
assets/hall/image/levelbg/level106.png.meta

@@ -127,7 +127,7 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": true,
+    "hasAlpha": false,
     "fixAlphaTransparencyArtifacts": false,
     "redirect": "3343a970-68bd-4907-baa0-473910c96399@6c48a"
   }

+ 23 - 4
assets/hall/script/BaseZhaocha.ts

@@ -1,4 +1,4 @@
-import { _decorator, color, Color, Component, EventTouch, find, instantiate, Label, log, Node, Prefab, ScrollView, Sprite, tween, UIOpacity, UITransform, Vec2, Vec3 } from 'cc';
+import { _decorator, CCInteger, CCString, color, Color, Component, EventTouch, find, instantiate, Label, log, Node, Prefab, ScrollView, Sprite, tween, UIOpacity, UITransform, Vec2, Vec3 } from 'cc';
 import EventMgr from '../../script/Manager/EventMgr';
 import { LayerMgr } from '../../script/Manager/LayerMgr';
 import { GameCfg } from '../../script/Config/GameCfg';
@@ -24,6 +24,7 @@ export class BaseZhaocha extends Component {
 
     arr_areadygetnum: Array<number> = []
 
+
     answerName: Array<string> = [
         // "安全带",
         // "可乐",
@@ -159,11 +160,16 @@ export class BaseZhaocha extends Component {
         // }
         return this.sv_cha.content.children[this.arr_areadygetnum.length - 1]
     }
-
     ShowTishi() {
+
+        console.log(this.num_showTip)
         for (let index = 0; index < this.answerName.length; index++) {
             if (this.arr_areadygetnum.indexOf(index) == -1 && !this.arr_node_allitem[index].getComponent(Sprite).color.equals(Color.GREEN)) {
-                if (this.num_showTip == index) {
+                if (this.tishi_indexs.length != 0) {
+                    let idx = this.tishi_indexs.pop()
+                    this.ShowTishiView2(this.arr_tishi[idx])
+                }
+                else if (this.num_showTip == index) {
                     // if (this.arr_node_allitem[index].active) {
                     //     this.arr_node_allitem[index].getComponent(Sprite).color = Color.YELLOW//new Color(57, 226, 42, 255)
                     //     console.log("active = true")
@@ -188,13 +194,26 @@ export class BaseZhaocha extends Component {
     }
 
     num_showTip = -1
-    str_tishi = ""
+    protected str_tishi = ""
+
+    @property([CCString])
+    public arr_tishi: Array<string> = []
+
+    @property([CCInteger])
+    public tishi_indexs: Array<number> = []
+
     ShowTishiView() {
         LayerMgr.instance.ShowPrefab(BundleName.hall, "prefab/page_tishi", (node) => {
             node.getComponent(page_tishi).Init(this.str_tishi)
         })
     }
 
+    ShowTishiView2(str: string) {
+        LayerMgr.instance.ShowPrefab(BundleName.hall, "prefab/page_tishi", (node) => {
+            node.getComponent(page_tishi).Init(str)
+        })
+    }
+
     protected onDestroy(): void {
         console.log("退出关卡")
         this.unscheduleAllCallbacks()

BIN
assets/unit104/image/bg.jpg


+ 26 - 26
assets/unit104/image/bg.jpg.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "c23e3a19-2cde-4018-b787-ece1d26351f9",
+  "uuid": "b42c65a0-86a4-45d7-b2d8-6de1e4de5316",
   "files": [
     ".jpg",
     ".json"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "c23e3a19-2cde-4018-b787-ece1d26351f9@6c48a",
+      "uuid": "b42c65a0-86a4-45d7-b2d8-6de1e4de5316@6c48a",
       "displayName": "bg",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "c23e3a19-2cde-4018-b787-ece1d26351f9",
+        "imageUuidOrDatabaseUri": "b42c65a0-86a4-45d7-b2d8-6de1e4de5316",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "c23e3a19-2cde-4018-b787-ece1d26351f9@f9941",
+      "uuid": "b42c65a0-86a4-45d7-b2d8-6de1e4de5316@f9941",
       "displayName": "bg",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 1730,
-        "height": 2306,
-        "rawWidth": 1730,
-        "rawHeight": 2306,
+        "width": 1104,
+        "height": 1472,
+        "rawWidth": 1104,
+        "rawHeight": 1472,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -865,
-            -1153,
+            -552,
+            -736,
             0,
-            865,
-            -1153,
+            552,
+            -736,
             0,
-            -865,
-            1153,
+            -552,
+            736,
             0,
-            865,
-            1153,
+            552,
+            736,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            2306,
-            1730,
-            2306,
+            1472,
+            1104,
+            1472,
             0,
             0,
-            1730,
+            1104,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -865,
-            -1153,
+            -552,
+            -736,
             0
           ],
           "maxPos": [
-            865,
-            1153,
+            552,
+            736,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "c23e3a19-2cde-4018-b787-ece1d26351f9@6c48a",
+        "imageUuidOrDatabaseUri": "b42c65a0-86a4-45d7-b2d8-6de1e4de5316@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": false,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "c23e3a19-2cde-4018-b787-ece1d26351f9@6c48a"
+    "redirect": "b42c65a0-86a4-45d7-b2d8-6de1e4de5316@6c48a"
   }
 }

BIN
assets/unit104/image/item0.png


BIN
assets/unit104/image/item1.png


BIN
assets/unit104/image/item10.png


BIN
assets/unit104/image/item11.png


BIN
assets/unit104/image/item2.png


BIN
assets/unit104/image/item3.png


BIN
assets/unit104/image/item4.png


BIN
assets/unit104/image/item5.png


BIN
assets/unit104/image/item6.png


BIN
assets/unit104/image/item7.png


BIN
assets/unit104/image/item8.png


BIN
assets/unit104/image/item9.png


BIN
assets/unit104/image/zhangai.png


+ 1 - 1
assets/unit104/image/zhangai.png.meta

@@ -127,7 +127,7 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": true,
+    "hasAlpha": false,
     "fixAlphaTransparencyArtifacts": false,
     "redirect": "15222f1b-2a6d-4bfe-aa1d-1fdd72660942@6c48a"
   }

BIN
assets/unit104/image/病鸡乱投医.jpg


+ 0 - 134
assets/unit104/image/病鸡乱投医.jpg.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "b42c65a0-86a4-45d7-b2d8-6de1e4de5316",
-  "files": [
-    ".jpg",
-    ".json"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "b42c65a0-86a4-45d7-b2d8-6de1e4de5316@6c48a",
-      "displayName": "病鸡乱投医",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "b42c65a0-86a4-45d7-b2d8-6de1e4de5316",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "b42c65a0-86a4-45d7-b2d8-6de1e4de5316@f9941",
-      "displayName": "病鸡乱投医",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 1104,
-        "height": 1472,
-        "rawWidth": 1104,
-        "rawHeight": 1472,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -552,
-            -736,
-            0,
-            552,
-            -736,
-            0,
-            -552,
-            736,
-            0,
-            552,
-            736,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            1472,
-            1104,
-            1472,
-            0,
-            0,
-            1104,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -552,
-            -736,
-            0
-          ],
-          "maxPos": [
-            552,
-            736,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "b42c65a0-86a4-45d7-b2d8-6de1e4de5316@6c48a",
-        "atlasUuid": "",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": false,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "b42c65a0-86a4-45d7-b2d8-6de1e4de5316@6c48a"
-  }
-}

BIN
assets/unit105/image/bg.png


+ 33 - 33
assets/unit105/image/bg.png.meta

@@ -42,13 +42,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 1,
+        "offsetY": -0.5,
+        "trimX": 0,
         "trimY": 1,
-        "width": 3000,
-        "height": 4284,
+        "width": 3002,
+        "height": 4014,
         "rawWidth": 3002,
-        "rawHeight": 4286,
+        "rawHeight": 4015,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -1500,
-            -2142,
+            -1501,
+            -2007,
             0,
-            1500,
-            -2142,
+            1501,
+            -2007,
             0,
-            -1500,
-            2142,
+            -1501,
+            2007,
             0,
-            1500,
-            2142,
+            1501,
+            2007,
             0
           ],
           "indexes": [
@@ -82,33 +82,33 @@
             3
           ],
           "uv": [
-            1,
-            4285,
-            3001,
-            4285,
-            1,
-            1,
-            3001,
-            1
+            0,
+            4014,
+            3002,
+            4014,
+            0,
+            0,
+            3002,
+            0
           ],
           "nuv": [
-            0.00033311125916055963,
-            0.0002333177788147457,
-            0.9996668887408394,
-            0.0002333177788147457,
-            0.00033311125916055963,
-            0.9997666822211853,
-            0.9996668887408394,
-            0.9997666822211853
+            0,
+            0,
+            1,
+            0,
+            0,
+            0.9997509339975094,
+            1,
+            0.9997509339975094
           ],
           "minPos": [
-            -1500,
-            -2142,
+            -1501,
+            -2007,
             0
           ],
           "maxPos": [
-            1500,
-            2142,
+            1501,
+            2007,
             0
           ]
         },

BIN
assets/unit105/image/悬壶济世.jpg


Різницю між файлами не показано, бо вона завелика
+ 575 - 158
assets/unit105/prefab/game.prefab


+ 1 - 1
assets/unit105/script/unit105.ts

@@ -19,7 +19,7 @@ export class unit105 extends BaseZhaocha {
         "井盖",
     ]
 
-    override  num_showTip: number = 0;
+    // override  num_showTip: number = 0;
     override  str_tishi = "滑动移开烧饼,露出下面的一袋防腐剂";
 
     @property(Node)

+ 6 - 6
assets/unit106/image/bg.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1",
+  "uuid": "d84e8d37-9381-499c-8cdb-f221fb2e40d0",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1@6c48a",
+      "uuid": "d84e8d37-9381-499c-8cdb-f221fb2e40d0@6c48a",
       "displayName": "bg",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1",
+        "imageUuidOrDatabaseUri": "d84e8d37-9381-499c-8cdb-f221fb2e40d0",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1@f9941",
+      "uuid": "d84e8d37-9381-499c-8cdb-f221fb2e40d0@f9941",
       "displayName": "bg",
       "id": "f9941",
       "name": "spriteFrame",
@@ -113,7 +113,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1@6c48a",
+        "imageUuidOrDatabaseUri": "d84e8d37-9381-499c-8cdb-f221fb2e40d0@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1@6c48a"
+    "redirect": "d84e8d37-9381-499c-8cdb-f221fb2e40d0@6c48a"
   }
 }

+ 29 - 13
assets/unit106/prefab/game.prefab

@@ -2472,13 +2472,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 362,
-      "height": 519
+      "width": 427.94000244140625,
+      "height": 761.239990234375
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.3253867428605728,
-      "y": 0.38146434629583637
+      "x": 0.27524886723263314,
+      "y": 0.5782801706457168
     },
     "_id": ""
   },
@@ -2509,7 +2509,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "b107f6cd-6686-41aa-8e6a-5997a08eef6e",
+      "__uuid__": "96007fa8-ce10-4789-9b41-852c19348819",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
@@ -2608,13 +2608,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 562,
-      "height": 968.1400146484375
+      "width": 806.030029296875,
+      "height": 970.4099731445312
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.4630071022332351,
-      "y": 0.7469167518912804
+      "x": 0.32282915275758073,
+      "y": 0.7474985057421454
     },
     "_id": ""
   },
@@ -2645,7 +2645,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "b68e2ceb-e3d6-4f69-a331-fc6b605ce0f9",
+      "__uuid__": "8d503b40-c2ab-4467-aecd-87b7011b1d49",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
@@ -5195,7 +5195,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "a117c84c-e2dc-4fe9-b743-2e1e17207ce1@f9941",
+      "__uuid__": "d84e8d37-9381-499c-8cdb-f221fb2e40d0@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -5266,7 +5266,7 @@
     "node": {
       "__id__": 98
     },
-    "_enabled": true,
+    "_enabled": false,
     "__prefab": {
       "__id__": 256
     },
@@ -5288,7 +5288,7 @@
     "node": {
       "__id__": 98
     },
-    "_enabled": true,
+    "_enabled": false,
     "__prefab": {
       "__id__": 258
     },
@@ -5469,6 +5469,22 @@
     "__prefab": {
       "__id__": 269
     },
+    "arr_tishi": [
+      "",
+      "滑动右边绿色的布条,露出log",
+      "",
+      "滑开左边的军火店招牌,露出武器",
+      "",
+      "",
+      "",
+      "",
+      "",
+      ""
+    ],
+    "tishi_indexs": [
+      1,
+      3
+    ],
     "node_zhanai": {
       "__id__": 232
     },

+ 2 - 2
assets/unit106/script/unit106.ts

@@ -20,8 +20,8 @@ export class unit106 extends BaseZhaocha {
         "电线杆"
     ]
 
-    override  num_showTip: number = 0;
-    override  str_tishi = "滑动移开烧饼,露出下面的一袋防腐剂";
+    // override  num_showTip: number = 0;
+    override  str_tishi = "滑动右边绿色的布条,露出log";
 
     @property(Node)
     node_zhanai: Node = null;

+ 12 - 5
assets/unit106/spine/7.1_sr.atlas

@@ -1,33 +1,40 @@
 
 7.1_sr.png
-size: 763,339
+size: 1180,339
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
+104_3
+  rotate: false
+  xy: 521, 15
+  size: 415, 324
+  orig: 415, 324
+  offset: 0, 0
+  index: -1
 104_4
   rotate: true
-  xy: 521, 5
+  xy: 938, 5
   size: 129, 173
   orig: 129, 173
   offset: 0, 0
   index: -1
 104_5
   rotate: true
-  xy: 696, 82
+  xy: 1113, 82
   size: 32, 30
   orig: 32, 30
   offset: 0, 0
   index: -1
 104_6
   rotate: true
-  xy: 724, 116
+  xy: 1141, 116
   size: 223, 39
   orig: 223, 39
   offset: 0, 0
   index: -1
 104_7
   rotate: true
-  xy: 521, 136
+  xy: 938, 136
   size: 203, 201
   orig: 203, 201
   offset: 0, 0

+ 1 - 1
assets/unit106/spine/7.1_sr.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "*",
   "imported": true,
-  "uuid": "24b07f8b-1283-4e6d-9cba-c2ceec4c1839",
+  "uuid": "001246dc-3d6e-482b-bef1-83cee6b78831",
   "files": [
     ".atlas",
     ".json"

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
assets/unit106/spine/7.1_sr.json


+ 2 - 2
assets/unit106/spine/7.1_sr.json.meta

@@ -2,12 +2,12 @@
   "ver": "1.2.7",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "b107f6cd-6686-41aa-8e6a-5997a08eef6e",
+  "uuid": "96007fa8-ce10-4789-9b41-852c19348819",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "atlasUuid": "24b07f8b-1283-4e6d-9cba-c2ceec4c1839"
+    "atlasUuid": "001246dc-3d6e-482b-bef1-83cee6b78831"
   }
 }

BIN
assets/unit106/spine/7.1_sr.png


+ 20 - 20
assets/unit106/spine/7.1_sr.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "1673aedf-90c8-4af0-9fa6-6898aca6e5a1",
+  "uuid": "babfb903-dba3-46af-b1af-276165d36ee1",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "1673aedf-90c8-4af0-9fa6-6898aca6e5a1@6c48a",
+      "uuid": "babfb903-dba3-46af-b1af-276165d36ee1@6c48a",
       "displayName": "7.1_sr",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "1673aedf-90c8-4af0-9fa6-6898aca6e5a1",
+        "imageUuidOrDatabaseUri": "babfb903-dba3-46af-b1af-276165d36ee1",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "1673aedf-90c8-4af0-9fa6-6898aca6e5a1@f9941",
+      "uuid": "babfb903-dba3-46af-b1af-276165d36ee1@f9941",
       "displayName": "7.1_sr",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,9 +45,9 @@
         "offsetY": 0,
         "trimX": 1,
         "trimY": 1,
-        "width": 761,
+        "width": 1178,
         "height": 337,
-        "rawWidth": 763,
+        "rawWidth": 1180,
         "rawHeight": 339,
         "borderTop": 0,
         "borderBottom": 0,
@@ -60,16 +60,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -380.5,
+            -589,
             -168.5,
             0,
-            380.5,
+            589,
             -168.5,
             0,
-            -380.5,
+            -589,
             168.5,
             0,
-            380.5,
+            589,
             168.5,
             0
           ],
@@ -84,36 +84,36 @@
           "uv": [
             1,
             338,
-            762,
+            1179,
             338,
             1,
             1,
-            762,
+            1179,
             1
           ],
           "nuv": [
-            0.001310615989515072,
+            0.000847457627118644,
             0.0029498525073746312,
-            0.9986893840104849,
+            0.9991525423728813,
             0.0029498525073746312,
-            0.001310615989515072,
+            0.000847457627118644,
             0.9970501474926253,
-            0.9986893840104849,
+            0.9991525423728813,
             0.9970501474926253
           ],
           "minPos": [
-            -380.5,
+            -589,
             -168.5,
             0
           ],
           "maxPos": [
-            380.5,
+            589,
             168.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "1673aedf-90c8-4af0-9fa6-6898aca6e5a1@6c48a",
+        "imageUuidOrDatabaseUri": "babfb903-dba3-46af-b1af-276165d36ee1@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "1673aedf-90c8-4af0-9fa6-6898aca6e5a1@6c48a"
+    "redirect": "babfb903-dba3-46af-b1af-276165d36ee1@6c48a"
   }
 }

+ 12 - 5
assets/unit106/spine/7.1_ss.atlas

@@ -1,19 +1,26 @@
 
 7.1_ss.png
-size: 1362,562
+size: 1089,1111
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
+104_0
+  rotate: true
+  xy: 564, 0
+  size: 718, 381
+  orig: 718, 381
+  offset: 0, 0
+  index: -1
 104_1
-  rotate: false
-  xy: 971, 37
+  rotate: true
+  xy: 564, 720
   size: 391, 525
   orig: 391, 525
   offset: 0, 0
   index: -1
 104_2
-  rotate: true
-  xy: 0, 0
+  rotate: false
+  xy: 0, 142
   size: 562, 969
   orig: 562, 969
   offset: 0, 0

+ 1 - 1
assets/unit106/spine/7.1_ss.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "*",
   "imported": true,
-  "uuid": "662676ce-00fa-4f66-ab78-b8695a2b2bcf",
+  "uuid": "d5af7dbe-4725-425a-a5b8-ef267bcbe3b9",
   "files": [
     ".atlas",
     ".json"

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
assets/unit106/spine/7.1_ss.json


+ 2 - 2
assets/unit106/spine/7.1_ss.json.meta

@@ -2,12 +2,12 @@
   "ver": "1.2.7",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "b68e2ceb-e3d6-4f69-a331-fc6b605ce0f9",
+  "uuid": "8d503b40-c2ab-4467-aecd-87b7011b1d49",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "atlasUuid": "662676ce-00fa-4f66-ab78-b8695a2b2bcf"
+    "atlasUuid": "d5af7dbe-4725-425a-a5b8-ef267bcbe3b9"
   }
 }

BIN
assets/unit106/spine/7.1_ss.png


+ 34 - 34
assets/unit106/spine/7.1_ss.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "f9e411b2-4da9-411c-96ea-104f86b9a79b",
+  "uuid": "b67efc13-fb5b-4513-ace8-30cec9aab7d7",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "f9e411b2-4da9-411c-96ea-104f86b9a79b@6c48a",
+      "uuid": "b67efc13-fb5b-4513-ace8-30cec9aab7d7@6c48a",
       "displayName": "7.1_ss",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "f9e411b2-4da9-411c-96ea-104f86b9a79b",
+        "imageUuidOrDatabaseUri": "b67efc13-fb5b-4513-ace8-30cec9aab7d7",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "f9e411b2-4da9-411c-96ea-104f86b9a79b@f9941",
+      "uuid": "b67efc13-fb5b-4513-ace8-30cec9aab7d7@f9941",
       "displayName": "7.1_ss",
       "id": "f9941",
       "name": "spriteFrame",
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 1,
         "trimY": 1,
-        "width": 1360,
-        "height": 560,
-        "rawWidth": 1362,
-        "rawHeight": 562,
+        "width": 1087,
+        "height": 1109,
+        "rawWidth": 1089,
+        "rawHeight": 1111,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -680,
-            -280,
+            -543.5,
+            -554.5,
             0,
-            680,
-            -280,
+            543.5,
+            -554.5,
             0,
-            -680,
-            280,
+            -543.5,
+            554.5,
             0,
-            680,
-            280,
+            543.5,
+            554.5,
             0
           ],
           "indexes": [
@@ -83,37 +83,37 @@
           ],
           "uv": [
             1,
-            561,
-            1361,
-            561,
+            1110,
+            1088,
+            1110,
             1,
             1,
-            1361,
+            1088,
             1
           ],
           "nuv": [
-            0.0007342143906020558,
-            0.0017793594306049821,
-            0.9992657856093979,
-            0.0017793594306049821,
-            0.0007342143906020558,
-            0.998220640569395,
-            0.9992657856093979,
-            0.998220640569395
+            0.0009182736455463728,
+            0.0009000900090009,
+            0.9990817263544536,
+            0.0009000900090009,
+            0.0009182736455463728,
+            0.9990999099909991,
+            0.9990817263544536,
+            0.9990999099909991
           ],
           "minPos": [
-            -680,
-            -280,
+            -543.5,
+            -554.5,
             0
           ],
           "maxPos": [
-            680,
-            280,
+            543.5,
+            554.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "f9e411b2-4da9-411c-96ea-104f86b9a79b@6c48a",
+        "imageUuidOrDatabaseUri": "b67efc13-fb5b-4513-ace8-30cec9aab7d7@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "f9e411b2-4da9-411c-96ea-104f86b9a79b@6c48a"
+    "redirect": "b67efc13-fb5b-4513-ace8-30cec9aab7d7@6c48a"
   }
 }

Деякі файли не було показано, через те що забагато файлів було змінено