Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

assets/script/game/component/tween/EffectOpenAndClose.ts

@@ -6,6 +6,7 @@ enum EffectType {
     scale = 1,  //缩放
     scaleToPoint = 2,    //缩放到某点
     centerUnfolding = 3,   //从中部展开
+    rightIn, //从右侧进入
 }
 /**
  * 界面打开 和 关闭效果
@@ -78,6 +79,13 @@ export default class EffectOpenAndClose extends cc.Component {
                 case EffectType.centerUnfolding:
                     mk.tween.scaleX(this.effect_par);
                     break;
+                case EffectType.rightIn:
+                    this.effect_par.active = true;
+                    this.effect_par.x = 1000;
+                    cc.tween(this.effect_par)
+                        .to(0.3, { x: 0 }, cc.easeOut(3))
+                        .start()
+                    break;
             }
         }
     }
@@ -116,6 +124,15 @@ export default class EffectOpenAndClose extends cc.Component {
                         }
                     }
                     break;
+                case EffectType.rightIn:
+                    cc.tween(this.effect_par)
+                        .to(0.3, { x: 1000 }, cc.easeOut(3))
+                        .call(() => {
+                            this.effect_par.active = false;
+                            cb && cb();
+                        })
+                        .start()
+                    break;
             }
         } else {
             cb && cb();

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

@@ -34,6 +34,8 @@ export class BlessingBagData extends Data {
 
     setAdData(data) {
         super.setAdData(data);
+
+        this.UpdateVideoProgress(data);
     }
 
     ServerInit(data: any) {

assets/script/game/module/module/blessingBag/BlessingBag.ts

@@ -1,3 +1,8 @@
+/**
+ * @description 福袋界面类
+ * @author kaka
+ */
+
 import { AdFun } from "../../../data/AdData";
 import { cashProType } from "../../../data/module/CashProData";
 import BlessingBagItem from "./BlessingBagItem";

assets/script/game/module/module/blessingBag/BlessingBagItem.ts

@@ -1,4 +1,7 @@
-
+/**
+ * @description 福袋item
+ * @author kaka
+ */
 
 const { ccclass, property } = cc._decorator;
 

assets/script/game/module/module/cashPro/CashPro.ts

@@ -1,5 +1,5 @@
 /** 
- * @description 提现结果
+ * @description 提现结果界面类
  * @author kaka
  */
 const { ccclass, property } = cc._decorator;