HeChangeChina 1 year ago
parent
commit
c694aca0bb

File diff suppressed because it is too large
+ 142 - 38
assets/main.scene


+ 1 - 1
assets/main.scene.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.45",
   "importer": "scene",
   "imported": true,
   "uuid": "1c9182fc-c6a7-4fca-a293-02b3051d1594",

+ 1 - 1
assets/resource.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "b2c9e4a5-13d5-4e49-b058-4b586195b519",

+ 2 - 2
assets/resource/1-deformPic-375_220.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "a74c3d27-2c5f-4f40-83be-b57b52452236",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "a74c3d27-2c5f-4f40-83be-b57b52452236@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

+ 2 - 2
assets/resource/1-originalPic-375_220.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "65b6c22e-ebdf-4d8e-9177-25f2115e8f12",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "65b6c22e-ebdf-4d8e-9177-25f2115e8f12@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

+ 2 - 2
assets/resource/circle.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "0135c9bc-71b8-484b-8c91-39e882267f7c",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "0135c9bc-71b8-484b-8c91-39e882267f7c@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

+ 2 - 2
assets/resource/circle_red.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "3856fe75-9454-4208-bac6-fceebbd5d9e1",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "3856fe75-9454-4208-bac6-fceebbd5d9e1@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

+ 2 - 2
assets/resource/img1.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "7e6f4e65-6a92-4ff8-8eac-ddf2498e2b55",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "7e6f4e65-6a92-4ff8-8eac-ddf2498e2b55@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

+ 2 - 2
assets/resource/img2.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "653aff99-e146-434c-804f-49ca179db627",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "653aff99-e146-434c-804f-49ca179db627@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

+ 2 - 2
assets/resource/img_test.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "e434a981-5656-4d76-9641-4938a0828ce7",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "e434a981-5656-4d76-9641-4938a0828ce7@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

+ 1 - 1
assets/resource/prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "3ffdd585-d669-4e3e-8bdc-8a4610ee780a",

+ 1 - 1
assets/resource/prefab/detail_item.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.45",
   "importer": "prefab",
   "imported": true,
   "uuid": "e9527b58-d08d-40e9-bb2f-ed989a90cbe0",

+ 12 - 4
assets/resource/prefab/font_item.prefab

@@ -3,6 +3,7 @@
     "__type__": "cc.Prefab",
     "_name": "font_item",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_native": "",
     "data": {
       "__id__": 1
@@ -72,6 +73,7 @@
     "__type__": "cc.Node",
     "_name": "circle",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
@@ -121,6 +123,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
@@ -130,8 +133,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40,
-      "height": 40
+      "width": 60,
+      "height": 60
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -148,6 +151,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
@@ -205,6 +209,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -214,8 +219,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 30,
-      "height": 30
+      "width": 50,
+      "height": 50
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -232,6 +237,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -276,6 +282,7 @@
     "__type__": "d0e490M0zhBRZRaG4ad55oy",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -296,6 +303,7 @@
     "__type__": "cc.Button",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },

+ 1 - 1
assets/resource/prefab/font_item.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.45",
   "importer": "prefab",
   "imported": true,
   "uuid": "d4588d07-a5d4-4dfa-9704-c8aea466b7eb",

+ 11 - 3
assets/resource/prefab/level_list_item.prefab

@@ -3,6 +3,7 @@
     "__type__": "cc.Prefab",
     "_name": "level_list_item",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_native": "",
     "data": {
       "__id__": 1
@@ -72,6 +73,7 @@
     "__type__": "cc.Node",
     "_name": "Label",
     "_objFlags": 512,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
@@ -121,6 +123,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
@@ -130,7 +133,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
+      "width": 320,
       "height": 40
     },
     "_anchorPoint": {
@@ -148,6 +151,7 @@
     "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 2
     },
@@ -166,7 +170,7 @@
       "a": 255
     },
     "_string": "关卡1关卡1关卡1",
-    "_horizontalAlign": 1,
+    "_horizontalAlign": 0,
     "_verticalAlign": 1,
     "_actualFontSize": 20,
     "_fontSize": 20,
@@ -205,6 +209,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -214,7 +219,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
+      "width": 390,
       "height": 40
     },
     "_anchorPoint": {
@@ -232,6 +237,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -276,6 +282,7 @@
     "__type__": "cc.Button",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -345,6 +352,7 @@
     "__type__": "841b5vNL+tPZrAxXwhYRSV0",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },

+ 1 - 1
assets/resource/prefab/level_list_item.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.45",
   "importer": "prefab",
   "imported": true,
   "uuid": "e0903480-6086-4f89-be39-3ee3bd78c017",

+ 1 - 1
assets/resource/prefab/play_item.prefab.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.43",
+  "ver": "1.1.45",
   "importer": "prefab",
   "imported": true,
   "uuid": "a1dc977e-da6f-4743-9077-4006f54b7bc0",

+ 2 - 2
assets/resource/xijie1.png.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.0.25",
+  "ver": "1.0.26",
   "importer": "image",
   "imported": true,
   "uuid": "860b4b8b-48d2-4e89-9796-a8943d923882",
@@ -117,7 +117,7 @@
         "imageUuidOrDatabaseUri": "860b4b8b-48d2-4e89-9796-a8943d923882@6c48a",
         "atlasUuid": ""
       },
-      "ver": "1.0.11",
+      "ver": "1.0.12",
       "imported": true,
       "files": [
         ".json"

+ 1 - 1
assets/src.meta

@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
   "uuid": "934649a0-9906-4889-8d22-9d95cdca2b4c",

+ 5 - 0
assets/src/game_1.ts

@@ -141,6 +141,11 @@ export class game_1 extends Component {
         }else{
             item.position = v3;
         }
+
+        let itemTransform = item.getComponent(UITransform);
+        itemTransform.width = 40;
+        itemTransform.height = 40;
+
         item.getComponent(circle).init_circle();
     }
 

+ 5 - 0
assets/src/game_detail.ts

@@ -258,6 +258,11 @@ export class game_detail extends Component {
     }
     addItemForList(v3:Vec3,isChangePos:boolean,data){
         let item = instantiate(this.circle);
+
+        let itemTransform = item.getComponent(UITransform);
+        itemTransform.width = 60;
+        itemTransform.height = 60;
+
         item.parent = this.cur_spr;
         if(isChangePos){
             item.position = this.cur_spr.getComponent(UITransform).convertToNodeSpaceAR(v3);

+ 1 - 1
package.json

@@ -2,6 +2,6 @@
   "name": "zhaocha_douyin",
   "uuid": "1a9f0c36-ed71-4369-9695-4213dbb133a8",
   "creator": {
-    "version": "3.7.0"
+    "version": "3.8.0"
   }
 }

+ 1 - 1
settings/v2/packages/builder.json

@@ -1,3 +1,3 @@
 {
-  "__version__": "1.3.4"
+  "__version__": "1.3.6"
 }

+ 23 - 0
settings/v2/packages/information.json

@@ -0,0 +1,23 @@
+{
+  "__version__": "1.0.0",
+  "information": {
+    "customSplash": {
+      "id": "customSplash",
+      "label": "customSplash",
+      "enable": false,
+      "customSplash": {
+        "complete": false,
+        "form": "https://creator-api.cocos.com/api/form/show?"
+      }
+    },
+    "removeSplash": {
+      "id": "removeSplash",
+      "label": "removeSplash",
+      "enable": false,
+      "removeSplash": {
+        "complete": false,
+        "form": "https://creator-api.cocos.com/api/form/show?"
+      }
+    }
+  }
+}

+ 1 - 1
settings/v2/packages/project.json

@@ -1,5 +1,5 @@
 {
-  "__version__": "1.0.4",
+  "__version__": "1.0.5",
   "general": {
     "designResolution": {
       "width": 1920,

Some files were not shown because too many files changed in this diff