kaka 5 lat temu
rodzic
commit
2696b4a433

Plik diff jest za duży
+ 298 - 238
assets/resources/module/blessingBag/blessingBag.prefab


Plik diff jest za duży
+ 244 - 182
assets/resources/module/cashPro/cashPro.prefab


+ 28 - 22
assets/script/game/module/module/blessingBag/BlessingBag.ts

@@ -5,7 +5,6 @@
 
 import { AdFun } from "../../../data/AdData";
 import { cashProType } from "../../../data/module/CashProData";
-import BlessingBagItem from "./BlessingBagItem";
 
 
 const { ccclass, property } = cc._decorator;
@@ -71,12 +70,12 @@ export default class BlessingBag extends cc.Component {
     /**红包页面类型 1 大额 2 任务*/
     private rbPanelType: number = 0;
 
-    private adrbArray: BlessingBagItem[] = [];
+    private adrbArray = [];
 
     private isPlayInitAni = true;
 
     onLoad() {
-        // this.testNode.active = gData.gameData.configs.globalCfg.VideoRedBagEmpty == 1;
+        this.testNode.active = gData.gameData.configs.globalCfg.VideoRedBagEmpty == 1;
     }
 
     onEnable() {
@@ -84,13 +83,13 @@ export default class BlessingBag extends cc.Component {
         this.isPlayInitAni = true;
     }
 
-    onDisable() {
-        if (this.adrbArray.length >= 4) {
-            for (let i = 0; i < this.adrbArray.length; i++) {
-                this.adrbArray[i].OnExit();
-            }
-        }
-    }
+    // onDisable() {
+    //     if (this.adrbArray.length >= 4) {
+    //         for (let i = 0; i < this.adrbArray.length; i++) {
+    //             this.adrbArray[i].OnExit();
+    //         }
+    //     }
+    // }
 
     update(dt) {
         this.PlayMoneyAniUpdate(dt);
@@ -160,18 +159,29 @@ export default class BlessingBag extends cc.Component {
         if (this.adrbArray.length < 4) {
             this.adrbArray = [];
             this.itemContent.removeAllChildren();
+
             for (let i = 0; i < data.redMonies.length; i++) {
-                let copyitem = cc.instantiate(this.blassingBagItem);
-                copyitem.active = true;
-                this.itemContent.addChild(copyitem);
-                let copySrc = copyitem.getComponent(BlessingBagItem);
-                copySrc.Init(data.redMonies[i], gData.blessingBag.isPlayAniUpdate, this.isPlayInitAni);
-                this.adrbArray.push(copySrc);
+                let obj = {
+                    data: data.redMonies[i],
+                    isPlayAniUpdate: gData.blessingBag.isPlayAniUpdate,
+                    isPlayInitAni: this.isPlayInitAni
+                }
+                this.adrbArray.push(obj);
             }
+            this.itemContent.emit('srollview-init', this.adrbArray);
         } else {
+            this.adrbArray = [];
+
             for (let i = 0; i < data.redMonies.length; i++) {
-                this.adrbArray[i].Init(data.redMonies[i], gData.blessingBag.isPlayAniUpdate, this.isPlayInitAni);
+                let obj = {
+                    data: data.redMonies[i],
+                    isPlayAniUpdate: gData.blessingBag.isPlayAniUpdate,
+                    isPlayInitAni: this.isPlayInitAni
+                }
+                this.adrbArray.push(obj);
             }
+            //刷新
+
         }
 
         this.isPlayInitAni = false;
@@ -304,12 +314,8 @@ export default class BlessingBag extends cc.Component {
         }
     }
 
-    Click_RedCodeBtn() {
-        // UIMng.Ins.AsyncGetPanel(PanelType.RedCodeListPanel, (panel) => {
-        //     panel.OnEnter(60);
-        // });
-    }
 
+    /** 点击帮助回调 */
     clickHelpCallBack() {
         gData.help.getDescContent(this.node.name)
     }

+ 10 - 1
assets/script/game/module/module/blessingBag/BlessingBagItem.ts

@@ -6,7 +6,7 @@
 const { ccclass, property } = cc._decorator;
 
 @ccclass
-export default class BlessingBagItem extends cc.Component {
+export default class BlessingBagItem extends cc.Component{
 
     @property(cc.Label)
     txtNum: cc.Label = null;
@@ -35,6 +35,15 @@ export default class BlessingBagItem extends cc.Component {
 
     isPlayAni: boolean = false;
 
+    /**
+     * list_data
+     * @param data item数据
+     */
+    public async setItemData(bData) {
+        let data = bData.item_data;
+        this.Init(data.data, data.isPlayAniUpdate, data.isPlayInitAni);
+    }
+
     Init(data: any, isPlayAni: boolean = false, isPlayInitAni: boolean = false) {
         this.data = data;
         this.txtNum.string = data.redMoney + "元";

+ 1 - 0
assets/script/game/module/module/cashPro/CashPro.ts

@@ -85,6 +85,7 @@ export default class CashPro extends cc.Component {
 
     showCashPro() {
         this.cashPro.active = true;
+        mk.tween.moveTo(this.cashPro, 0.3, cc.v2(1000, 0), cc.v2(0, 0));
         this.labMoney.string = `¥${this.money}`
     }
 

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików