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

mk_framework/assets/script/game/component/tween/ClickMoveBy.ts

@@ -1,6 +1,6 @@
 
 const { ccclass, property } = cc._decorator;
-/** 闪烁可选类型 */
+/** 状态类型 */
 enum StateType {
     /** 出去 */
     out = 0,
@@ -9,6 +9,7 @@ enum StateType {
     /** 回来 */
     back = 2,
 };
+
 /**
  * 点击弹出或返回
  * - 节点需要添加按钮组件
@@ -20,11 +21,13 @@ enum StateType {
 export default class ClickMoveBy extends cc.Component {
     /** 移动的距离 */
     @property({ tooltip: '要移动的距离' })
-    vec_move: cc.Vec2 = cc.Vec2.ZERO;
+    private vec_move: cc.Vec2 = cc.Vec2.ZERO;
+
+
     /** 当前状态 */
-    state: number = StateType.out;
+    private state: number = StateType.out;
     /** 是否要返回 */
-    is_back: boolean = false;
+    private is_back: boolean = false;
     onLoad() {
         this.node.on('click', this.StartMoveBy, this);
     }

mk_framework/assets/script/game/component/tween/FrameAnimation.ts

@@ -92,10 +92,7 @@ export default class FrameAnimation extends cc.Component {
         }
 
     }
-    /**
-     * 更新动画帧
-     * @param dt 
-     */
+    
     update(dt) {
 
         if (!this.running) return;
@@ -121,6 +118,7 @@ export default class FrameAnimation extends cc.Component {
             }
         }
     }
+
     /** 播放中 */
     private playing() {
         this.comp_spr.spriteFrame = this.images[this.frameIndex];
@@ -136,6 +134,7 @@ export default class FrameAnimation extends cc.Component {
             this.frameCallback(this.frameIndex);
         }
     }
+
     /** 播放结束 */
     private playEnd() {
         this.currentTimes++;
@@ -253,6 +252,7 @@ export default class FrameAnimation extends cc.Component {
 
         this.running = false;
     }
+    
     /**
      * 是否播放结束
      * @returns