456

assets/resources/ui/home.prefab

@@ -852,8 +852,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 185,
-      "height": 190
+      "width": 190,
+      "height": 200
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -971,8 +971,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 185,
-      "height": 190
+      "width": 190,
+      "height": 200
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/resources/ui/rank_list_item.prefab

@@ -1861,6 +1861,9 @@
     "__prefab": {
       "__id__": 79
     },
+    "img_number": {
+      "__id__": 2
+    },
     "lab_number": {
       "__id__": 3
     },
@@ -1885,10 +1888,22 @@
     "lab_region": {
       "__id__": 15
     },
-    "sf_region_bg_quater_rank": {
+    "sf_quater_region_bg_rank": {
       "__uuid__": "e2ea4429-1e57-4b07-b471-09fa2c5b85ab@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
+    "sf_quater_rank_1": {
+      "__uuid__": "c14de7ad-0c82-41f1-a391-edc0afe03ea1@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "sf_quater_rank_2": {
+      "__uuid__": "c799ab24-021c-483c-8ee9-3ac7de5685fc@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "sf_quater_rank_3": {
+      "__uuid__": "ad9af1ee-0aa1-4469-9a18-0b97a927a126@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
     "_id": ""
   },
   {

assets/resources/ui/sign_reward_alone_item.prefab

@@ -775,7 +775,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -4,
-      "y": -109,
+      "y": -107,
       "z": 0
     },
     "_lrot": {

assets/resources/ui/sign_reward_item.prefab

@@ -1145,7 +1145,7 @@
         "__id__": 45
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 51
@@ -1162,7 +1162,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 10.5,
+      "x": 11,
       "y": -17.5,
       "z": 0
     },
@@ -1339,7 +1339,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 164,
+      "width": 165,
       "height": 276
     },
     "_anchorPoint": {
@@ -1413,7 +1413,7 @@
     "_alignFlags": 45,
     "_target": null,
     "_left": 30,
-    "_right": 9,
+    "_right": 8,
     "_top": 47,
     "_bottom": 12,
     "_horizontalCenter": 0,

assets/resources/ui/user_info_view.prefab

@@ -146,7 +146,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -358,8 +358,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -17,
-      "y": 629,
+      "x": 28,
+      "y": 623,
       "z": 0
     },
     "_lrot": {
@@ -563,8 +563,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 185,
-      "height": 190
+      "width": 190,
+      "height": 200
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -682,8 +682,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 185,
-      "height": 190
+      "width": 190,
+      "height": 200
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -927,7 +927,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 226,
-      "height": 224
+      "height": 236
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -7840,7 +7840,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/script/ui/rank/rank_list_item.ts

@@ -10,6 +10,7 @@ const { ccclass, property } = _decorator;
 
 @ccclass('rank_list_item')
 export class rank_list_item extends base_ui {
+    @property(Node) img_number:Node = null
     @property(Node) lab_number:Node = null;
     @property(Node) img_avatar:Node = null;
     @property(Node) img_avatar_border:Node = null;
@@ -19,7 +20,11 @@ export class rank_list_item extends base_ui {
     @property(Node) region_bg:Node = null;
     @property(Node) lab_region:Node = null;
 
-    @property(SpriteFrame) sf_region_bg_quater_rank:SpriteFrame = null
+    @property(SpriteFrame) sf_quater_region_bg_rank:SpriteFrame = null
+    @property(SpriteFrame) sf_quater_rank_1:SpriteFrame = null
+    @property(SpriteFrame) sf_quater_rank_2:SpriteFrame = null
+    @property(SpriteFrame) sf_quater_rank_3:SpriteFrame = null
+
     private m_data:rankData = null
 
     protected start(): void {
@@ -51,6 +56,24 @@ export class rank_list_item extends base_ui {
 
     initQuarterRank(data:rankData, index, quarter_rank_data:quarter_rank_item_data) {
         this.m_data = data
+        if(index<3) {
+            this.lab_number.active = false
+            switch (index) {
+                case 0:
+                    this.img_number.getComponent(Sprite).spriteFrame = this.sf_quater_rank_1
+                    break;
+                case 1:
+                    this.img_number.getComponent(Sprite).spriteFrame = this.sf_quater_rank_2
+                    break;
+                case 2:
+                    this.img_number.getComponent(Sprite).spriteFrame = this.sf_quater_rank_3
+                    break;    
+                default:
+                    break;
+            }
+        } else {
+            this.lab_number.active = true
+        }
         this.lab_number.getComponent(Label).string = index+1 + ''
         tools.loadRemoteImg(data.avatarUrl, (r)=>{
             this.img_avatar.getComponent(Sprite).spriteFrame = r.sf
@@ -60,7 +83,7 @@ export class rank_list_item extends base_ui {
                 this.img_avatar_border.getComponent(Sprite).spriteFrame = r.sf
             })
         }
-        this.region_bg.getComponent(Sprite).spriteFrame = this.sf_region_bg_quater_rank
+        this.region_bg.getComponent(Sprite).spriteFrame = this.sf_quater_region_bg_rank
         tools.substringRankRegionName(this.lab_region, data.city_name)
         tools.labelCutString(this.lab_nickname,data.nickName,8,false) //this.lab_nickname.getComponent(Label).string = data.nickName
         this.lab_score.getComponent(Label).string = data.score + ' 分'

assets/script/ui/sign_view/sign_receive_reward.ts

@@ -1,6 +1,6 @@
 import { _decorator, Component, Label, Node, Sprite, Animation, SpriteFrame } from 'cc';
 import { base_ui } from '../../fw/base_ui';
-import { sign_reward_data } from '../../data';
+import { sign_reward_data, sign_total_reward_data } from '../../data';
 import { tools } from '../../tools';
 import { http } from '../../http';
 import { config } from '../../config';
@@ -21,7 +21,7 @@ export class sign_receive_reward extends base_ui {
 
     @property(SpriteFrame) sf_dangrihuode = null
     @property(SpriteFrame) sf_gongxihuode = null
-    private m_data:sign_reward_data = null
+    private m_reward_data:sign_reward_data = null
     private m_cb = null
     start() {
         this.onButtonListen(this.public_bg, ()=>{
@@ -39,7 +39,7 @@ export class sign_receive_reward extends base_ui {
     }
 
     initView(data:sign_reward_data, cb) {
-        this.m_data = data
+        this.m_reward_data = data
         this.m_cb = cb
         this.img_title.getComponent(Sprite).spriteFrame = this.sf_dangrihuode
         this.node_btn.active = true
@@ -47,12 +47,30 @@ export class sign_receive_reward extends base_ui {
             this.img_icon.getComponent(Sprite).spriteFrame = d.sf
         })
         this.lab_name.getComponent(Label).string = data.name
-        this.lab_count.getComponent(Label).string = `x${data.quantity}`
+        this.setLabCount(data.quantity)
     }
 
-    private showRewardDetails() {
+    initReceiveSuccess(data:sign_total_reward_data) {
         this.img_title.getComponent(Sprite).spriteFrame = this.sf_gongxihuode
         this.node_btn.active = false
+        tools.loadRemoteImg(data.icon, (d)=>{
+            this.img_icon.getComponent(Sprite).spriteFrame = d.sf
+        })
+        this.lab_name.getComponent(Label).string = data.name
+        this.setLabCount(data.quantity)
+    }
+
+    private setLabCount(count:number) {
+        this.lab_count.getComponent(Label).string = `x${count}`
+    }
+
+    private showRewardDetails(is_double:boolean) {
+        this.img_title.getComponent(Sprite).spriteFrame = this.sf_gongxihuode
+        this.node_btn.active = false
+        if(is_double) {
+            let count = this.m_reward_data.quantity * 2
+            this.setLabCount(count)
+        }
     }
 
     private closeSelf() {
@@ -66,14 +84,14 @@ export class sign_receive_reward extends base_ui {
             stype = 2
         }
         uiManager.Instance().showLoading()
-        let opt = {'index':this.m_data.index, 'stype': stype}
+        let opt = {'index':this.m_reward_data.index, 'stype': stype}
         http.post(config.API.user_sign, opt, (err,d)=>{
             uiManager.Instance().hideLoading()
             if(!err){
                 let nd = JSON.parse(d)
                 if(nd.code === config.status.SUCCESS){
                     // console.log("user_sign", nd.content)
-                    this.showRewardDetails()
+                    this.showRewardDetails(is_double)
                     this.m_cb && this.m_cb(this)
                 }
             }

assets/script/ui/sign_view/sign_total_reward.ts

@@ -90,7 +90,7 @@ export class sign_total_reward extends Component {
                 let nd = JSON.parse(d)
                 if(nd.code === config.status.SUCCESS){
                     console.log("累计领取", nd.content)
-                    this.m_cb && this.m_cb()
+                    this.m_cb && this.m_cb(data)
                 }
             }
         })

assets/script/ui/sign_view/sign_view.ts

@@ -4,7 +4,7 @@ import { http } from '../../http';
 import { config } from '../../config';
 import { sign_reward } from './sign_reward';
 import { sign_total_reward } from './sign_total_reward';
-import { sign_reward_data } from '../../data';
+import { sign_reward_data, sign_total_reward_data } from '../../data';
 import { sign_receive_reward } from './sign_receive_reward';
 import { GameManager } from '../../GameManager';
 const { ccclass, property } = _decorator;
@@ -41,7 +41,7 @@ export class sign_view extends base_ui {
             if(!err){
                 let nd = JSON.parse(d)
                 if(nd.code === config.status.SUCCESS){
-                    console.log("sign_list", nd.content)
+                    // console.log("sign_list", nd.content)
                     let total_sign_number = nd.content.total_sign_number
                     this.reward_node.getComponent(sign_reward).initView(nd.content.sign_reward_list,this.onRewardCallBack.bind(this),this.onClickRewardItem.bind(this))
                     this.total_reward_node.getComponent(sign_total_reward).initView(total_sign_number, nd.content.sign_total_reward_list,this.onClickTotalRewardItem.bind(this))
@@ -77,7 +77,9 @@ export class sign_view extends base_ui {
         }
     }
 
-    private onClickTotalRewardItem() {
+    private onClickTotalRewardItem(data:sign_total_reward_data) {
+        this.receive_reward.active = true
+        this.receive_reward.getComponent(sign_receive_reward).initReceiveSuccess(data)
         this.requestSignListData()
     }
 

assets/texture/ui/quarter_rank_view/quarter_rank_icon_1.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "c14de7ad-0c82-41f1-a391-edc0afe03ea1",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "c14de7ad-0c82-41f1-a391-edc0afe03ea1@6c48a",
+      "displayName": "quarter_rank_icon_1",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "c14de7ad-0c82-41f1-a391-edc0afe03ea1",
+        "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": "c14de7ad-0c82-41f1-a391-edc0afe03ea1@f9941",
+      "displayName": "quarter_rank_icon_1",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0.5,
+        "offsetY": 0,
+        "trimX": 1,
+        "trimY": 0,
+        "width": 103,
+        "height": 114,
+        "rawWidth": 104,
+        "rawHeight": 114,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -51.5,
+            -57,
+            0,
+            51.5,
+            -57,
+            0,
+            -51.5,
+            57,
+            0,
+            51.5,
+            57,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            1,
+            114,
+            104,
+            114,
+            1,
+            0,
+            104,
+            0
+          ],
+          "nuv": [
+            0.009615384615384616,
+            0,
+            1,
+            0,
+            0.009615384615384616,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -51.5,
+            -57,
+            0
+          ],
+          "maxPos": [
+            51.5,
+            57,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c14de7ad-0c82-41f1-a391-edc0afe03ea1@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "c14de7ad-0c82-41f1-a391-edc0afe03ea1@f9941"
+  }
+}

assets/texture/ui/quarter_rank_view/quarter_rank_icon_2.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "c799ab24-021c-483c-8ee9-3ac7de5685fc",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "c799ab24-021c-483c-8ee9-3ac7de5685fc@6c48a",
+      "displayName": "quarter_rank_icon_2",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "c799ab24-021c-483c-8ee9-3ac7de5685fc",
+        "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": "c799ab24-021c-483c-8ee9-3ac7de5685fc@f9941",
+      "displayName": "quarter_rank_icon_2",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": -0.5,
+        "trimX": 0,
+        "trimY": 1,
+        "width": 101,
+        "height": 95,
+        "rawWidth": 101,
+        "rawHeight": 96,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -50.5,
+            -47.5,
+            0,
+            50.5,
+            -47.5,
+            0,
+            -50.5,
+            47.5,
+            0,
+            50.5,
+            47.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            95,
+            101,
+            95,
+            0,
+            0,
+            101,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            0.9895833333333334,
+            1,
+            0.9895833333333334
+          ],
+          "minPos": [
+            -50.5,
+            -47.5,
+            0
+          ],
+          "maxPos": [
+            50.5,
+            47.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c799ab24-021c-483c-8ee9-3ac7de5685fc@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "c799ab24-021c-483c-8ee9-3ac7de5685fc@f9941"
+  }
+}

assets/texture/ui/quarter_rank_view/quarter_rank_icon_3.png.meta

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