兑换码界面调整

assets/resources/module/redeem/RedeemNode.prefab

@@ -516,15 +516,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 241,
+      "g": 160,
+      "b": 36,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 292,
-      "height": 35
+      "width": 144,
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -561,7 +561,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -575,21 +575,22 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "228bd30f-23b1-44ad-986a-1352c203da41"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
+    "_string": "新手礼包",
+    "_N$string": "新手礼包",
+    "_fontSize": 36,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
     "_id": ""
   },
   {
@@ -600,7 +601,7 @@
     "asset": {
       "__uuid__": "2115765a-89cf-4ed8-8984-9cc608d7cad4"
     },
-    "fileId": "7coDkmQaRPDKa56kqfPVt6",
+    "fileId": "4fyzkG+kRIH5LVDStXjUce",
     "sync": false
   },
   {
@@ -9627,6 +9628,9 @@
       "__id__": 1
     },
     "_enabled": true,
+    "lab_title": {
+      "__id__": 13
+    },
     "txtGiftName": {
       "__id__": 134
     },

assets/script/game/data/AppData.ts

@@ -31,7 +31,7 @@ export class AppData {
     /** 安卓版本号 */
     public androidVersion: string = '';
 
-    public mac: string = 'c9:24:e2:12:b3:23,f6:60:e4:1a:b7:27';
+    public mac: string = '5d:24:e2:12:b3:23,f6:60:e4:1a:b7:27';
 
     /** 设备信息 */
     public machineInfo = {

assets/script/game/data/module/RewardData.ts

@@ -6,7 +6,7 @@ import { RewardType } from "../GameData";
  * @author 邹勇 薛鸿潇
  */
 export class RewardData extends Data {
-    
+
     /** 增加的红包币 */
     public add_redbag_value: number = 0;
 
@@ -48,18 +48,8 @@ export class RewardData extends Data {
         let is_add_money = true;
         const i_count = gData.reward.data.length;
         for (let i = 0; i < i_count; i++) {
-            let target_node = gData.gameData.gameStyle.icon_hb;
-            if (gData.reward.data[i].rewardType == RewardType.redBag) {
-                target_node = gData.gameData.gameStyle.icon_hb;
-            } else if (gData.reward.data[i].rewardType == RewardType.rmb) {
-                // target_node = gData.gameData.gameStyle.icon_zb;
-            } else if (gData.reward.data[i].rewardType == RewardType.pigRmb) {
-                target_node = gData.gameData.gameStyle.icon_zb;
-            }
-            const end_world_pos = target_node.parent.convertToWorldSpaceAR(target_node.getPosition());
-            const end_node_pos = gData.gameData.gameStyle.node.parent.convertToNodeSpaceAR(end_world_pos);
             let start_node_pos = new cc.Vec2(0, -300);
-            mk.fly.PlayCoinAnim(gData.reward.data[i].rewardType, 10, start_node_pos, end_world_pos, () => {
+            mk.fly.PlayCoinAnim(gData.reward.data[i].rewardType, 10, start_node_pos, '', () => {
                 is_add_money && this.addReward();
             })
         }

assets/script/game/module/moreGame/MoreGamePopNode.ts

@@ -4,6 +4,7 @@
  */
 
 import JsbSystem from "../../../mk/system/JsbSystem";
+import { RewardType } from "../../data/GameData";
 
 
 const { ccclass, property } = cc._decorator;
@@ -71,6 +72,6 @@ export default class MoreGamePopNode extends cc.Component {
         // mk.audio.playEffect('getGold');
         mk.tip.pop('红包币+300');
         //     GameM.commonData.updateRedMoney(300, RecordTYPE.online)
-        mk.fly.PlayCoinAnim(1, 20, cc.v2(0, -300), cc.v2(0, 0));
+        mk.fly.PlayCoinAnim(RewardType.pigRmb, 20, cc.v2(0, -300));
     }
 }

assets/script/game/module/redeem/RedeemNode.ts

@@ -10,6 +10,9 @@ const { ccclass, property } = cc._decorator;
 export default class RedeemNode extends cc.Component {
 
     @property(cc.Label)
+    lab_title: cc.Label = null;
+
+    @property(cc.Label)
     txtGiftName: cc.Label = null;
 
     @property(cc.Prefab)
@@ -57,10 +60,11 @@ export default class RedeemNode extends cc.Component {
 
     InitData() {
         let data = gData.redeem.redeemData.redemption;
-        if (!data.content) {
-            mk.ui.closePanel('module/redeem/RedeemNode');
+        if (!data) {
+            mk.ui.closePanel(this.node.name);
             return
         }
+        this.lab_title.string = data.title;
         this.txtGiftName.string = data.title;
         this.rewardData = data.content;
         for (let n of this.rds) {
@@ -142,7 +146,7 @@ export default class RedeemNode extends cc.Component {
 
         for (let i = 0; i < this.rewardData.length; i++) {
             mk.audio.playEffect('rewardClose');
-            mk.fly.PlayCoinAnim(this.rewardData[i].type, 5, cc.v2(0, -300), cc.v2(0, 0))
+            mk.fly.PlayCoinAnim(this.rewardData[i].type, 5, cc.v2(0, -300));
         }
 
 

assets/script/mk/system/FlySystem.ts

@@ -1,3 +1,5 @@
+import { RewardType } from "../../game/data/GameData";
+
 /** 
  * @description 获取道具特效
  * @author kaka 
@@ -15,10 +17,10 @@ export default class FlySystem extends cc.Component {
      * @param type 类型 道具id  10001，10002
      * @param num 特效数量
      * @param pos 起始位置
-     * @param endpos 飞行目标的世界坐标 或目标对象路径
+     * @param endpos 飞行目标的世界坐标 或目标对象路径  如果为""，则飞到主界面货币按钮处 默认""
      * @param cb 动画结束回调
     */
-    public async PlayCoinAnim(type: number = 0, num: number, pos: cc.Vec2, endpos: cc.Vec2 | string, item_cb: Function = null) {
+    public async PlayCoinAnim(type: number = 0, num: number, pos: cc.Vec2, endpos: cc.Vec2 | string = '', item_cb: Function = null) {
         for (let i = 0; i < num; i++) {
             let copyCoin = await mk.pool.getPrefab('game/prefab/coin');
             let url = 'game/texture/coin/' + type;
@@ -56,6 +58,17 @@ export default class FlySystem extends cc.Component {
         let end_pos: cc.Vec2 = null;
         let end_node: cc.Node = null;
         if (typeof end === 'string') {
+            if (end == '') {
+                let url = ''
+                if (type == RewardType.redBag) {
+                    url = 'Canvas/界面层/game/node_ui/顶部个人信息/红包币按钮/icon_hb';
+                }
+                else if (type == RewardType.pigRmb) {
+                    url = 'Canvas/界面层/game/node_ui/顶部个人信息/金猪币按钮/icon_zb';
+                }
+                end = url;
+            }
+
             end_node = cc.find(end as string);
             let world_pos = end_node.parent.convertToWorldSpaceAR(end_node.getPosition());
             end_pos = this.node.convertToNodeSpaceAR(world_pos);