456

assets/resources/ui/exchange_car_view.prefab

@@ -1564,7 +1564,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "btn_true",
+    "_name": "btn_exchange",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1621,7 +1621,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_true",
+    "_name": "Label",
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
@@ -1719,7 +1719,7 @@
       "b": 27,
       "a": 255
     },
-    "_string": "确   定",
+    "_string": "兑   换",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 50,
@@ -3815,12 +3815,9 @@
     "lab_total_count": {
       "__id__": 44
     },
-    "btn_true": {
+    "btn_exchange": {
       "__id__": 62
     },
-    "lab_true": {
-      "__id__": 63
-    },
     "success_view": {
       "__id__": 94
     },

assets/resources/ui/sign_reward_alone_item.prefab

@@ -1162,8 +1162,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
+      "x": 10,
+      "y": -17.5,
       "z": 0
     },
     "_lrot": {
@@ -1225,8 +1225,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 2,
-      "y": 2,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -1339,8 +1339,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 400,
-      "height": 335
+      "width": 364,
+      "height": 290
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1412,10 +1412,10 @@
     },
     "_alignFlags": 45,
     "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
+    "_left": 28,
+    "_right": 8,
+    "_top": 40,
+    "_bottom": 5,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -1535,6 +1535,7 @@
     "img_state": {
       "__id__": 38
     },
+    "img_bg": null,
     "lab_xingqi": {
       "__id__": 3
     },
@@ -1553,6 +1554,10 @@
     "img_mask": {
       "__id__": 44
     },
+    "sf_icon_lq": null,
+    "sf_icon_bq": null,
+    "sf_item_default": null,
+    "sf_item_current": null,
     "_id": ""
   },
   {

assets/resources/ui/sign_reward_item.prefab

@@ -1162,8 +1162,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
+      "x": 10.5,
+      "y": -18,
       "z": 0
     },
     "_lrot": {
@@ -1339,8 +1339,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 203,
-      "height": 335
+      "width": 174,
+      "height": 287
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1412,10 +1412,10 @@
     },
     "_alignFlags": 45,
     "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
+    "_left": 25,
+    "_right": 4,
+    "_top": 42,
+    "_bottom": 6,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,

assets/script/ui/exchange_car_view/exchange_car_view.ts

@@ -18,12 +18,10 @@ export class exchange_car_view extends base_ui {
     @property(Node) img_car:Node = null
     @property(Node) lab_current_count:Node = null
     @property(Node) lab_total_count:Node = null
-    @property(Node) btn_true:Node = null
-    @property(Node) lab_true:Node = null
+    @property(Node) btn_exchange:Node = null
 
     @property(Node) success_view:Node = null
 
-    private is_can_exchange:boolean = false
     private m_car_id:number = 0
     private m_cb = null
 
@@ -31,12 +29,8 @@ export class exchange_car_view extends base_ui {
         this.onButtonListen(this.bg_public_bg, ()=>{
             this.close()
         })
-        this.onButtonListen(this.btn_true, ()=>{
-            if(this.is_can_exchange) {
-                this.requestExchangeCar()
-            } else {
-                this.close()
-            }
+        this.onButtonListen(this.btn_exchange, ()=>{
+            this.requestExchangeCar()
         })
     }
 
@@ -56,11 +50,9 @@ export class exchange_car_view extends base_ui {
         this.lab_total_count.getComponent(Label).string = `/${car_item.unlock_points}` 
 
         if(data.sp_count>=car_item.unlock_points) {
-            this.lab_true.getComponent(Label).string = '兑   换'
-            this.is_can_exchange = true
+            this.btn_exchange.active = true
         } else {
-            this.lab_true.getComponent(Label).string = '确   定'
-            this.is_can_exchange = false
+            this.btn_exchange.active = false
         }
     }
 

assets/script/ui/sign_view/sign_reward_alone_item.ts

@@ -48,6 +48,7 @@ export class sign_reward_alone_item extends base_ui {
         this.lab_count.getComponent(Label).string = `x${data.quantity}`
         this.lab_name.getComponent(Label).string = data.name
 
+        this.img_state.active = false
         if(data.receive_status==1) {
             // 已领取
             this.img_mask.active = true
@@ -57,7 +58,6 @@ export class sign_reward_alone_item extends base_ui {
             this.img_mask.active = false
 
             // 当前今天
-            this.img_state.active = false
             if(data.current_sign_status==1) {
                 this.img_state.active = true
                 this.img_state.getComponent(Sprite).spriteFrame = this.sf_icon_lq

assets/script/ui/sign_view/sign_reward_item.ts

@@ -48,6 +48,7 @@ export class sign_reward_item extends base_ui {
         this.lab_count.getComponent(Label).string = `x${data.quantity}`
         this.lab_name.getComponent(Label).string = data.name
 
+        this.img_state.active = false
         if(data.receive_status==1) {
             // 已领取
             this.img_mask.active = true
@@ -57,7 +58,6 @@ export class sign_reward_item extends base_ui {
             this.img_mask.active = false
 
             // 当前今天
-            this.img_state.active = false
             if(data.current_sign_status==1) {
                 this.img_state.active = true
                 this.img_state.getComponent(Sprite).spriteFrame = this.sf_icon_lq

assets/script/ui/sign_view/sign_view.ts

@@ -52,11 +52,11 @@ export class sign_view extends base_ui {
         if(today_data.receive_status==0) {
             this.btn_sign.getComponent(Sprite).spriteFrame = this.sf_btn_sign_qd
             this.lab_sign.getComponent(Label).color = new Color().fromHEX("#A3511B")
-            this.lab_sign.getComponent(Label).string = '签   到'
+            this.lab_sign.getComponent(Label).string = '签    到'
         } else {
             this.btn_sign.getComponent(Sprite).spriteFrame = this.sf_btn_sign_yqd
             this.lab_sign.getComponent(Label).color = new Color().fromHEX("#464646")
-            this.lab_sign.getComponent(Label).string = '已签到'
+            this.lab_sign.getComponent(Label).string = '今日已签到'
         }
         this.btn_sign.active = true
     }