将db_data添加到1.bin中

同步后端参数

tower_sanguo/assets/resources/data/dailyTaskCfg_data.json

@@ -1,17 +1,20 @@
 {
 	"1": {
 		"id": 1,
-		"ecpm": 99999,
+		"ecpmMin": 200,
+		"ecpmMax": 9999,
 		"cfg": "0.5,20,10,0.04,200"
 	},
 	"2": {
 		"id": 2,
-		"ecpm": 99999,
+		"ecpmMin": 200,
+		"ecpmMax": 9999,
 		"cfg": "2,60,10,0.1,200"
 	},
 	"3": {
 		"id": 3,
-		"ecpm": 99999,
+		"ecpmMin": 200,
+		"ecpmMax": 9999,
 		"cfg": "5500,1000,60,20,30,2,60"
 	}
 }

tower_sanguo/assets/resources/data/serverConfig_data.json

@@ -4,7 +4,7 @@
 	"needQuality": "2,3,4",
 	"skillCD": 1200,
 	"dailyClearTimes": 3,
-	"initHero": "112005,122005,132005,142007",
+	"initHero": "111001,111002,111003,111004,112005,112006,112007,112008,113009,113010,113011,113012,113013,113014,113015,114016,121001,121002,122003,122004,122005,122006,123007,123008,123009,123010,123011,123012,123013,124014,131001,131002,131003,132004,132005,132006,132007,133008,133009,133010,133011,133012,133013,134014,141001,141002,141003,141004,142005,142006,142007,142008,142009,142010,143011,143012,143013,143014,143015,144016",
 	"criMul": 1.5,
 	"heroStar": 7,
 	"food": 10000,
@@ -22,5 +22,11 @@
 	"invite_ecpm": 50,
 	"invite_ecpm_K": 0.8,
 	"invite_limit1": 50,
-	"invite_limit10": 5
+	"invite_limit10": 5,
+	"exchange": "1000:50000",
+	"exchange_limit": 3,
+	"trainTime": 200,
+	"turntable_freeTime": 2,
+	"turntable_payTime": 8,
+	"turntable_recover": "12,18,24"
 }

tower_sanguo/assets/resources/data/turntable_data.json

@@ -1,46 +1,52 @@
-[{
-	"index": 1,
-	"reward": 2,
-	"type": 1,
-	"num": 30,
-	"txt": "金币",
-	"weight": 20,
-	"upRewardInfo": "4,40;6,50;9,60"
-}, {
-	"index": 2,
-	"reward": 2,
-	"type": 1,
-	"num": 60,
-	"txt": "金币",
-	"weight": 35,
-	"upRewardInfo": "2,75;5,90"
-}, {
-	"index": 3,
-	"reward": 2,
-	"type": 1,
-	"num": 90,
-	"txt": "金币",
-	"weight": 15,
-	"upRewardInfo": "1,120;7,150"
-}, {
-	"index": 4,
-	"reward": 3,
-	"type": 1,
-	"num": 100,
-	"txt": "红包币",
-	"weight": 10
-}, {
-	"index": 5,
-	"reward": 3,
-	"type": 2,
-	"num": 1000,
-	"txt": "红包币",
-	"weight": 5
-}, {
-	"index": 6,
-	"reward": 4,
-	"type": 2,
-	"num": 40,
-	"txt": "天赋石",
-	"weight": 15
-}]
+{
+	"1": {
+		"index": 1,
+		"item": 1,
+		"type": 0,
+		"num": 500,
+		"des": "粮草",
+		"weight": 35,
+		"upRewardInfo": "1,1000;5,1500;9,2000"
+	},
+	"2": {
+		"index": 2,
+		"item": 1,
+		"type": 0,
+		"num": 1000,
+		"des": "粮草",
+		"weight": 20,
+		"upRewardInfo": "3,1500;7,2500"
+	},
+	"3": {
+		"index": 3,
+		"item": 2,
+		"type": 0,
+		"num": 300,
+		"des": "元宝",
+		"weight": 15
+	},
+	"4": {
+		"index": 4,
+		"item": 3,
+		"type": 1,
+		"num": 0.1,
+		"des": "少量红包币",
+		"weight": 15
+	},
+	"5": {
+		"index": 5,
+		"item": 3,
+		"type": 1,
+		"num": 0.3,
+		"des": "大量红包币",
+		"weight": 5
+	},
+	"6": {
+		"index": 6,
+		"item": 2,
+		"type": 0,
+		"num": 1000,
+		"des": "元宝",
+		"weight": 10
+	}
+}

tower_sanguo/assets/scripts/data/GameData.ts

@@ -302,8 +302,8 @@ export default class GameData {
         //console.log("commanderskill_data: ", this.commanderskill_data);
         //console.log("skill_data: ", this.skill_data);
 
-
         turntableModel.Instance.turntable_data = this.turntable_data;
+        
         // 任务
         this.initTaskData();
 
@@ -564,7 +564,7 @@ export default class GameData {
         let task_list = TaskModel.task_data.list_data;
         if (!task_list || !task_list.length) TaskModel.ResetTaskData();// 无数据则重置
         // TaskModel.ResetTaskData();// 测试专用
-        GameController.http.getUserIsNewDay();
+        // GameController.http.getUserIsNewDay();
         GameController.loadMain();
     }
 

tower_sanguo/assets/scripts/net/HttpCommand.ts

@@ -248,7 +248,7 @@ export default class HttpCommand {
         let data = {
             playPropList: arr
         };
-        // this.sendData(HTTPTYPE.updateProp, data, callback);
+        this.sendData(HTTPTYPE.updateProp, data, callback);
     }
 
     /**
@@ -287,7 +287,7 @@ export default class HttpCommand {
             max: max,
             last: last
         };
-        // this.sendData(HTTPTYPE.updateMission, data, callback);
+        this.sendData(HTTPTYPE.updateMission, data, callback);
     }
 
     addGeneralExp(callback) {

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

@@ -1,3 +1,4 @@
+import LogUtil from "../../../MOKA/util/LogUtil";
 import { GENERALPROP, GENERALSTATUS, ITEMTYPE, PLAYERPROP, RewardState } from "../../data/GameDefinition";
 import GameController from "../../GameController";
 import barracksModel from "../../module/barracks/barracksModel";
@@ -443,23 +444,23 @@ export default class ServerManager {
     }
     /** 获取用户信息 */
     private getPlayerInfo(url, data: string, callback) {
-        let player = new PlayerProp();
+        let player:any = {};
         player.uid = this.player.uid;
         player.food = this.player.food;
         player.yb = this.player.yb;
-        player.redbag = this.player.redbag;
-        player.foodrecover = this.player.foodrecover;
-        player.foodmax = this.player.foodmax;
+        player.redBag = this.player.redbag;
+        player.foodRecover = this.player.foodrecover;
+        player.foodMax = this.player.foodmax;
         player.barrack = this.player.barrack;
         player.mission_arrive = this.player.mission_arrive;
         player.mission_passed = this.player.mission_passed;
         player.generalpack = this.getGenerals();
         player.prestige = this.player.prestige;
-        player.turntable_card = this.player.turntable_card;
-        player.turntable_leftTimes = this.player.turntable_leftTimes;
-        player.turntable_refreshTimes = this.player.turntable_refreshTimes;
-        player.turntable_useCardTimes = this.player.turntable_useCardTimes;
-        player.turntable_total = this.player.turntable_total;
+        player.turntableCard = this.player.turntable_card;
+        player.turntableLeftTimes = this.player.turntable_leftTimes;
+        player.turntableRefreshTimes = this.player.turntable_refreshTimes;
+        player.turntableUseCardTimes = this.player.turntable_useCardTimes;
+        player.turntableTotal = this.player.turntable_total;
         player.skill_coolTime = 0;
 
         player.general_train_times = 0;
@@ -469,8 +470,8 @@ export default class ServerManager {
         player.look_video_times = 0;
 
         let vo = GameController.gameData.getMissionByID(this.player.mission_arrive);
-        player.foodrecover = vo.foodRecover;
-        player.foodmax = vo.foodMax;
+        player.foodRecover = vo.foodRecover;
+        player.foodMax = vo.foodMax;
 
         let msg = new PlayerResponse();
         msg.data = player;