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

# Conflicts:
#	tower_sanguo/assets/scripts/net/HttpCommand.ts

tower_sanguo/assets/resources/data/savingpot_data.json

@@ -0,0 +1,35 @@
+{
+	"15": {
+		"ecpmMin": 15,
+		"ecpmMax": 60,
+		"paraA": 1500,
+		"paraB": 800,
+		"paraC": 15,
+		"paraD": 20,
+		"paraE": 400,
+		"paraF": 300,
+		"paraG": 0.3
+	},
+	"60": {
+		"ecpmMin": 60,
+		"ecpmMax": 200,
+		"paraA": 3000,
+		"paraB": 1300,
+		"paraC": 60,
+		"paraD": 35,
+		"paraE": 300,
+		"paraF": 250,
+		"paraG": 0.25
+	},
+	"200": {
+		"ecpmMin": 200,
+		"ecpmMax": 9999,
+		"paraA": 5000,
+		"paraB": 2000,
+		"paraC": 200,
+		"paraD": 60,
+		"paraE": 600,
+		"paraF": 200,
+		"paraG": 0.25
+	}
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "9c80addf-806f-47f3-945d-c7ad3898d7f1",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/gm/gm.prefab

@@ -592,8 +592,8 @@
       }
     ],
     "_useOriginalSize": true,
-    "_string": "输入需要的参数，多数据用‘ : ’分割",
-    "_N$string": "输入需要的参数，多数据用‘ : ’分割",
+    "_string": "输入需要的参数，多数据用‘  ’分割",
+    "_N$string": "输入需要的参数，多数据用‘  ’分割",
     "_fontSize": 20,
     "_lineHeight": 25,
     "_enableWrapText": false,

tower_sanguo/assets/scripts/data/GameData.ts

@@ -563,6 +563,8 @@ export default class GameData {
         TaskModel.getTaskDataByPlayer();
         let task_list = TaskModel.task_data.list_data;
         if (!task_list || !task_list.length) TaskModel.ResetTaskData();// 无数据则重置
+        // TaskModel.ResetTaskData();// 测试专用
+        GameController.http.getUserIsNewDay();
         GameController.loadMain();
     }
 

tower_sanguo/assets/scripts/manager/XXConst.ts

@@ -10,7 +10,9 @@ export class XXConst {
     public UpdateTaskData: 'update-task-data';
     /** 获得奖励 */
     public EventGetReward: 'event-get-reward';
-    
+    /** 是新的一天 */
+    public EventIsNewDay: 'event-is-new-day';
+
 };
 declare global {
     const XXConst: XXConst;

tower_sanguo/assets/scripts/module/general/GeneralInfoUI.ts

@@ -104,19 +104,23 @@ export default class GeneralInfoUI extends BaseUI {
             this.unschedule(this.queuePlayAnim);
             this.schedule(this.queuePlayAnim, anim_time);
         })
+        // 换将按钮显示
+        if (this.general_data.pos == -1 || this.general_data.pos == undefined) {
+            this.btn_change.node.active = false;
+        } else {
+            this.btn_change.node.active = true;;
+        }
         // 阵上的武将数量
         let embattle_general_count = 0
         for (let i = 0; i < GameController.gameData.player.generals.length; i++) {
             const element = GameController.gameData.player.generals[i];
             if (element && element.pos >= 0) embattle_general_count++;
         }
-        // 换将按钮显示
+        // 左右切换按钮
         if (this.general_data.pos == -1 || this.general_data.pos == undefined || embattle_general_count === 1) {
-            this.btn_change.node.active = false;
             this.btn_left.node.active = false;
             this.btn_right.node.active = false;
-        } else {
-            this.btn_change.node.active = true;;
+        } else if (embattle_general_count >= 1){
             this.btn_left.node.active = true;
             this.btn_right.node.active = true;
         }

tower_sanguo/assets/scripts/module/gm/GmUI.ts

@@ -65,7 +65,7 @@ export default class GmUI extends BaseUI {
     }
 
     private updatePlayerProp(){
-        let arr = this.lbl_input.string.split(":");
+        let arr = this.lbl_input.string.split(" ");
         GameController.http.updateKeyValueDemo(null,arr[0],arr[1]);
     }
 
@@ -88,7 +88,7 @@ export default class GmUI extends BaseUI {
     }
 
     private addFragment() {
-        let arr = this.lbl_input.string.split(":");
+        let arr = this.lbl_input.string.split(" ");
         if(GameController.useLocalServer){
             GameController.gameData.addGeneral(parseInt(arr[0]), 2, parseInt(arr[1]));
         }

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

@@ -100,6 +100,7 @@ export default class MainUI extends BaseUI {
 
     onLoad() {
 
+        // XXEvent.on(XXConst.EventIsNewDay, this.onIsNewDayCall, this);// 新的一天
         // this.btn_gm.node.active = false;
         this.ui = this.node.addComponent(MainNode);
 
@@ -361,6 +362,13 @@ export default class MainUI extends BaseUI {
         }
         GameController.uiM.openUI(GuideUI, null, ViewZorder.UI, null, null, g_data);
     }
+    /** 新的一天 
+     * - 检测到当前是新的一天，刷新数据
+    */
+    private onIsNewDayCall() {
+        // 任务数据刷新
+        TaskModel.ResetTaskData();
+    }
 
     onDestroy() {
         XXEvent.off("MainUIUpdateQiPaoMarshal", this.updateQiPaoMarshal, this);

tower_sanguo/assets/scripts/module/task/TaskModel.ts

@@ -263,7 +263,9 @@ export default class TaskModel {
         }
         // 通知服务端
         let data2 = { addActiveToday: value }
-        GameController.http.scaveTaskActiveValue(data2);
+        GameController.http.scaveTaskActiveValue(data2, (_data) => {
+            cc.log('存活跃值返回：%o', _data)
+        });
         this.saveActiveData();
     }
     /** 设置指定活跃宝箱状态 */

tower_sanguo/assets/scripts/net/HttpCommand.ts

@@ -24,7 +24,7 @@ export default class HttpCommand {
             this.serverUrl = 'https://xiyou-test.duiweize.com/';
         }
         this.serverUrl = 'http://172.16.15.97:9092/';//李扬
-        // this.serverUrl = 'http://172.16.15.91:9092/';//悍国
+        this.serverUrl = 'http://172.16.15.91:9092/';//悍国
     }
 
     httpM: any;