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

assets/resources/module/sign/sign.prefab

@@ -212,7 +212,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        39.963,
+        152.918,
         0,
         0,
         0,
@@ -326,7 +326,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        35,
+        147.955,
         0,
         0,
         0,
@@ -620,7 +620,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        374.498,
+        487.453,
         0,
         0,
         0,
@@ -834,7 +834,7 @@
       "ctor": "Float64Array",
       "array": [
         295.698,
-        -377.921,
+        -264.966,
         0,
         0,
         0,
@@ -941,7 +941,7 @@
       "ctor": "Float64Array",
       "array": [
         295.698,
-        -379.526,
+        -266.571,
         0,
         0,
         0,
@@ -1074,7 +1074,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -431.993,
+        -319.038,
         0,
         0,
         0,
@@ -1587,7 +1587,7 @@
       "ctor": "Float64Array",
       "array": [
         303.19,
-        464.26,
+        577.215,
         0,
         0,
         0,

assets/resources/module/turnable/texture/zhuanpan2.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 543,
-  "height": 543,
+  "width": 535,
+  "height": 545,
   "platformSettings": {},
   "subMetas": {
     "zhuanpan2": {
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 543,
-      "height": 543,
-      "rawWidth": 543,
-      "rawHeight": 543,
+      "width": 535,
+      "height": 545,
+      "rawWidth": 535,
+      "rawHeight": 545,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/module/turnable/turnable.prefab

@@ -1007,8 +1007,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 543,
-      "height": 543
+      "width": 535,
+      "height": 545
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1024,8 +1024,8 @@
         0,
         0,
         0,
-        -0.21643961393810288,
-        0.9762960071199334,
+        -0.26723837607825685,
+        0.963630453208623,
         1,
         1,
         1
@@ -1035,7 +1035,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": -25
+      "z": -31
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -2026,7 +2026,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "98r2cpWPlKbIXSTRZi2ltd",
+    "fileId": "d3Z2dZPxlCqY3I/qqgj90n",
     "sync": false
   },
   {
@@ -2158,7 +2158,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "51tbO9E2dGJIK70TVp5zXx",
+    "fileId": "25gILcs+hPop60oprXEqBh",
     "sync": false
   },
   {
@@ -2290,7 +2290,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "d88UfN1BZFHY4bvsipwGnv",
+    "fileId": "51Rdhj3hZEzLNg3SdsPRNG",
     "sync": false
   },
   {
@@ -2503,7 +2503,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "53HCly4QJDNYoWJDsP9aLl",
+    "fileId": "0edKsBML9JobVgIidB0UVl",
     "sync": false
   },
   {

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

@@ -126,7 +126,7 @@ export default class EffectOpenAndClose extends cc.Component {
                     }
                     break;
                 case EffectType.rightIn:
-                    mk.tween.move(this.effect_par, 0.3, this.effect_par.getPosition(), new cc.Vec2(this.effect_par.x, 1000), () => {
+                    mk.tween.move(this.effect_par, 0.3, this.effect_par.getPosition(), new cc.Vec2(1000, this.effect_par.y), () => {
                         this.effect_par.active = false;
                         cb && cb();
                     }, 'sineOut')
@@ -135,7 +135,7 @@ export default class EffectOpenAndClose extends cc.Component {
                     //     .to(0.3, { x: 1000 }, cc.easeOut(3))
                     //     .call(() => {
                     //         this.effect_par.active = false;
-                    //         if (typeof cb == 'function') cb();
+                    //         cb && cb();
                     //     })
                     //     .start()
                     break;

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

@@ -20,9 +20,15 @@ export default class GuideWeakData {
     public init() {
         // this.data_config = data_config;
         if (gData.gameData.configs.ServerConfig.triggerTime)
-            this.data_config.triggerTime = gData.gameData.configs.ServerConfig.triggerTime;
+            this.data_config.triggerTime = parseInt(gData.gameData.configs.ServerConfig.triggerTime);
         if (gData.gameData.configs.ServerConfig.panelWeight) {
-
+            // 8:70,5:30
+            this.data_config.panelWeight = {}
+            let new_weight = gData.gameData.configs.ServerConfig.panelWeight.split(',')
+            for (let i = 0; i < new_weight.length; i++) {
+                const item_str = new_weight[i].split(':');
+                this.data_config.panelWeight[item_str[0]] = parseInt(item_str[1]);
+            }
         }
     }
     /**
@@ -32,12 +38,6 @@ export default class GuideWeakData {
      */
     public data_config = {
         panelWeight: {
-            "1": 10,
-            "2": 10,
-            "4": 10,
-            "5": 10,
-            "6": 10,
-            "7": 10
         },
         triggerTime: 5
     }
@@ -83,7 +83,8 @@ export default class GuideWeakData {
     }
     public openPanelByBtn() {
         const panel_id = gData.guideWeakData.cur_guide_id
-        gData.gameData.funBtns['btn' + panel_id].emit('click')
+        if (gData.gameData.funBtns['btn' + panel_id])
+            gData.gameData.funBtns['btn' + panel_id].emit('click')
     }
     public panel_name_config = {
         moreGame: 1,

assets/script/game/module/guideWeak/GuideWeak.ts

@@ -16,6 +16,7 @@ export default class GuideWeak extends cc.Component {
         if (!gData.guideWeakData.enable) return;
         if (!gData.guideWeakData.data_config.triggerTime) return;
         if (gData.guideWeakData.cur_guide_id) return;
+        if (!mk.guide.isGuideComplete()) return;
 
         gData.guideWeakData.silent_time += dt;
         if (gData.guideWeakData.silent_time >= gData.guideWeakData.data_config.triggerTime) {
@@ -35,7 +36,6 @@ export default class GuideWeak extends cc.Component {
     }
     /** 玩家的屏幕触摸操作 */
     private onClickCall(touch) {
-        cc.log('弱引导计时重置');
         gData.guideWeakData.silent_time = 0;
     }
 

assets/script/mk/system/GuideSystem.ts

@@ -31,4 +31,16 @@ export default class GuideSystem {
         }
         gData.gameData.setProp(GameProp.guideID, this.crtGuideID);
     }
+
+    /**
+     * 引导是否完成
+     * @returns true 已完成
+     */
+    public isGuideComplete(): Boolean {
+        if (!this.crtGuideID || this.crtGuideID === 999) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 }