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

# Conflicts:
#	assets/resources/game/prefab/game.prefab

assets/resources/game/prefab/game.prefab

@@ -30,11 +30,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -276,11 +276,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -341,29 +341,26 @@
         "__id__": 9
       },
       {
-        "__id__": 14
+        "__id__": 13
       },
       {
-        "__id__": 19
+        "__id__": 18
       },
       {
-        "__id__": 24
-      },
-      {
-        "__id__": 29
+        "__id__": 23
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 28
       },
       {
-        "__id__": 35
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 30
     },
     "_opacity": 255,
     "_color": {
@@ -376,7 +373,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 120,
-      "height": 475
+      "height": 376
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -430,7 +427,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 12
     },
     "_opacity": 255,
     "_color": {
@@ -455,7 +452,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        198,
+        148.5,
         0,
         0,
         0,
@@ -519,23 +516,12 @@
       "__id__": 9
     },
     "_enabled": true,
-    "panel_name": "pigBank",
+    "panel_name": "module/pigBank/pigBank",
     "open_type": 0,
-    "panel_type": 2,
-    "onComplete": {
-      "__id__": 12
-    },
+    "onComplete": [],
     "_id": ""
   },
   {
-    "__type__": "cc.ClickEvent",
-    "target": null,
-    "component": "",
-    "_componentId": "",
-    "handler": "",
-    "customEventData": ""
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -557,14 +543,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 14
       },
       {
-        "__id__": 16
+        "__id__": 15
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 17
     },
     "_opacity": 255,
     "_color": {
@@ -589,7 +575,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        99,
+        49.5,
         0,
         0,
         0,
@@ -618,7 +604,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 13
     },
     "_enabled": true,
     "_materials": [
@@ -650,14 +636,13 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 13
     },
     "_enabled": true,
-    "panel_name": "turnable",
+    "panel_name": "module/turnable/turnable",
     "open_type": 0,
-    "panel_type": 2,
     "onComplete": {
-      "__id__": 17
+      "__id__": 16
     },
     "_id": ""
   },
@@ -691,14 +676,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 19
       },
       {
-        "__id__": 21
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 22
     },
     "_opacity": 255,
     "_color": {
@@ -723,7 +708,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -49.5,
         0,
         0,
         0,
@@ -752,7 +737,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [
@@ -784,14 +769,13 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 18
     },
     "_enabled": true,
-    "panel_name": "sign",
+    "panel_name": "module/sign/sign",
     "open_type": 0,
-    "panel_type": 2,
     "onComplete": {
-      "__id__": 22
+      "__id__": 21
     },
     "_id": ""
   },
@@ -825,149 +809,15 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 24
       },
       {
-        "__id__": 26
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 28
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 80,
-      "height": 79
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        -99,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 24
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "c53d92da-02b7-4ea1-9d09-e0c26277ea0a"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 24
-    },
-    "_enabled": true,
-    "panel_name": "reward",
-    "open_type": 0,
-    "panel_type": 2,
-    "onComplete": {
       "__id__": 27
     },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": null,
-    "component": "",
-    "_componentId": "",
-    "handler": "",
-    "customEventData": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
-    },
-    "fileId": "55zJbz0VhJToN19ojfpLV5",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "btn5",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 8
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 30
-      },
-      {
-        "__id__": 31
-      }
-    ],
-    "_prefab": {
-      "__id__": 33
-    },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
@@ -991,7 +841,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -198,
+        -148.5,
         0,
         0,
         0,
@@ -1020,7 +870,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 23
     },
     "_enabled": true,
     "_materials": [
@@ -1052,14 +902,13 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 23
     },
     "_enabled": true,
-    "panel_name": "moreGame",
+    "panel_name": "module/reward/reward",
     "open_type": 0,
-    "panel_type": 2,
     "onComplete": {
-      "__id__": 32
+      "__id__": 26
     },
     "_id": ""
   },
@@ -1079,7 +928,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "a408fC/SBOw7iKF9CAjCp9",
+    "fileId": "55zJbz0VhJToN19ojfpLV5",
     "sync": false
   },
   {
@@ -1093,7 +942,7 @@
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 120,
-      "height": 475
+      "height": 376
     },
     "_resize": 1,
     "_N$layoutType": 2,
@@ -1166,15 +1015,14 @@
       "__id__": 9
     },
     "btn2": {
-      "__id__": 14
+      "__id__": 13
     },
     "btn3": {
-      "__id__": 19
+      "__id__": 18
     },
     "btn4": {
-      "__id__": 24
+      "__id__": 23
     },
-    "btn5": null,
     "_id": ""
   },
   {

assets/resources/module/reward/RewardOpen.anim

@@ -3,7 +3,7 @@
   "_name": "RewardOpen",
   "_objFlags": 0,
   "_native": "",
-  "_duration": 0.3333333333333333,
+  "_duration": 0.5833333333333334,
   "sample": 60,
   "speed": 1,
   "wrapMode": 1,
@@ -35,6 +35,26 @@
           }
         }
       ]
+    },
+    "paths": {
+      "红包白纸": {
+        "props": {
+          "y": [
+            {
+              "frame": 0.3333333333333333,
+              "value": 200
+            },
+            {
+              "frame": 0.5,
+              "value": 520
+            },
+            {
+              "frame": 0.5833333333333334,
+              "value": 420
+            }
+          ]
+        }
+      }
     }
   },
   "events": []

assets/resources/module/turnable/texture.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "f8fd8bf9-c002-48a5-ba5c-289a3a9aaff0",
+  "uuid": "7823ff45-8958-4da1-a6ed-67a977c848a6",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

assets/script/Main.ts

@@ -1,5 +1,3 @@
-import UISystem, { PanelType } from "./mk/system/UISystem";
-
 const { ccclass, property } = cc._decorator;
 
 @ccclass
@@ -11,6 +9,6 @@ export default class Main extends cc.Component {
 
     start() {
         console.log("init");
-        mk.ui.openPanel("login",PanelType.module);
+        mk.ui.openPanel("module/login/login");
     }
 }

assets/script/game/component/BtnClosePanel.ts

@@ -1,6 +1,5 @@
 
 const { ccclass, property } = cc._decorator;
-import { OpenActionType, PanelType } from '../../mk/system/UISystem';
 /**
  * 关闭指定面板
  * @author 薛鸿潇

assets/script/game/component/BtnOpenPanel.ts

@@ -1,6 +1,6 @@
 
 const { ccclass, property } = cc._decorator;
-import { OpenActionType, PanelType } from '../../mk/system/UISystem';
+import { OpenActionType } from '../../mk/system/UISystem';
 /**
  * 打开指定名字的面板
  * @author 薛鸿潇
@@ -8,12 +8,10 @@ import { OpenActionType, PanelType } from '../../mk/system/UISystem';
 @ccclass
 export default class BtnOpenPanel extends cc.Component {
 
-    @property({ displayName: '界面名字', tooltip: '对应路径：resources/prefab/uiPanel/' })
+    @property({ displayName: '预制体路径', tooltip: '对应路径：resources/' })
     private panel_name = '';
     @property({ displayName: '打开类型', tooltip: 'normal不操作，closeOther关闭其他，closeLast关闭上一个', type: cc.Enum(OpenActionType) })
     private open_type = OpenActionType.normal;
-    @property({ displayName: '面板类型', tooltip: 'game游戏界面，module模块界面', type: cc.Enum(PanelType) })
-    private panel_type = PanelType.module;
     @property({ displayName: '完成回调', tooltip: "面板打开完成后触发", type: cc.Component.EventHandler })
     public onComplete: cc.Component.EventHandler[] = [];
 
@@ -26,7 +24,7 @@ export default class BtnOpenPanel extends cc.Component {
     }
 
     private async openPanel() {
-        await mk.ui.openPanel(this.panel_name, this.panel_type, this.open_type);
+        await mk.ui.openPanel(this.panel_name, this.open_type);
         const c_count = this.onComplete.length;
         for (let i = 0; i < c_count; i++) {
             if (this.onComplete[i].handler) this.onComplete[i].emit([])

assets/script/game/data/AdData.ts

@@ -76,5 +76,5 @@ export enum AdFun {
     settlement = 3,     //关卡结算视频
     turntable = 4,      //转盘视频
     sign = 5,           //签到视频
-    bigCash = 6,         //福袋视频
+    bigCash = 6,        //福袋视频
 }

assets/script/game/data/AppData.ts

@@ -13,9 +13,9 @@ export class AppData {
     public tfChannel: string = '';
 
     /** api版本 */
-    public version: string = '1.0.0';
+    public version: string = '1.0';
 
-    public appId: string = 'wx17e502b5f230fd9a';
+    public appId: string = 'wxef592f91d2d13355';
 
     public mac: string = 'c9:65:e2:1c:b0:23,f6:60:e4:1a:b7:27';
 

assets/script/game/data/GameData.ts

@@ -103,6 +103,9 @@ export class GameData {
     }
 
     private initProps(data) {
+        if(data == null){
+            return;
+        }
         for (let key in data) {
             this.props.set(parseInt(key), JSON.parse(data[key]));
         }

assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 0;
+    public serverType: number = 2;
 
     public getServerUrl(): string {
         switch (this.serverType) {
@@ -27,6 +27,6 @@ export class HttpData {
 export enum ServerUrl {
     test = 'https://tafang-test.duiweize.com/', //测试服地址
     formal = '',    //正式服地址
-    liyang = 'http://172.16.15.231:9092/',  //李杨服地址
+    liyang = 'http://172.16.15.231:9162/',  //李杨服地址
     hanguo = 'http://172.16.15.167:9092/',  //悍国服地址
 }

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

@@ -5,6 +5,10 @@ import { Data } from "../../../mk/data/Data";
  * @author 邹勇 薛鸿潇
  */
 export class RewardData extends Data {
+    /** 
+     * 标志位 
+     * - 初始化红包封面样式
+    */
     public init_luck_style: boolean = false;
 
     /** 默认幸运红包 */
@@ -19,5 +23,18 @@ export class RewardData extends Data {
     }
 
     /** 奖励列表 */
-    data: any;
+    data: Array<DataType> = [];
+    /** 
+     * 标志位 
+     * - 初始化提现样式
+    */
+    public init_cash_style: boolean = true;
+}
+type DataType = {
+    /** 奖励类型 */
+    rewardType: number,
+    /** 奖励数量 */
+    rewardNum: number,
+    /** 玩家剩余数量 */
+    rewardTotal: number
 }

assets/script/game/module/module/login/Login.ts

@@ -1,5 +1,3 @@
-import { PanelType } from "../../../../mk/system/UISystem";
-
 const { ccclass, property } = cc._decorator;
 
 @ccclass
@@ -26,7 +24,7 @@ export default class Login extends cc.Component {
             return;
         }
         if(gData.gameData.dataFinish){//登录流程完毕
-            mk.ui.openPanel("game",PanelType.game);
+            mk.ui.openPanel("game/prefab/game");
         }
     }
 }

assets/script/game/module/module/reward/Reward.ts

@@ -1,3 +1,4 @@
+import { AdFun } from "../../../data/AdData";
 
 const { ccclass, property } = cc._decorator;
 /**
@@ -7,14 +8,22 @@ const { ccclass, property } = cc._decorator;
 @ccclass
 export default class Reward extends cc.Component {
 
-    @property({ displayName: '按钮看视频', type: cc.Button })
-    private btn_watch_video: cc.Button = null;
-
     @property({ displayName: '幸运红包', type: cc.Node })
     private node_luck: cc.Node = null;
     @property({ displayName: '通关红包', type: cc.Node })
     private node_mission: cc.Node = null;
-
+    @property({ displayName: '开红包动画', type: cc.Animation })
+    private anim_open_redbag: cc.Animation = null;
+    @property({ displayName: '按钮看视频', type: cc.Button })
+    private btn_watch_video: cc.Button = null;
+    @property({ displayName: '红包图标', type: cc.Node })
+    private node_redBag: cc.Node = null;
+    @property({ displayName: '金猪图标', type: cc.Node })
+    private node_pig: cc.Node = null;
+    @property({ displayName: '奖励数量', type: cc.Label })
+    private lbl_reward_value: cc.Label = null;
+
+    // 底部提现相关
     @property({ displayName: 'spr提现进度', type: cc.Sprite })
     private spr_cash_out: cc.Sprite = null;
     @property({ displayName: 'lbl提现进度', type: cc.Label })
@@ -23,11 +32,18 @@ export default class Reward extends cc.Component {
     private lbl_cash: cc.Label = null;
 
 
-    @property({ displayName: '开红包动画', type: cc.Animation })
-    private anim_open_redbag: cc.Animation = null;
 
     onLoad() {
-
+        this.lbl_reward_value.string = '0';
+        // 测试数据
+        gData.reward.data.push({
+            /** 奖励类型 */
+            rewardType: 1,
+            /** 奖励数量 */
+            rewardNum: 100,
+            /** 玩家剩余数量 */
+            rewardTotal: 0
+        })
     }
 
     start() {
@@ -37,8 +53,20 @@ export default class Reward extends cc.Component {
 
     update(dt) {
         if (gData.reward.init_luck_style) {
-            gData.reward.init_luck_style = false;
+            gData.reward.init_luck_style = null;
             this.initLid();
+            return;
+        }
+        if (gData.reward.init_cash_style) {
+            gData.reward.init_cash_style = null;
+            this.initCashOutStyle();
+            return;
+        }
+        if (gData.reward.adData) {
+            // 展示奖励
+            this.watchVideoCall();
+            gData.reward.adData = null;
+            return;
         }
     }
 
@@ -56,14 +84,62 @@ export default class Reward extends cc.Component {
     }
 
     /**
+     * 底部提现相关样式
+     */
+    private initCashOutStyle() {
+        // 测试数据
+        this.lbl_cash.string = 0.0 + '元';
+        this.lbl_cash_out.string = 0 + '/' + 100;
+        this.spr_cash_out.fillRange = 0.8;
+    }
+
+    /**
      * 看广告
      */
     private clickWatchVideo() {
         cc.log('看广告请求');
+        if (gData.reward.data[0].rewardType === 1) {
+            gData.adData.watchVideo(AdFun.settlement)// 关卡结算视频
+        } else {
+            gData.adData.watchVideo(AdFun.bubble);// 气泡视频
+        }
+        // 测试数据
+        gData.reward.adData = gData.reward.data;
+    }
+
+    /**
+     * 看广告回调：开奖
+     */
+    private watchVideoCall() {
+        gData.reward.data = gData.reward.adData;
+        // 数据排序：多条奖励，只展示红包，把红包放在首位
+        const r_count = gData.reward.adData.length;
+        if (r_count >= 2) {
+            for (let i = 0; i < r_count; i++) {
+                if (gData.reward.adData[i].rewardType === 1) {
+                    let new_data = gData.reward.adData.splice(i, 1);
+                    gData.reward.adData.unshift(new_data);
+                    break;
+                }
+            }
+        }
+
+        // 图标展示
+        if (gData.reward.data[0].rewardType === 1) {
+            this.node_redBag.active = true;
+            this.node_pig.active = false;
+        } else {
+            this.node_redBag.active = false;
+            this.node_pig.active = true;
+        }
+        let rewardNum = gData.reward.data[0].rewardNum || 0;
+        this.lbl_reward_value.string = `${rewardNum}`;
+
+        // 动画
         this.anim_open_redbag.play();
         this.node_luck.active = false;
         this.node_mission.active = false;
-        this.btn_watch_video.node.active = false;;
+        this.btn_watch_video.node.active = false;
     }
 
     /**

assets/script/game/module/module/turntable/Turnable.ts

@@ -1,7 +1,5 @@
-import { PanelType } from "../../../../mk/system/UISystem";
 import BtnClosePanel from "../../../component/BtnClosePanel";
 import { AdFun } from "../../../data/AdData";
-import { GameProp } from "../../../data/GameData";
 import TurnableItem from "./TurnableItem";
 
 const { ccclass, property } = cc._decorator;
@@ -54,7 +52,7 @@ export default class Turnable extends cc.Component {
     private playOver() {
         this.btn_close.getComponent(BtnClosePanel).block_click = false;
         this.updateLeftTimes();
-        mk.ui.openPanel("reward", PanelType.module);
+        mk.ui.openPanel("module/reward/reward");
     }
 
     updateLeftTimes() {

assets/script/mk/system/UISystem.ts

@@ -9,10 +9,6 @@ export default class UISystem extends cc.Component {
 
     /** panel父节点 */
     private panelParent: cc.Node = null;
-    /** 界面预制体路径 */
-    private gamePanelbUrl: string = './game/prefab';
-    /** 模块界面预制体路径 */
-    private modulPanelUrl: string = './module';
     /** 是否正在打开界面 */
     private isPanelOpening: boolean = false;
     /** 是否界面正在关闭 */
@@ -34,13 +30,12 @@ export default class UISystem extends cc.Component {
 
     /**
      * 打开panel界面
-     * @param panelName  界面名称
-     * @param panelType  界面类型
+     * @param panelUrl  界面名称全路径
      * @param openAction 打开之后的操(需不需要关闭其他界面)
      */
-    openPanel(panelName: string, panelType: PanelType, openAction: OpenActionType = OpenActionType.normal): Promise<any> {
-
-        let panelUrl = this.getUrlByPanelType(panelName, panelType);
+    openPanel(panelUrl: string, openAction: OpenActionType = OpenActionType.normal): Promise<any> {
+        let arr = panelUrl.split("/");
+        let panelName = arr[arr.length - 1];
 
         let self = this;
         if (self.isPanelOpening || self.getCurOnPanel(panelName)) {
@@ -134,24 +129,6 @@ export default class UISystem extends cc.Component {
         this.isPanelClosing = false;
         callBack && callBack();
     }
-
-    /**
-     * 根据界面类型获取url
-     * @param panelName 界面名称
-     * @param panelType 界面类型
-     */
-    getUrlByPanelType(pannelName: string, panelType: PanelType): string {
-        let url: string = "";
-        switch (panelType) {
-            case PanelType.game:
-                url = `${this.gamePanelbUrl}/${pannelName}`
-                break;
-            case PanelType.module:
-                url = `${this.modulPanelUrl}/${pannelName}/${pannelName}`
-                break;
-        }
-        return url;
-    }
 }
 
 /** 界面打开操作 */
@@ -162,12 +139,4 @@ export enum OpenActionType {
     closeOther = 1,
     /** 关闭上一个 */
     closeLast = 2
-}
-
-/** */
-export enum PanelType {
-    /**游戏界面 */
-    game = 1,
-    /**模块界面 */
-    module = 2,
 }