vene 3 місяців тому
батько
коміт
80ab1127c9

+ 1 - 1
assets/Cup/2color/skeleton.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "27d98435-f030-458e-b7a8-7ee85ad02c5e",
+  "uuid": "940af643-0d2e-492e-8fa0-5670bb6399b9",
   "files": [
     ".atlas",
     ".json"

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
assets/Cup/2color/skeleton.json


+ 1 - 1
assets/Cup/2color/skeleton.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
+  "uuid": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
   "files": [
     ".json"
   ],

BIN
assets/Cup/2color/skeleton.png


+ 6 - 6
assets/Cup/2color/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "8d8dc26b-382d-425d-8ac3-366c784e882f",
+  "uuid": "de76f103-d3c2-4efc-b046-1c04cfbbc3aa",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "8d8dc26b-382d-425d-8ac3-366c784e882f@6c48a",
+      "uuid": "de76f103-d3c2-4efc-b046-1c04cfbbc3aa@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "8d8dc26b-382d-425d-8ac3-366c784e882f",
+        "imageUuidOrDatabaseUri": "de76f103-d3c2-4efc-b046-1c04cfbbc3aa",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "8d8dc26b-382d-425d-8ac3-366c784e882f@f9941",
+      "uuid": "de76f103-d3c2-4efc-b046-1c04cfbbc3aa@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "8d8dc26b-382d-425d-8ac3-366c784e882f@6c48a",
+        "imageUuidOrDatabaseUri": "de76f103-d3c2-4efc-b046-1c04cfbbc3aa@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "8d8dc26b-382d-425d-8ac3-366c784e882f@f9941"
+    "redirect": "de76f103-d3c2-4efc-b046-1c04cfbbc3aa@f9941"
   }
 }

+ 2 - 2
assets/Cup/3color/Black/Black01.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "5e9470d5-7d78-4f18-afcf-02fd58142b6f@6c48a",
-      "displayName": "Black01",
+      "displayName": "black01",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "5e9470d5-7d78-4f18-afcf-02fd58142b6f@f9941",
-      "displayName": "Black01",
+      "displayName": "black01",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

+ 2 - 2
assets/Cup/3color/Black/Black02.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "fc3422c3-4bbc-4687-9e39-16d19f6cde5f@6c48a",
-      "displayName": "Black02",
+      "displayName": "black02",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "fc3422c3-4bbc-4687-9e39-16d19f6cde5f@f9941",
-      "displayName": "Black02",
+      "displayName": "black02",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

+ 2 - 2
assets/Cup/3color/Black/Black03.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "4fe8a5d1-95c1-4dba-b16a-4582782c2908@6c48a",
-      "displayName": "Black03",
+      "displayName": "black03",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "4fe8a5d1-95c1-4dba-b16a-4582782c2908@f9941",
-      "displayName": "Black03",
+      "displayName": "black03",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

+ 1 - 1
assets/Cup/3color/skeleton.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "9adb9e98-ff80-48df-b8cc-6b3286dc049b",
+  "uuid": "6586013d-e775-4049-b308-ad17228bccb4",
   "files": [
     ".atlas",
     ".json"

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
assets/Cup/3color/skeleton.json


+ 1 - 1
assets/Cup/3color/skeleton.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "a6af6be8-e5ad-4e5d-80f8-3df118dfca06",
+  "uuid": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
   "files": [
     ".json"
   ],

BIN
assets/Cup/3color/skeleton.png


+ 6 - 6
assets/Cup/3color/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "25f3ae1f-f44d-4562-8157-5227d5f0fe74",
+  "uuid": "fcc6b30b-7eab-4c56-850e-033979f35b37",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "25f3ae1f-f44d-4562-8157-5227d5f0fe74@6c48a",
+      "uuid": "fcc6b30b-7eab-4c56-850e-033979f35b37@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "25f3ae1f-f44d-4562-8157-5227d5f0fe74",
+        "imageUuidOrDatabaseUri": "fcc6b30b-7eab-4c56-850e-033979f35b37",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "25f3ae1f-f44d-4562-8157-5227d5f0fe74@f9941",
+      "uuid": "fcc6b30b-7eab-4c56-850e-033979f35b37@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "25f3ae1f-f44d-4562-8157-5227d5f0fe74@6c48a",
+        "imageUuidOrDatabaseUri": "fcc6b30b-7eab-4c56-850e-033979f35b37@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "25f3ae1f-f44d-4562-8157-5227d5f0fe74@f9941"
+    "redirect": "fcc6b30b-7eab-4c56-850e-033979f35b37@f9941"
   }
 }

+ 1 - 1
assets/Cup/4color/skeleton.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "abca5d18-0af7-412a-bb02-7fad3c3009dc",
+  "uuid": "c792b0d2-01eb-4bf4-82f6-a669f84c7ff9",
   "files": [
     ".atlas",
     ".json"

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
assets/Cup/4color/skeleton.json


+ 1 - 1
assets/Cup/4color/skeleton.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "8985a22f-7052-4458-a143-87f369b07cf5",
+  "uuid": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
   "files": [
     ".json"
   ],

BIN
assets/Cup/4color/skeleton.png


+ 6 - 6
assets/Cup/4color/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "e4b52e0b-f42b-46b9-a48c-3ff02e54cf79",
+  "uuid": "5a709f05-018d-451c-8bf4-6f6b2b76235f",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "e4b52e0b-f42b-46b9-a48c-3ff02e54cf79@6c48a",
+      "uuid": "5a709f05-018d-451c-8bf4-6f6b2b76235f@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "e4b52e0b-f42b-46b9-a48c-3ff02e54cf79",
+        "imageUuidOrDatabaseUri": "5a709f05-018d-451c-8bf4-6f6b2b76235f",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "e4b52e0b-f42b-46b9-a48c-3ff02e54cf79@f9941",
+      "uuid": "5a709f05-018d-451c-8bf4-6f6b2b76235f@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "e4b52e0b-f42b-46b9-a48c-3ff02e54cf79@6c48a",
+        "imageUuidOrDatabaseUri": "5a709f05-018d-451c-8bf4-6f6b2b76235f@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "e4b52e0b-f42b-46b9-a48c-3ff02e54cf79@f9941"
+    "redirect": "5a709f05-018d-451c-8bf4-6f6b2b76235f@f9941"
   }
 }

+ 26 - 26
assets/Cup/test.scene

@@ -393,7 +393,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8985a22f-7052-4458-a143-87f369b07cf5",
+      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water04",
@@ -496,13 +496,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 184,
+      "r": 255,
       "g": 0,
-      "b": 255,
+      "b": 0,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8985a22f-7052-4458-a143-87f369b07cf5",
+      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -605,13 +605,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 194,
-      "b": 255,
+      "r": 255,
+      "g": 0,
+      "b": 0,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8985a22f-7052-4458-a143-87f369b07cf5",
+      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -714,13 +714,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 255,
-      "b": 20,
+      "r": 255,
+      "g": 0,
+      "b": 0,
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8985a22f-7052-4458-a143-87f369b07cf5",
+      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -829,7 +829,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8985a22f-7052-4458-a143-87f369b07cf5",
+      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -894,7 +894,7 @@
         "__id__": 35
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 38
@@ -1457,7 +1457,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "8985a22f-7052-4458-a143-87f369b07cf5",
+      "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -1646,7 +1646,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a6af6be8-e5ad-4e5d-80f8-3df118dfca06",
+      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water03",
@@ -1755,7 +1755,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a6af6be8-e5ad-4e5d-80f8-3df118dfca06",
+      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -1864,7 +1864,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a6af6be8-e5ad-4e5d-80f8-3df118dfca06",
+      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -1973,7 +1973,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a6af6be8-e5ad-4e5d-80f8-3df118dfca06",
+      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -2420,7 +2420,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -2.036000000000058,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -2489,11 +2489,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "a6af6be8-e5ad-4e5d-80f8-3df118dfca06",
+      "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
-    "defaultAnimation": "",
+    "defaultAnimation": "<None>",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -2675,7 +2675,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
+      "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water02",
@@ -2784,7 +2784,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
+      "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "water01",
@@ -2893,7 +2893,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
+      "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",
@@ -3297,7 +3297,7 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
+      "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "cup",

+ 6 - 6
assets/start/start.scene

@@ -283,8 +283,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1355.625,
-      "height": 8543.408813476562
+      "width": 2711.25,
+      "height": 17957.9013427443
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -356,10 +356,10 @@
     "__prefab": null,
     "_alignFlags": 45,
     "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": -1628.7890625,
-    "_bottom": -1628.7890625,
+    "_left": -360,
+    "_right": -360,
+    "_top": -4128.903261143714,
+    "_bottom": -4128.903261143714,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,

+ 1 - 1
settings/v2/packages/cocos-service.json

@@ -1,7 +1,7 @@
 {
   "__version__": "3.0.7",
   "game": {
-    "name": "未知游戏",
+    "name": "UNKNOW GAME",
     "app_id": "UNKNOW",
     "c_id": "0"
   },

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