2.0

assets/resources/prefabs/fail.prefab

@@ -545,7 +545,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -161.59999999999997,
+      "x": -165.8,
       "y": 0,
       "z": 0
     },
@@ -636,8 +636,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 29.996229463465074,
-      "height": 18.9
+      "width": 35.98728745404412,
+      "height": 25.2
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -675,10 +675,10 @@
     "_string": "退出",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 21.982758620689655,
-    "_fontSize": 15,
+    "_actualFontSize": 26.379310344827584,
+    "_fontSize": 18,
     "_fontFamily": "Arial",
-    "_lineHeight": 15,
+    "_lineHeight": 20,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
@@ -722,7 +722,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 372,
+      "width": 400,
       "height": 120
     },
     "_anchorPoint": {
@@ -824,7 +824,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -80.8,
+      "x": -85,
       "y": 0,
       "z": 0
     },
@@ -874,7 +874,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -107.733,
+      "x": -128.733,
       "y": 0.001,
       "z": 0
     },
@@ -915,8 +915,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 66,
-      "height": 49
+      "width": 70,
+      "height": 52
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -957,7 +957,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1010,7 +1010,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -58.903,
+      "x": -78.90299999999999,
       "y": 0.001,
       "z": 0
     },
@@ -1051,8 +1051,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 70.01802655388327,
-      "height": 18.9
+      "width": 84.0025343951057,
+      "height": 22.68
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1090,10 +1090,10 @@
     "_string": "延长120秒",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 21.982758620689655,
-    "_fontSize": 15,
+    "_actualFontSize": 26.379310344827584,
+    "_fontSize": 18,
     "_fontFamily": "Arial",
-    "_lineHeight": 15,
+    "_lineHeight": 18,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
@@ -1137,7 +1137,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 372,
+      "width": 400,
       "height": 120
     },
     "_anchorPoint": {
@@ -1239,7 +1239,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 80.8,
+      "x": 85,
       "y": 0,
       "z": 0
     },
@@ -1268,7 +1268,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "img_video",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1289,7 +1289,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -64.753,
+      "x": -112.733,
       "y": 0.001,
       "z": 0
     },
@@ -1302,8 +1302,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 3,
-      "y": 3,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -1330,22 +1330,22 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 59.99245892693015,
-      "height": 18.9
+      "width": 70,
+      "height": 52
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0,
+      "x": 0.5,
       "y": 0.5
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "cbm8s5+vBC17g9ldLugYPu"
+    "fileId": "betDgG99RCoI+gz93jOo8E"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1361,33 +1361,33 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 155,
-      "g": 90,
-      "b": 29,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
-    "_string": "重新开始",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 21.982758620689655,
-    "_fontSize": 15,
-    "_fontFamily": "Arial",
-    "_lineHeight": 15,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
+    "_spriteFrame": {
+      "__uuid__": "7bc83ddb-4f77-40bd-9b25-6ffeed332694@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "56QV8dCF5HDpc9qamvLEA0"
+    "fileId": "25t9firSdMe5xff7BLh9i5"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1397,14 +1397,14 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "814BZbo5dIeKko1bfzbPgi",
+    "fileId": "c9kzFMSU5HD7Cqtn3iWePz",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "img_video",
+    "_name": "Label",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1425,7 +1425,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -107.733,
+      "x": -64.753,
       "y": 0.001,
       "z": 0
     },
@@ -1438,8 +1438,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 3,
+      "y": 3,
       "z": 1
     },
     "_mobility": 0,
@@ -1466,22 +1466,22 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 66,
-      "height": 49
+      "width": 71.97457490808824,
+      "height": 22.68
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
+      "x": 0,
       "y": 0.5
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "betDgG99RCoI+gz93jOo8E"
+    "fileId": "cbm8s5+vBC17g9ldLugYPu"
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1497,33 +1497,33 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 155,
+      "g": 90,
+      "b": 29,
       "a": 255
     },
-    "_spriteFrame": {
-      "__uuid__": "7bc83ddb-4f77-40bd-9b25-6ffeed332694@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
+    "_string": "重新开始",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 26.379310344827584,
+    "_fontSize": 18,
+    "_fontFamily": "Arial",
+    "_lineHeight": 18,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "25t9firSdMe5xff7BLh9i5"
+    "fileId": "56QV8dCF5HDpc9qamvLEA0"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1533,7 +1533,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "c9kzFMSU5HD7Cqtn3iWePz",
+    "fileId": "814BZbo5dIeKko1bfzbPgi",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1552,7 +1552,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 372,
+      "width": 400,
       "height": 120
     },
     "_anchorPoint": {
@@ -1638,7 +1638,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 273.2,
+      "width": 290,
       "height": 50
     },
     "_anchorPoint": {
@@ -1718,7 +1718,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 335,
-      "height": 197
+      "height": 200
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1878,10 +1878,10 @@
       "__id__": 50
     },
     "lab_restart": {
-      "__id__": 51
+      "__id__": 57
     },
     "img_restart_video_icon": {
-      "__id__": 57
+      "__id__": 51
     },
     "lab_extend_time": {
       "__id__": 39

assets/resources/prefabs/game_play_ji_yi_li.prefab

@@ -4194,6 +4194,9 @@
     "lab_countdown_time": {
       "__id__": 118
     },
+    "img_1_mask": {
+      "__id__": 51
+    },
     "img_1": {
       "__id__": 52
     },

assets/script/dialog/win.ts

@@ -8,8 +8,10 @@ const { ccclass, property } = _decorator;
 @ccclass('win')
 export class win extends Component {
     @property(Node) bg:Node;
+    @property(Node) img_caidai:Node;
     @property(Node) img_text:Node;
     @property(Node) lab_reward_number:Node;
+    @property(Node) btn_bg:Node;
     @property(Node) btn_ordinary:Node;
     @property(Node) btn_double:Node;
     @property(Node) btn_next_level:Node;
@@ -64,7 +66,10 @@ export class win extends Component {
     }
 
     public showJYLView(ordinary_call,categoryid){
-        this.bg.getComponent(UITransform).height = 300
+        this.img_caidai.active = false
+        this.bg.getComponent(UITransform).height = 280
+        this.img_text.position = new Vec3(this.img_text.position.x, this.img_text.position.y - 40, this.img_text.position.z)
+        this.btn_bg.position = new Vec3(this.btn_bg.position.x, this.btn_bg.position.y + 50, this.btn_bg.position.z)
         if(categoryid===config.PLAY_TYPE.DOU_DI_ZHU){
             this.bg.angle = -90;
             this.bg.position = new Vec3(this.bg.position.x,this.bg.position.y,this.bg.position.z)

assets/script/homepage/play_page_list_item.ts

@@ -23,12 +23,6 @@ export class play_page_list_item extends Component {
         this.m_call_back = call_back
         this.node.getComponent(Sprite).spriteFrame = sf
         this.node.on(Node.EventType.TOUCH_END, () => {
-            // gameManager.addTopView(config.PREFAB_PATH.win,(node:Node)=>{
-            //     // node.getComponent(win).showView(400,null,null,null)
-            //     node.getComponent(win).showJYLView(()=> {},1)
-            // });
-            // return
-
             if (this.m_call_back != null) {
                 console.log(config.get_play_type_name(this.m_data.id))
                 if (this.m_data.id === config.PLAY_TYPE.JI_YI_LI || this.m_data.id === config.PLAY_TYPE.DOU_DI_ZHU) {

assets/script/play_list/ji_yi_li/view_game_play_ji_yi_li.ts

@@ -12,6 +12,7 @@ const { ccclass, property } = _decorator;
 
 @ccclass('view_game_play_ji_yi_li')
 export class view_game_play_ji_yi_li extends base_view {
+  @property(Node) img_1_mask: Node;
   @property(Node) img_1: Node;
   @property(Node) bottom_node: Node;
   @property(Node) question_node: Node;
@@ -36,13 +37,15 @@ export class view_game_play_ji_yi_li extends base_view {
   }
 
   showStep1() {
-    this.img_1.active = true;
+    // this.img_1.active = true;
+    this.img_1_mask.active = true;
     this.question_node.active = false;
     this.lab_title.active = true;
     this.bottom_node.active = true;
   }
   showStep2() {
-    this.img_1.active = false;
+    // this.img_1.active = false;
+    this.img_1_mask.active = false;
     this.question_node.active = true;
     this.lab_title.active = false;
     this.bottom_node.active = false;

assets/textrue/home/popup_window/img_popup_bg_win.png.meta → assets/textrue/home/popup_window/img_popup_caidai.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "be7881c2-46b4-48fb-948c-c3f0a874a376",
+  "uuid": "250e3a73-499b-4abe-bc32-ae8952a7939c",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "be7881c2-46b4-48fb-948c-c3f0a874a376@6c48a",
-      "displayName": "img_popup_bg_win",
+      "uuid": "250e3a73-499b-4abe-bc32-ae8952a7939c@6c48a",
+      "displayName": "img_popup_caidai",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "be7881c2-46b4-48fb-948c-c3f0a874a376",
+        "imageUuidOrDatabaseUri": "250e3a73-499b-4abe-bc32-ae8952a7939c",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "be7881c2-46b4-48fb-948c-c3f0a874a376@f9941",
-      "displayName": "img_popup_bg_win",
+      "uuid": "250e3a73-499b-4abe-bc32-ae8952a7939c@f9941",
+      "displayName": "img_popup_caidai",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 903,
-        "height": 972,
-        "rawWidth": 903,
-        "rawHeight": 972,
+        "width": 900,
+        "height": 207,
+        "rawWidth": 900,
+        "rawHeight": 207,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -451.5,
-            -486,
+            -450,
+            -103.5,
             0,
-            451.5,
-            -486,
+            450,
+            -103.5,
             0,
-            -451.5,
-            486,
+            -450,
+            103.5,
             0,
-            451.5,
-            486,
+            450,
+            103.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            972,
-            903,
-            972,
+            207,
+            900,
+            207,
             0,
             0,
-            903,
+            900,
             0
           ],
           "nuv": [
@@ -103,18 +103,18 @@
             1
           ],
           "minPos": [
-            -451.5,
-            -486,
+            -450,
+            -103.5,
             0
           ],
           "maxPos": [
-            451.5,
-            486,
+            450,
+            103.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "be7881c2-46b4-48fb-948c-c3f0a874a376@6c48a",
+        "imageUuidOrDatabaseUri": "250e3a73-499b-4abe-bc32-ae8952a7939c@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": true,
     "hasAlpha": true,
-    "redirect": "be7881c2-46b4-48fb-948c-c3f0a874a376@f9941"
+    "redirect": "250e3a73-499b-4abe-bc32-ae8952a7939c@f9941"
   }
 }