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

# Conflicts:
#	tower_sanguo/assets/resources/data/openfun_data.json.meta
#	tower_sanguo/assets/resources/data/task_data.json.meta
#	tower_sanguo/assets/scripts/data/GameData.ts

tools/apkmaker/readme.md

@@ -0,0 +1,9 @@
+### 安卓自动打包
+
+### 配置gradle环境变量
+https://blog.csdn.net/u014743890/article/details/84316176
+cmd到安卓包目录下使用 gradlew -v   或  gradle -v
+
+### 使用命令行打包
+https://www.jianshu.com/p/45fdcc6f00a4
+https://blog.csdn.net/qq_32816979/article/details/79113826

tools/messages.md

@@ -1,3 +1,4 @@
+塔防三国接口说明文档
 ### 接口说明
         {
             //获取网络配置，和以前一样
@@ -63,10 +64,11 @@
             "name": "updatePlayerProp",
             "method": "POST",
             "send": {
-                proptype:number,    //属性类型
-                propvalue:number,   //属性值
-                add:number      //0当前值  1增加值
-            },
+                [   proptype:number,    //属性类型
+                    propvalue:number,   //属性值
+                    add:number      //0当前值  1增加值
+                ]
+            },]
             "response": {
                 "data": {
                     proptype:number,    //属性类型
@@ -110,6 +112,7 @@
                 mid:number,//关卡id
                 max:[gid],//最大战力武将id
                 last:[gid]//通关时武将id
+                useskill:number, //是否使用技能 0未使用 1使用
             },
             "response": {
                 "data": {
@@ -122,16 +125,14 @@
             "id": 10,
             "name": "generalExpUp",
             "method": "POST",
-            "data": "null",
-            "response": {
-                "data": {
-                    gid: number;    //武将id
-                    exp: number;    //当前武将经验
-                    addExp:number;  //增加的经验
-                    lv: number;     //当前武将等级
-                    food:number;    //当前剩余粮草
-                }
-            }
+            "data": " [
+                    {
+                        gid:number,
+                        lv:number,
+                        exp:number
+                    }
+                ],
+            "response":null
         },
         {
             //兵营升级
@@ -256,6 +257,7 @@ export enum PLAYERPROP {
 
     MISSION_ARRIVE = 20,//当前到达的最大关卡
     MISSION_PASSED = 21,//当前通过的最大关卡
+    USESKILL_TIME = 22,//上次使用统帅技能的时间
 }
 
 //道具类型

tools/安卓自动打包.bat

@@ -0,0 +1,3 @@
+cd D:\work\cocos\tower_sanguo\tower_sanguo\build\jsb-link\frameworks\runtime-src\proj.android-studio
+gradlew -v
+gradlew assembleRelease

tower_sanguo/assets/MOKA/manager/SDKManager.ts

@@ -17,18 +17,22 @@ export default class SDKManager {
     //是否在登录之后上报邀请人id，用于上报裂变拉入的统计
     static sendReport: boolean = false
 
-    init() {
-        // if (cc.sys.os == cc.sys.OS_WINDOWS) {
-        if (true) {
+    init() {        
+        if (cc.sys.os == cc.sys.OS_WINDOWS) {
             this.sdk = new WindowTest();
         }
         else if (cc.sys.platform == cc.sys.WECHAT_GAME) {
             this.sdk = new MokaWxSDK();
         }
-        else {
+        else if(cc.sys.isNative) {
             this.sdk = new AndroidSDK();
         }
-        this.sdk.init();
+        if(this.sdk){
+            this.sdk.init();
+        }
+        else{
+            console.log(cc.sys.os,cc.sys.platform);
+        }
     }
 
     /**

tower_sanguo/assets/resources/data/barrack_data.json

@@ -1,497 +1,497 @@
 {
 	"1": {
 		"campLv": 1,
-		"cost": "4:100",
+		"cost": 100,
 		"unlockHero": "123011,111001,132004,112007,143013,132006,121001,114016,122004,123013,141003,113015,133012,122003,123008"
 	},
 	"2": {
 		"campLv": 2,
-		"cost": "4:100",
+		"cost": 100,
 		"unlockHero": ""
 	},
 	"3": {
 		"campLv": 3,
-		"cost": "4:100",
+		"cost": 100,
 		"unlockHero": ""
 	},
 	"4": {
 		"campLv": 4,
-		"cost": "4:100",
+		"cost": 100,
 		"unlockHero": ""
 	},
 	"5": {
 		"campLv": 5,
-		"cost": "4:100",
+		"cost": 100,
 		"unlockHero": ""
 	},
 	"6": {
 		"campLv": 6,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": ""
 	},
 	"7": {
 		"campLv": 7,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": ""
 	},
 	"8": {
 		"campLv": 8,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": ""
 	},
 	"9": {
 		"campLv": 9,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": ""
 	},
 	"10": {
 		"campLv": 10,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": "133011,113010,122005"
 	},
 	"11": {
 		"campLv": 11,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": ""
 	},
 	"12": {
 		"campLv": 12,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": ""
 	},
 	"13": {
 		"campLv": 13,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": ""
 	},
 	"14": {
 		"campLv": 14,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": ""
 	},
 	"15": {
 		"campLv": 15,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": "112005,142006,141004"
 	},
 	"16": {
 		"campLv": 16,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": ""
 	},
 	"17": {
 		"campLv": 17,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": ""
 	},
 	"18": {
 		"campLv": 18,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": ""
 	},
 	"19": {
 		"campLv": 19,
-		"cost": "4:150",
+		"cost": 150,
 		"unlockHero": ""
 	},
 	"20": {
 		"campLv": 20,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": "142005,133008,111004"
 	},
 	"21": {
 		"campLv": 21,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"22": {
 		"campLv": 22,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"23": {
 		"campLv": 23,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"24": {
 		"campLv": 24,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"25": {
 		"campLv": 25,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": "112008,111002,143015"
 	},
 	"26": {
 		"campLv": 26,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"27": {
 		"campLv": 27,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"28": {
 		"campLv": 28,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"29": {
 		"campLv": 29,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"30": {
 		"campLv": 30,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": "134014,142009,143012"
 	},
 	"31": {
 		"campLv": 31,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"32": {
 		"campLv": 32,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"33": {
 		"campLv": 33,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": "113009,122006,113011"
 	},
 	"34": {
 		"campLv": 34,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"35": {
 		"campLv": 35,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"36": {
 		"campLv": 36,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": "121002,132005,142008"
 	},
 	"37": {
 		"campLv": 37,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"38": {
 		"campLv": 38,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": ""
 	},
 	"39": {
 		"campLv": 39,
-		"cost": "4:200",
+		"cost": 200,
 		"unlockHero": "124014,133013,113014"
 	},
 	"40": {
 		"campLv": 40,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"41": {
 		"campLv": 41,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"42": {
 		"campLv": 42,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": "143011,132007,123012"
 	},
 	"43": {
 		"campLv": 43,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"44": {
 		"campLv": 44,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"45": {
 		"campLv": 45,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": "133009,123007,141001"
 	},
 	"46": {
 		"campLv": 46,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"47": {
 		"campLv": 47,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": "131002,143014,142007"
 	},
 	"48": {
 		"campLv": 48,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"49": {
 		"campLv": 49,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": "123010,112006,113013"
 	},
 	"50": {
 		"campLv": 50,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"51": {
 		"campLv": 51,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": "142010,144016,111003"
 	},
 	"52": {
 		"campLv": 52,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"53": {
 		"campLv": 53,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": "133010,131001,141002"
 	},
 	"54": {
 		"campLv": 54,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"55": {
 		"campLv": 55,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": "123009,131003,113012"
 	},
 	"56": {
 		"campLv": 56,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"57": {
 		"campLv": 57,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"58": {
 		"campLv": 58,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"59": {
 		"campLv": 59,
-		"cost": "4:300",
+		"cost": 300,
 		"unlockHero": ""
 	},
 	"60": {
 		"campLv": 60,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"61": {
 		"campLv": 61,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"62": {
 		"campLv": 62,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"63": {
 		"campLv": 63,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"64": {
 		"campLv": 64,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"65": {
 		"campLv": 65,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"66": {
 		"campLv": 66,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"67": {
 		"campLv": 67,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"68": {
 		"campLv": 68,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"69": {
 		"campLv": 69,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"70": {
 		"campLv": 70,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"71": {
 		"campLv": 71,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"72": {
 		"campLv": 72,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"73": {
 		"campLv": 73,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"74": {
 		"campLv": 74,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"75": {
 		"campLv": 75,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"76": {
 		"campLv": 76,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"77": {
 		"campLv": 77,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"78": {
 		"campLv": 78,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"79": {
 		"campLv": 79,
-		"cost": "4:400",
+		"cost": 400,
 		"unlockHero": ""
 	},
 	"80": {
 		"campLv": 80,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"81": {
 		"campLv": 81,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"82": {
 		"campLv": 82,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"83": {
 		"campLv": 83,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"84": {
 		"campLv": 84,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"85": {
 		"campLv": 85,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"86": {
 		"campLv": 86,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"87": {
 		"campLv": 87,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"88": {
 		"campLv": 88,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"89": {
 		"campLv": 89,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"90": {
 		"campLv": 90,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"91": {
 		"campLv": 91,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"92": {
 		"campLv": 92,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"93": {
 		"campLv": 93,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"94": {
 		"campLv": 94,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"95": {
 		"campLv": 95,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"96": {
 		"campLv": 96,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"97": {
 		"campLv": 97,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"98": {
 		"campLv": 98,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"99": {
 		"campLv": 99,
-		"cost": "4:500",
+		"cost": 500,
 		"unlockHero": ""
 	},
 	"100": {

tower_sanguo/assets/resources/data/fundes_data.json

@@ -0,0 +1,12 @@
+{
+	"barracks_help": {
+		"id": "barracks_help",
+		"title": "兵营升级",
+		"des": "1.兵营升级需要威望石。\\n\\n2.通关BOSS关卡可以获得\\n威望石\\n\\n3.兵营升级后，可以大大加快\\n武将的升级速度\\n\\n4.武将的训练等级随兵营等级\\n提升而提高。"
+	},
+	"turntable_help": {
+		"id": "turntable_help",
+		"title": "玩法说明",
+		"des": "1.每次转转盘都可100%获得\\n奖励\\n\\n2.每天有10次转转盘机会\\n\\n3.每日12点、18点、0点、将\\n自动重置转盘次数"
+	}
+}

tower_sanguo/assets/resources/data/fundes_data.json.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "dea8365b-bdec-443c-9b6c-97df0b163d82",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/data/help_data.json

@@ -1,10 +1,12 @@
-{
-    "barracks_help": {
-        "title": "兵营升级",
-        "des": "1.兵营升级需要威望石。\n\n2.通关BOSS关卡可以获得\n威望石\n\n3.兵营升级后，可以大大加快\n武将的升级速度\n\n4.武将的训练等级随兵营等级\n提升而提高。"
-    },
-    "turntable_help": {
-        "title": "玩法说明",
-        "des": "1.每次转转盘都可100%获得\n奖励\n\n2.每天有10次转转盘机会\n\n3.每日12点、18点、0点、将\n自动重置转盘次数"
-    }
+{
+	"barracks_help": {
+		"id": "barracks_help",
+		"title": "兵营升级",
+		"des": "1.兵营升级需要威望石。\\n\\n2.通关BOSS关卡可以获得\\n威望石\\n\\n3.兵营升级后，可以大大加快\\n武将的升级速度\\n\\n4.武将的训练等级随兵营等级\\n提升而提高。"
+	},
+	"turntable_help": {
+		"id": "turntable_help",
+		"title": "玩法说明",
+		"des": "1.每次转转盘都可100%获得\\n奖励\\n\\n2.每天有10次转转盘机会\\n\\n3.每日12点、18点、0点、将\\n自动重置转盘次数"
+	}
 }

tower_sanguo/assets/resources/data/openfun_data.json.meta

@@ -1,5 +1,5 @@
 {
   "ver": "1.0.0",
-  "uuid": "12d2c33b-0b9b-4684-bb99-dcd72a75c8d0",
+  "uuid": "e2e9b129-375e-4943-86f6-5cea71e3e715",
   "subMetas": {}
 }

tower_sanguo/assets/resources/data/serverConfig_data.json

@@ -3,5 +3,6 @@
 	"embattle_open": "1,10,20,30,40",
 	"needQuality": "2,3,4",
 	"skillCD": 1200,
-	"dailyClearTimes": 3
+	"dailyClearTimes": 3,
+	"initHero": "112005,122005,132005,142007"
 }

tower_sanguo/assets/resources/data/task_data.json.meta

@@ -1,5 +1,5 @@
 {
   "ver": "1.0.0",
-  "uuid": "daf838f1-c338-4c6c-bf10-0a80b947071b",
+  "uuid": "543979fd-7402-4c02-804c-391cd0848831",
   "subMetas": {}
 }

tower_sanguo/assets/scripts/GameController.ts

@@ -210,14 +210,13 @@ class GameController {
         }
     }
 
-
-
-    private initErrorHandler() {
+    private initErrorHandler() {        
         if (cc.sys.isNative) {
             let __handler
             if (window['__errorHandler']) {
                 __handler = window['__errorHandler']
             }
+            
             window['__errorHandler'] = function (...args) {
                 console.log('游戏报错,原生系统')
                 GameController.handleError(...args)
@@ -226,26 +225,13 @@ class GameController {
                 }
             }
         }
-        else if (cc.sys.isBrowser) {
-            let __handler;
-            if (window.onerror) {
-                __handler = window.onerror
-            }
-            window.onerror = function (...args) {
-                console.log('游戏报错,浏览器')
-                GameController.handleError(...args)
-                if (__handler) {
-                    __handler(...args)
-                }
-            }
-        }
     }
 
     static handleError(...args) {
         let senddata = {
             "level": "error",
             "game": "tower",
-            "message": args,
+            "message": "testTowerSanguo",
         }
         console.log('handleError',args);
         
@@ -263,7 +249,6 @@ class GameController {
         str = Utils.RSAEncryptLong(str);
         httpRequest.send(str);
     }
-
 }
 
 export default new GameController();

tower_sanguo/assets/scripts/data/GameData.ts

@@ -10,7 +10,6 @@ import PlayerUpdateResponse from "../net/msg/PlayerUpdateResponse";
 import { Dictionary } from "../utils/Dictionary";
 import BarrackVO from "../vo/BarrackVO";
 import BuffVO from "../vo/BuffVO";
-import CommanderSkillVO from "../vo/CommanderSkillVO";
 import FetterVO from "../vo/FetterVO";
 import GeneralVO from "../vo/GeneralVO";
 import MissionVO from "../vo/MissionVO";
@@ -52,11 +51,11 @@ export default class GameData {
     private skill_data: any;
     private star_data: any;
     private item_data: any;
-    private barrack_data: Dictionary<number, BarrackVO> = new Dictionary<number, BarrackVO>();
-    private barrack_json: any;
+    private turntable_data: any;
+    private barrack_data: Dictionary<number, BarrackVO>;
     db_data: any;
     help_data: any;
-    server_data: any;
+    serverConfig_data: any;
     commanderskill_data: any;
     private task_data: any;
 
@@ -76,16 +75,15 @@ export default class GameData {
             this.mission_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/mission_data.json?v=' + new Date().getTime());
             this.star_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/star_data.json?v=' + new Date().getTime());
             this.item_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/item_data.json?v=' + new Date().getTime());
-            this.barrack_json = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/barrack_data.json?v=' + new Date().getTime());
+            this.barrack_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/barrack_data.json?v=' + new Date().getTime());
             this.db_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/db_data.json?v=' + new Date().getTime());
-            this.server_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/serverConfig_data.json?v=' + new Date().getTime());
+            this.serverConfig_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/serverConfig_data.json?v=' + new Date().getTime());
             this.help_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/help_data.json?v=' + new Date().getTime());
             this.commanderskill_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/commanderskill_data.json?v=' + new Date().getTime());
-            this.task_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/task_data.json?v=' + new Date().getTime());
-            turntableModel.Instance.turntable_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/turntable_data.json?v=' + new Date().getTime());
+            this.turntable_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/turntable_data.json?v=' + new Date().getTime());
 
             // this.db_data = cc.loader.getRes("data/db_data", cc.JsonAsset).json;
-            // this.server_data = cc.loader.getRes("data/serverConfig_data", cc.JsonAsset).json;
+            // this.serverConfig_data = cc.loader.getRes("data/serverConfig_data", cc.JsonAsset).json;
             // this.fetter_data = cc.loader.getRes("data/fetter_data", cc.JsonAsset).json;
             // this.buff_data = cc.loader.getRes("data/buff_data", cc.JsonAsset).json;
             // this.skill_data = cc.loader.getRes("data/skill_data", cc.JsonAsset).json;
@@ -93,12 +91,12 @@ export default class GameData {
             // this.monster_data = cc.loader.getRes("data/monster_data", cc.JsonAsset).json;
             // this.mission_data = cc.loader.getRes("data/mission_data", cc.JsonAsset).json;
             // this.item_data = cc.loader.getRes("data/item_data", cc.JsonAsset).json;
-            // this.barrack_json = cc.loader.getRes("data/barrack_data", cc.JsonAsset).json;
+            // this.barrack_data = cc.loader.getRes("data/barrack_data", cc.JsonAsset).json;
             // this.star_data = cc.loader.getRes("data/star_data", cc.JsonAsset).json;
             // this.help_data = cc.loader.getRes("data/help_data", cc.JsonAsset).json;
+            // this.turntable_data = cc.loader.getRes("data/turntable_data", cc.JsonAsset).json;
             // this.commanderskill_data = cc.loader.getRes("data/commanderskill_data", cc.JsonAsset).json;
-            this.task_data = cc.loader.getRes("data/task_data", cc.JsonAsset).json;
-            // turntableModel.Instance.turntable_data = cc.loader.getRes("data/turntable_data", cc.JsonAsset).json;
+
             this.initJsonData();
         }
         else {
@@ -108,45 +106,7 @@ export default class GameData {
         }
     }
 
-    jsons = ['buff', 'fetter', 'skill', 'general', 'monster', 'mission', 'star', 'item', 'barrack', 'db', 'serverConfig', 'help'];
-    count = 0;
-
-    loadConfig(err = null, data = null) {
-        if (err) {
-            console.log(err, data);
-        }
-        let json = this.jsons[this.count];
-        if (data) {
-            if (json == "serverConfig") {
-                json = 'server'
-            }
-            if (json == 'barrack') {
-                this.barrack_json = data;
-            }
-            else {
-                this[json + "_data"] = data;
-            }
-            this.count++;
-            json = this.jsons[this.count];
-        }
-
-        if (json == null) {
-            if (GameController.servertest) {
-                GameController.servertest.init();
-            }
-
-            this.initJsonData();
-
-            // GameController.initSDK();
-            return;
-        }
-        let url = 'https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/' + json + '_data.json?v=' + new Date().getTime()
-        cc.loader.load({ url: url, type: "json" }, this.loadConfig.bind(this));
-    }
-
     initZip(buffer) {
-        console.log("initZIP:start");
-
         var self = this;
         JSZip.loadAsync(buffer).then((zip) => {
             let total = 0;
@@ -158,7 +118,6 @@ export default class GameData {
                     let dataname = key.slice(5, key.length - 5);
                     self[dataname] = JSON.parse(data);
                     count++;
-                    console.log("zip.file:" + count + "..." + total);
                     if (count == total) {
                         this.initJsonData();
                     }
@@ -168,8 +127,6 @@ export default class GameData {
     }
 
     private initJsonData() {
-        console.log("initJsonData");
-
         if (GameController.servertest) {
             GameController.servertest.init();
         }
@@ -316,16 +273,13 @@ export default class GameData {
         }
 
         //兵营
-        for (let i in this.barrack_json) {
-            let o = this.barrack_json[i];
+        let temp_data = this.barrack_data;
+        this.barrack_data = new Dictionary<number, BarrackVO>();
+        for (let i in temp_data) {
+            let o = temp_data[i];
             let vo = new BarrackVO();
             vo.campLv = o.campLv;
-            if (o.cost) {
-                vo.cost = parseInt(o.cost.split(':')[1]);
-            }
-            else {
-                vo.cost = o.cost;
-            }
+            vo.cost = o.cost;
             vo.unlockHero = [];
             if (o.unlockHero.length > 0) {
                 let arr: string[] = o.unlockHero.split(",");
@@ -336,23 +290,7 @@ export default class GameData {
             this.barrack_data.setValue(vo.campLv, vo);
         }
 
-        for (let i in this.commanderskill_data) {
-            let o = this.commanderskill_data[i];
-            let csvo = new CommanderSkillVO();
-            csvo.id = o.id;
-            let tempstars = o.starcount.split(":");
-            for (let i = 0; i < tempstars.length; i++) {
-                csvo.unlockstarcount.push(parseInt(tempstars[i]));
-            }
-            this.commanderskill_data[i] = csvo;
-            console.log("index: " + i + " d: ", o);
-        }
-
-        console.log("commanderskill_data: ", this.commanderskill_data);
-        console.log("skill_data: ", this.skill_data);
-
-        // 任务
-        this.initTaskData();
+        turntableModel.Instance.turntable_data = this.turntable_data;
 
         GameController.initSDK();
     }
@@ -503,11 +441,7 @@ export default class GameData {
             }
         }
 
-        this.initScheduler();
-
         GameController.loadMain();
-
-        console.log("____________loadMain");
     }
 
     /**
@@ -590,19 +524,6 @@ export default class GameData {
         }
     }
 
-    private initScheduler() {
-        let self = this;
-        let count = 0;
-        let a = cc.director.getScheduler().schedule(() => {
-            count++;
-            if (count % 5 == 0) {
-                count = 1;
-                let vo: MissionVO = self.getMissionByID(self.player.current_mission);
-                self.updateProp(PLAYERPROP.FOOD, Math.floor(vo.foodRecover * 5), true);
-            }
-        }, this, 1);
-    }
-
     /**
      * 兵营等级更新后，更新开放武将及下个开放武将
      * @param barrackLv 

tower_sanguo/assets/scripts/data/GameDefinition.ts

@@ -21,6 +21,8 @@ export enum PLAYERPROP {
 
     MISSION_ARRIVE = 20,//当前到达的最大关卡
     MISSION_PASSED = 21,//当前通过的最大关卡
+
+    USESKILL_TIME = 30,//上次使用统帅技能的时间
 }
 
 export enum ITEMTYPE {
@@ -73,15 +75,6 @@ export enum VIDEO_TYPE {
     adRbProgressAd,
 }
 
-/**带消耗确认框界面参数 */
-export interface CustomDialogParams {
-    content: string,
-    count: number;
-    certainCb?: Function,
-    cancelCb?: Function,
-    closeUIOnCancle?: boolean,
-    thisObj?: any,
-}
 /** 奖励状态 */
 export enum RewardState {
     /** 未解锁 */

tower_sanguo/assets/scripts/module/fight/FightUI.ts

@@ -1095,8 +1095,7 @@ export default class FightUI extends BaseUI {
                 this.resetMonster(m);
                 if (realdead) {
                     if (reward) {
-                        let arr = m.vo.award.split(":");
-                        this.roundYB += parseInt(arr[1]);
+                        this.roundYB += m.vo.award;
                     }
                     this.monster_arr.splice(i, 1);
                 }

tower_sanguo/assets/scripts/module/main/MainUI.ts

@@ -86,6 +86,20 @@ export default class MainUI extends BaseUI {
 
         this.barracks_red.active = barracksModel.getInstance().checkRed();
         turntableModel.Instance.updateResetTurntable();
+
+        this.initScheduler();
+    }
+
+    private initScheduler() {
+        let count = 0;
+        this.schedule(() => {
+            count++;
+            if (count % 5 == 0) {
+                count = 1;
+                let vo: MissionVO = GameController.gameData.getMissionByID(GameController.gameData.player.current_mission);
+                GameController.gameData.updateProp(PLAYERPROP.FOOD, Math.floor(vo.foodRecover * 5), true);
+            }
+        }, 1);
     }
 
     updateProp(type: PLAYERPROP, value: number) {

tower_sanguo/assets/scripts/net/HttpCommand.ts

@@ -175,10 +175,16 @@ export default class HttpCommand {
 
     /** 更新货币 */
     updateProp(callback, type: PLAYERPROP, value, add: boolean = false) {
+        let prop = {} as UpdatePlayerProps;
+        prop.add = add ? 1 : 0;
+        prop.proptype = type;
+        prop.propvalue = value;
+        this.updateProps(callback,[prop]);
+    }
+    /** 更新货币 */
+    updateProps(callback, arr:UpdatePlayerProps[]) {
         let msg: PlayerUpdateRequest = new PlayerUpdateRequest();
-        msg.proptype = type;
-        msg.propvalue = value;
-        msg.add = add ? 1 : 0;
+        msg.arr = arr;
         let str = JSON.stringify(msg);
         this.httpM.sendRequest(HTTPTYPE.updateProp, 'POST', str, callback);
     }
@@ -290,3 +296,11 @@ export enum HTTPTYPE {
 
     updateADLog = 'updateADLog',
 }
+
+
+/** 更新玩家属性 */
+export interface UpdatePlayerProps {
+    add:number,         //0覆盖 1增加
+    proptype:number,    //需要更新的属性
+    propvalue:number,   //更新后的属性
+}

tower_sanguo/assets/scripts/net/msg/PlayerUpdateRequest.ts

@@ -8,14 +8,11 @@ const { ccclass } = cc._decorator;
 export default class PlayerUpdateRequest {
     constructor() {
     }
-
-    /** 0覆盖 1增加 */
-    add:number = 0;
-
-    /** 需要更新的属性  */
-    proptype:number;
-
-    /** 更新后的属性 */
-    propvalue:number;
-
+    
+    /**
+     * add 0覆盖 1增加
+     * proptype 需要更新的属性
+     * propvalue 更新后的属性
+     */
+    arr:{add:number,proptype:number,propvalue:number}[] = [];
 }

tower_sanguo/assets/scripts/net/msg/PlayerUpdateResponse.ts

@@ -1,3 +1,4 @@
+import { UpdatePlayerProps } from "../HttpCommand";
 import BaseResponse from "./BaseResponse";
 
 /**
@@ -11,8 +12,5 @@ export default class PlayerUpdateResponse extends BaseResponse{
         super();
     }
 
-    proptype:number;
-    propvalue:number;
-    addvalue:number;
-
+    arr:UpdatePlayerProps[] = [];
 }

tower_sanguo/assets/scripts/net/servertest/ServerManager.ts

@@ -1,7 +1,7 @@
 import { GENERALPROP, GENERALSTATUS, ITEMTYPE, PLAYERPROP } from "../../data/GameDefinition";
 import GameController from "../../GameController";
 import barracksModel from "../../module/barracks/barracksModel";
-import { HTTPTYPE } from "../HttpCommand";
+import { HTTPTYPE, UpdatePlayerProps } from "../HttpCommand";
 import AddItemRequest from "../msg/AddItemRequest";
 import AddItemResponse from "../msg/AddItemResponse";
 import BarracksLvUpResponse from "../msg/BarracksLvUpResponse";
@@ -268,22 +268,28 @@ export default class ServerManager {
     private updateProp(url, data: string, callback) {
         let jsondata = JSON.parse(data);
         let msg = new PlayerUpdateResponse();
-        switch (jsondata.proptype) {
-            case PLAYERPROP.FOOD:
-                this.player.food = jsondata.add == 1 ? this.player.food + jsondata.propvalue : jsondata.propvalue;
-                msg.propvalue = this.player.food;
-                break;
-            case PLAYERPROP.YB:
-                this.player.yb = jsondata.add == 1 ? this.player.yb + jsondata.propvalue : jsondata.propvalue;
-                msg.propvalue = this.player.food;
-                break;
-            case PLAYERPROP.REDBAG:
-                this.player.redbag = jsondata.add == 1 ? this.player.redbag + jsondata.propvalue : jsondata.propvalue;
-                msg.propvalue = this.player.food;
-                break;
+        let arr = msg.arr;
+        let brr = [];
+        for (let i = 0; i < arr.length; i++) {
+            let prop: UpdatePlayerProps = arr[i];
+            let propresponse = {} as UpdatePlayerProps;
+            switch (prop.proptype) {
+                case PLAYERPROP.FOOD:
+                    this.player.food = jsondata.add == 1 ? this.player.food + jsondata.propvalue : jsondata.propvalue;
+                    propresponse.propvalue = this.player.food;
+                    break;
+                case PLAYERPROP.YB:
+                    this.player.yb = jsondata.add == 1 ? this.player.yb + jsondata.propvalue : jsondata.propvalue;
+                    propresponse.propvalue = this.player.food;
+                    break;
+                case PLAYERPROP.REDBAG:
+                    this.player.redbag = jsondata.add == 1 ? this.player.redbag + jsondata.propvalue : jsondata.propvalue;
+                    propresponse.propvalue = this.player.food;
+                    break;
+            }
+            propresponse.proptype = jsondata.type;
         }
-        msg.proptype = jsondata.type;
-        msg.addvalue = jsondata.propvalue;
+        msg.arr = brr;
 
         this.respone(url, msg, callback);
     }
@@ -403,7 +409,7 @@ export default class ServerManager {
     /** 网络配置 */
     private getServerConfig(url, data: string, callback) {
         let msg = new BaseMsg();
-        msg.data = GameController.gameData.server_data;
+        msg.data = GameController.gameData.serverConfig_data;
         this.respone(url, msg, callback);
     }
 

tower_sanguo/assets/scripts/vo/MonsterVO.ts

@@ -32,7 +32,7 @@ export default class MonsterVO {
     }
 
     miss: number;
-    award: string;
+    award: number;
 
     isslow: boolean;