future hai 1 ano
pai
achega
8830af5959

+ 4 - 0
assets/resources/prefabs/fail.prefab

@@ -1893,6 +1893,10 @@
       "__uuid__": "2ae374b2-cefb-4583-96cd-77033833eb0f@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
+    "sf_chuangguanshibai": {
+      "__uuid__": "7f5c5ffc-c0d1-4e8b-ad52-c60e85dbe636@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
     "_id": ""
   },
   {

+ 9 - 5
assets/resources/prefabs/win.prefab

@@ -667,8 +667,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 101.20970638499541,
-      "height": 50.4
+      "width": 113.84799984202667,
+      "height": 56.70000000000001
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -706,10 +706,10 @@
     "_string": "+ 450",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 58.62068965517241,
-    "_fontSize": 40,
+    "_actualFontSize": 65.94827586206897,
+    "_fontSize": 45,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 45,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
@@ -4859,6 +4859,10 @@
       "__uuid__": "62577a5f-0df0-45b4-b874-2c738bf81843@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
+    "sf_gongxi": {
+      "__uuid__": "7cabaf40-23c5-4b27-bb83-4ed014230f6d@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
     "_id": ""
   },
   {

+ 2 - 2
assets/script/dialog/fail.ts

@@ -12,6 +12,7 @@ export class fail extends Component {
     @property(Node) lab_extend_time:Node;
     @property(Node) btn_quit:Node;
     @property(SpriteFrame) sf_huidaocuowu:SpriteFrame;
+    @property(SpriteFrame) sf_chuangguanshibai:SpriteFrame;
 
     private m_extend_call:any = null;
     private m_restart_call:any = null;
@@ -61,10 +62,9 @@ export class fail extends Component {
         if(categoryid===config.PLAY_TYPE.JI_YI_LI){
             this.img_text.getComponent(Sprite).spriteFrame = this.sf_huidaocuowu;
         }else{
+            this.img_text.getComponent(Sprite).spriteFrame = this.sf_chuangguanshibai;
             this.bg.angle = -90;
             this.bg.position = new Vec3(this.bg.position.x+40,this.bg.position.y,this.bg.position.z)
-            // 闯关失败
-            this.img_text.getComponent(Sprite).spriteFrame = this.sf_huidaocuowu;
         }
        
         if(is_show_restart_video===1){

+ 2 - 2
assets/script/dialog/win.ts

@@ -18,6 +18,7 @@ export class win extends Component {
     @property(Node) img_emote:Node;
     @property(Node) lab_title_1:Node;
     @property(SpriteFrame) sf_tailihaile:SpriteFrame;
+    @property(SpriteFrame) sf_gongxi:SpriteFrame;
     private m_reward_number:number;
     private m_ordinary_call:any = null;
     private m_double_call:any = null;
@@ -88,8 +89,7 @@ export class win extends Component {
         this.m_double_call = double_call;
         this.m_ordinary_call = ordinary_call;
         this.m_reward_number = reward;
-        // this.lab_title.active = false;
-        // this.img_emote.getComponent(Sprite).spriteFrame = this.spr_reward_sf;
+        this.img_text.getComponent(Sprite).spriteFrame = this.sf_gongxi
         this.lab_reward_number.getComponent(Label).string = "+ " +reward+"";
     }
 }

BIN=BIN
assets/textrue/home/popup_window/img_popup_text_chuangguanshibai.png


+ 134 - 0
assets/textrue/home/popup_window/img_popup_text_chuangguanshibai.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "7f5c5ffc-c0d1-4e8b-ad52-c60e85dbe636",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "7f5c5ffc-c0d1-4e8b-ad52-c60e85dbe636@6c48a",
+      "displayName": "img_popup_text_chuangguanshibai",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "7f5c5ffc-c0d1-4e8b-ad52-c60e85dbe636",
+        "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": "7f5c5ffc-c0d1-4e8b-ad52-c60e85dbe636@f9941",
+      "displayName": "img_popup_text_chuangguanshibai",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 446,
+        "height": 254,
+        "rawWidth": 446,
+        "rawHeight": 254,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -223,
+            -127,
+            0,
+            223,
+            -127,
+            0,
+            -223,
+            127,
+            0,
+            223,
+            127,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            254,
+            446,
+            254,
+            0,
+            0,
+            446,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -223,
+            -127,
+            0
+          ],
+          "maxPos": [
+            223,
+            127,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "7f5c5ffc-c0d1-4e8b-ad52-c60e85dbe636@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "hasAlpha": true,
+    "redirect": "7f5c5ffc-c0d1-4e8b-ad52-c60e85dbe636@f9941"
+  }
+}

BIN=BIN
assets/textrue/home/popup_window/img_popup_text_gongxi.png


+ 134 - 0
assets/textrue/home/popup_window/img_popup_text_gongxi.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "7cabaf40-23c5-4b27-bb83-4ed014230f6d",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "7cabaf40-23c5-4b27-bb83-4ed014230f6d@6c48a",
+      "displayName": "img_popup_text_gongxi",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "7cabaf40-23c5-4b27-bb83-4ed014230f6d",
+        "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": "7cabaf40-23c5-4b27-bb83-4ed014230f6d@f9941",
+      "displayName": "img_popup_text_gongxi",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 244,
+        "height": 113,
+        "rawWidth": 244,
+        "rawHeight": 113,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -122,
+            -56.5,
+            0,
+            122,
+            -56.5,
+            0,
+            -122,
+            56.5,
+            0,
+            122,
+            56.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            113,
+            244,
+            113,
+            0,
+            0,
+            244,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -122,
+            -56.5,
+            0
+          ],
+          "maxPos": [
+            122,
+            56.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "7cabaf40-23c5-4b27-bb83-4ed014230f6d@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": true,
+    "hasAlpha": true,
+    "redirect": "7cabaf40-23c5-4b27-bb83-4ed014230f6d@f9941"
+  }
+}