future пре 1 година
родитељ
комит
36069ace3f

Разлика између датотеке није приказан због своје велике величине
+ 338 - 147
assets/resources/prefabs/game_play_shuang_tu_zhao_bu_tong.prefab


+ 4 - 6
assets/resources/prefabs/play_page_list_item.prefab

@@ -133,8 +133,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 35.018132295301925,
-      "height": 17.64
+      "width": 40.58267358008851,
+      "height": 17.640000000000004
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -172,9 +172,9 @@
     "_string": "0/500",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20.379310344827587,
+    "_actualFontSize": 19.448275862068968,
     "_fontSize": 14,
-    "_fontFamily": "Arial",
+    "_fontFamily": "Source Han Sans-Medium",
     "_lineHeight": 14,
     "_overflow": 0,
     "_enableWrapText": true,
@@ -201,8 +201,6 @@
       "__id__": 0
     },
     "fileId": "f78vsUIRtO/KKUpzMaDpr9",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {

+ 18 - 6
assets/script/play_list/base_view.ts

@@ -34,6 +34,7 @@ export class base_view extends Component {
     @property(Node) top_node:Node = null;
     @property(Node) lab_time_count:Node = null;
     @property(Node) clock_ani:Node = null;
+    @property(Node) lab_countdown_time:Node = null;
     protected guid_view:Node = null;
     protected time_count:number = 0;
     protected time_all_count:number = 0;
@@ -110,6 +111,9 @@ export class base_view extends Component {
         if(this.lab_time_count!=null){
             this.lab_time_count.getComponent(Label).string = ""
         }
+        if(this.lab_countdown_time!=null){
+            this.lab_countdown_time.getComponent(Label).string = ""
+        }
     }
     /**
         下一关 start
@@ -171,7 +175,7 @@ export class base_view extends Component {
             return
         }
         this.time_all_count = time;
-        this.lab_time_count.active = true;
+        // this.lab_time_count.active = true;
        
         let self = this;
         this.time_count = 0;
@@ -189,15 +193,21 @@ export class base_view extends Component {
             if(self.time_count<self.time_all_count){
                 self.time_count+=1;
                 if(this.categoryid===config.PLAY_TYPE.JI_YI_LI){
-                    self.lab_time_count.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
+                    // self.lab_time_count.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
+                    self.lab_countdown_time.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
                 }else{
                     self.progressbar.progress = (self.time_all_count-self.time_count)/self.time_all_count;
-                    self.lab_time_count.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
+                    // self.lab_time_count.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
+                    self.lab_countdown_time.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
                     self.clock_ani.getComponent(clock_angle).addSecond();
+                    // tween(self.lab_countdown_time).to(0.8,{scale: new Vec3(2, 2, 1)}).call(()=>{
+                    //     self.lab_countdown_time.scale = new Vec3(1,1,1)  
+                    // }).start()
                 }
        
             }else{
-                self.lab_time_count.getComponent(Label).string = "0s";
+                // self.lab_time_count.getComponent(Label).string = "0s";
+                self.lab_countdown_time.getComponent(Label).string = "0s";
                 if(this.categoryid===config.PLAY_TYPE.JI_YI_LI){
                     self.showQuestion()
                 }else{
@@ -211,9 +221,11 @@ export class base_view extends Component {
         let self = this;
         if( (self.time_count + self.m_data.wrong_time) >= self.time_all_count){
             self.time_all_count = 0;
-            self.lab_time_count.getComponent(Label).string = "0s";
+            // self.lab_time_count.getComponent(Label).string = "0s";
+            self.lab_countdown_time.getComponent(Label).string = "0s";
         }else{
-            self.lab_time_count.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
+            // self.lab_time_count.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
+            self.lab_countdown_time.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
             self.time_count += self.m_data.wrong_time;
         }
         self.progressbar.progress = (self.time_all_count-self.time_count)/self.time_all_count;

BIN
assets/textrue/home/btn_start.png


+ 36 - 36
assets/textrue/home/btn_start.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
-        "offsetY": 1,
-        "trimX": 2,
-        "trimY": 0,
-        "width": 136,
-        "height": 141,
-        "rawWidth": 140,
-        "rawHeight": 143,
+        "offsetX": -4,
+        "offsetY": 18.5,
+        "trimX": 24,
+        "trimY": 18,
+        "width": 203,
+        "height": 184,
+        "rawWidth": 259,
+        "rawHeight": 257,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -68,
-            -70.5,
+            -101.5,
+            -92,
             0,
-            68,
-            -70.5,
+            101.5,
+            -92,
             0,
-            -68,
-            70.5,
+            -101.5,
+            92,
             0,
-            68,
-            70.5,
+            101.5,
+            92,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            2,
-            143,
-            138,
-            143,
-            2,
-            2,
-            138,
-            2
+            24,
+            239,
+            227,
+            239,
+            24,
+            55,
+            227,
+            55
           ],
           "nuv": [
-            0.014285714285714285,
-            0.013986013986013986,
-            0.9857142857142858,
-            0.013986013986013986,
-            0.014285714285714285,
-            1,
-            0.9857142857142858,
-            1
+            0.09266409266409266,
+            0.2140077821011673,
+            0.8764478764478765,
+            0.2140077821011673,
+            0.09266409266409266,
+            0.9299610894941635,
+            0.8764478764478765,
+            0.9299610894941635
           ],
           "minPos": [
-            -68,
-            -70.5,
+            -101.5,
+            -92,
             0
           ],
           "maxPos": [
-            68,
-            70.5,
+            101.5,
+            92,
             0
           ]
         },

BIN
assets/textrue/home/img_bottom_bg.png


+ 134 - 0
assets/textrue/home/img_bottom_bg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "ef8a8323-39a4-4e8a-9d3b-093dc31888c3",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "ef8a8323-39a4-4e8a-9d3b-093dc31888c3@6c48a",
+      "displayName": "img_bottom_bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "ef8a8323-39a4-4e8a-9d3b-093dc31888c3",
+        "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": "ef8a8323-39a4-4e8a-9d3b-093dc31888c3@f9941",
+      "displayName": "img_bottom_bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": -1,
+        "trimX": 3,
+        "trimY": 3,
+        "width": 1092,
+        "height": 305,
+        "rawWidth": 1098,
+        "rawHeight": 309,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -546,
+            -152.5,
+            0,
+            546,
+            -152.5,
+            0,
+            -546,
+            152.5,
+            0,
+            546,
+            152.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            3,
+            306,
+            1095,
+            306,
+            3,
+            1,
+            1095,
+            1
+          ],
+          "nuv": [
+            0.00273224043715847,
+            0.003236245954692557,
+            0.9972677595628415,
+            0.003236245954692557,
+            0.00273224043715847,
+            0.9902912621359223,
+            0.9972677595628415,
+            0.9902912621359223
+          ],
+          "minPos": [
+            -546,
+            -152.5,
+            0
+          ],
+          "maxPos": [
+            546,
+            152.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "ef8a8323-39a4-4e8a-9d3b-093dc31888c3@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "hasAlpha": true,
+    "redirect": "ef8a8323-39a4-4e8a-9d3b-093dc31888c3@f9941"
+  }
+}

BIN
assets/textrue/home/img_fang_da_jing.png


+ 35 - 35
assets/textrue/home/img_fang_da_jing.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -4,
+        "offsetX": -1.5,
         "offsetY": 0.5,
-        "trimX": 30,
-        "trimY": 30,
-        "width": 146,
-        "height": 177,
-        "rawWidth": 214,
-        "rawHeight": 238,
+        "trimX": 25,
+        "trimY": 24,
+        "width": 121,
+        "height": 135,
+        "rawWidth": 174,
+        "rawHeight": 184,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -73,
-            -88.5,
+            -60.5,
+            -67.5,
             0,
-            73,
-            -88.5,
+            60.5,
+            -67.5,
             0,
-            -73,
-            88.5,
+            -60.5,
+            67.5,
             0,
-            73,
-            88.5,
+            60.5,
+            67.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            30,
-            208,
-            176,
-            208,
-            30,
-            31,
-            176,
-            31
+            25,
+            160,
+            146,
+            160,
+            25,
+            25,
+            146,
+            25
           ],
           "nuv": [
-            0.14018691588785046,
-            0.13025210084033614,
-            0.822429906542056,
-            0.13025210084033614,
-            0.14018691588785046,
-            0.8739495798319328,
-            0.822429906542056,
-            0.8739495798319328
+            0.14367816091954022,
+            0.1358695652173913,
+            0.8390804597701149,
+            0.1358695652173913,
+            0.14367816091954022,
+            0.8695652173913043,
+            0.8390804597701149,
+            0.8695652173913043
           ],
           "minPos": [
-            -73,
-            -88.5,
+            -60.5,
+            -67.5,
             0
           ],
           "maxPos": [
-            73,
-            88.5,
+            60.5,
+            67.5,
             0
           ]
         },

BIN
assets/textrue/home/img_fang_da_sub.png


+ 36 - 36
assets/textrue/home/img_fang_da_sub.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -4,
-        "offsetY": 0.5,
-        "trimX": 30,
-        "trimY": 30,
-        "width": 146,
-        "height": 177,
-        "rawWidth": 214,
-        "rawHeight": 238,
+        "offsetX": -2.5,
+        "offsetY": 1,
+        "trimX": 24,
+        "trimY": 23,
+        "width": 120,
+        "height": 135,
+        "rawWidth": 173,
+        "rawHeight": 183,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -73,
-            -88.5,
+            -60,
+            -67.5,
             0,
-            73,
-            -88.5,
+            60,
+            -67.5,
             0,
-            -73,
-            88.5,
+            -60,
+            67.5,
             0,
-            73,
-            88.5,
+            60,
+            67.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            30,
-            208,
-            176,
-            208,
-            30,
-            31,
-            176,
-            31
+            24,
+            160,
+            144,
+            160,
+            24,
+            25,
+            144,
+            25
           ],
           "nuv": [
-            0.14018691588785046,
-            0.13025210084033614,
-            0.822429906542056,
-            0.13025210084033614,
-            0.14018691588785046,
-            0.8739495798319328,
-            0.822429906542056,
-            0.8739495798319328
+            0.13872832369942195,
+            0.1366120218579235,
+            0.8323699421965318,
+            0.1366120218579235,
+            0.13872832369942195,
+            0.8743169398907104,
+            0.8323699421965318,
+            0.8743169398907104
           ],
           "minPos": [
-            -73,
-            -88.5,
+            -60,
+            -67.5,
             0
           ],
           "maxPos": [
-            73,
-            88.5,
+            60,
+            67.5,
             0
           ]
         },

BIN
assets/textrue/home/img_pause.png


+ 36 - 36
assets/textrue/home/img_pause.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0.5,
-        "trimX": 2,
-        "trimY": 0,
-        "width": 136,
-        "height": 142,
-        "rawWidth": 140,
-        "rawHeight": 143,
+        "offsetX": -4,
+        "offsetY": 18.5,
+        "trimX": 24,
+        "trimY": 18,
+        "width": 203,
+        "height": 184,
+        "rawWidth": 259,
+        "rawHeight": 257,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -68,
-            -71,
+            -101.5,
+            -92,
             0,
-            68,
-            -71,
+            101.5,
+            -92,
             0,
-            -68,
-            71,
+            -101.5,
+            92,
             0,
-            68,
-            71,
+            101.5,
+            92,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            2,
-            143,
-            138,
-            143,
-            2,
-            1,
-            138,
-            1
+            24,
+            239,
+            227,
+            239,
+            24,
+            55,
+            227,
+            55
           ],
           "nuv": [
-            0.014285714285714285,
-            0.006993006993006993,
-            0.9857142857142858,
-            0.006993006993006993,
-            0.014285714285714285,
-            1,
-            0.9857142857142858,
-            1
+            0.09266409266409266,
+            0.2140077821011673,
+            0.8764478764478765,
+            0.2140077821011673,
+            0.09266409266409266,
+            0.9299610894941635,
+            0.8764478764478765,
+            0.9299610894941635
           ],
           "minPos": [
-            -68,
-            -71,
+            -101.5,
+            -92,
             0
           ],
           "maxPos": [
-            68,
-            71,
+            101.5,
+            92,
             0
           ]
         },

BIN
assets/textrue/home/img_tip_btn.png


+ 36 - 36
assets/textrue/home/img_tip_btn.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0.5,
-        "trimX": 2,
-        "trimY": 0,
-        "width": 293,
-        "height": 140,
-        "rawWidth": 297,
-        "rawHeight": 141,
+        "offsetX": -4,
+        "offsetY": 18.5,
+        "trimX": 24,
+        "trimY": 18,
+        "width": 203,
+        "height": 184,
+        "rawWidth": 259,
+        "rawHeight": 257,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -146.5,
-            -70,
+            -101.5,
+            -92,
             0,
-            146.5,
-            -70,
+            101.5,
+            -92,
             0,
-            -146.5,
-            70,
+            -101.5,
+            92,
             0,
-            146.5,
-            70,
+            101.5,
+            92,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            2,
-            141,
-            295,
-            141,
-            2,
-            1,
-            295,
-            1
+            24,
+            239,
+            227,
+            239,
+            24,
+            55,
+            227,
+            55
           ],
           "nuv": [
-            0.006734006734006734,
-            0.0070921985815602835,
-            0.9932659932659933,
-            0.0070921985815602835,
-            0.006734006734006734,
-            1,
-            0.9932659932659933,
-            1
+            0.09266409266409266,
+            0.2140077821011673,
+            0.8764478764478765,
+            0.2140077821011673,
+            0.09266409266409266,
+            0.9299610894941635,
+            0.8764478764478765,
+            0.9299610894941635
           ],
           "minPos": [
-            -146.5,
-            -70,
+            -101.5,
+            -92,
             0
           ],
           "maxPos": [
-            146.5,
-            70,
+            101.5,
+            92,
             0
           ]
         },

Неке датотеке нису приказане због велике количине промена