Parcourir la source

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

薛鸿潇 il y a 5 ans
Parent
commit
4894a4ea97

BIN
tower_sanguo/assets/resources/data/1.bin


+ 2 - 1
tower_sanguo/assets/resources/data/db_data.json

@@ -7,7 +7,8 @@
         "barrack": 15,
         "mission_arrive": 41,
         "mission_passed": 0,
-        "prestige": 10000
+        "prestige": 10000,
+        "useserver":0
     },
     "generals": [
         {

+ 6 - 13
tower_sanguo/assets/resources/data/openfun_data.json

@@ -2,7 +2,7 @@
 	"1": {
 		"id": 1,
 		"name": "统帅台",
-		"openmission": 3,
+		"openmission": 5,
 		"btn_src": "btn_marshalstage",
 		"uiID": 1,
 		"ui_src": "marshalStageUI"
@@ -10,7 +10,7 @@
 	"2": {
 		"id": 2,
 		"name": "兵营",
-		"openmission": 5,
+		"openmission": 1,
 		"btn_src": "btn_barracks",
 		"uiID": 2,
 		"ui_src": "barracksUI"
@@ -18,15 +18,15 @@
 	"3": {
 		"id": 3,
 		"name": "武将",
-		"openmission": 7,
+		"openmission": 2,
 		"btn_src": "btn_general",
 		"uiID": 3,
-		"ui_src":"GeneralUI"
+		"ui_src": "GeneralUI"
 	},
 	"4": {
 		"id": 4,
 		"name": "日常任务",
-		"openmission": 9,
+		"openmission": 3,
 		"btn_src": "btn_task",
 		"uiID": 4,
 		"ui_src": "TaskUI"
@@ -34,16 +34,9 @@
 	"5": {
 		"id": 5,
 		"name": "点将台",
-		"openmission": 7,
+		"openmission": 4,
 		"btn_src": "btn_getgeneral",
 		"uiID": 5,
 		"ui_src": "GetGeneralUI"
-	},
-	"6": {
-		"id": 6,
-		"name": "转盘",
-		"openmission": 8,
-		"uiID": 6,
-		"ui_src": "GetGeneralUI"
 	}
 }

+ 4 - 4
tower_sanguo/assets/resources/data/turntable_data.json

@@ -4,7 +4,7 @@
 		"item": 1,
 		"type": 0,
 		"num": 500,
-		"des": "少量粮草",
+		"des": "粮草",
 		"weight": 35,
 		"upRewardInfo": "1,1000;5,1500;9,2000",
 		"icon": 3
@@ -14,7 +14,7 @@
 		"item": 1,
 		"type": 0,
 		"num": 1000,
-		"des": "大量粮草",
+		"des": "粮草",
 		"weight": 20,
 		"upRewardInfo": "3,1500;7,2500",
 		"icon": 4
@@ -24,7 +24,7 @@
 		"item": 2,
 		"type": 0,
 		"num": 300,
-		"des": "少量元宝",
+		"des": "元宝",
 		"weight": 15,
 		"icon": 6
 	},
@@ -51,7 +51,7 @@
 		"item": 2,
 		"type": 0,
 		"num": 1000,
-		"des": "大量元宝",
+		"des": "元宝",
 		"weight": 10,
 		"icon": 7
 	}

Fichier diff supprimé car celui-ci est trop grand
+ 1024 - 180
tower_sanguo/assets/resources/module/main/main.prefab


+ 0 - 4
tower_sanguo/assets/scripts/GameController.ts

@@ -49,10 +49,6 @@ class GameController {
     init() {
         this.initErrorHandler();
 
-        if (this.useLocalServer) {
-            this.servertest = new ServerManager();
-        }
-
         this.resM = new ResManager();
         this.errorM = new ErrorManager();
         this.uiM = new UIManager();

+ 4 - 2
tower_sanguo/assets/scripts/data/GameData.ts

@@ -12,6 +12,7 @@ import GeneralProp from "../net/msg/GeneralProp";
 import PlayerProp from "../net/msg/PlayerProp";
 import PlayerResponse from "../net/msg/PlayerResponse";
 import PlayerUpdateResponse from "../net/msg/PlayerUpdateResponse";
+import ServerManager from "../net/servertest/ServerManager";
 import { Dictionary } from "../utils/Dictionary";
 import BarrackVO from "../vo/BarrackVO";
 import BuffVO from "../vo/BuffVO";
@@ -74,7 +75,7 @@ export default class GameData {
         'star', 'help', 'turntable', 'taskActive', 'task', 'commanderskill', 'openfun'];
 
     /** 是否使用本地资源,不使用oss资源 */
-    private useLocal: boolean = true;
+    private useLocal: boolean = false;
 
     async initLocalConfigs() {
         console.log('initLocalConfigs');
@@ -122,9 +123,10 @@ export default class GameData {
     }
 
     private initJsonData() {
+        GameController.useLocalServer = this.db_data.playerInfo.useserver != 1;
         LogUtil.logAndroid('initJsonData...' + GameController.useLocalServer);
         if (GameController.useLocalServer) {
-            GameController.servertest.init();
+            GameController.servertest = new ServerManager();
         }
 
         this.fullskillId = [];

+ 8 - 7
tower_sanguo/assets/scripts/module/invest/investModel.ts

@@ -1,6 +1,7 @@
 import { PLAYERPROP } from "../../data/GameDefinition"
 import GameController from "../../GameController"
 import { HTTPTYPE } from "../../net/HttpCommand"
+import MainUI from "../main/MainUI"
 import investItem from "./investItem"
 import investUI from "./investUI"
 
@@ -32,7 +33,8 @@ export default class investModel {
 
     getInvestInfo() {
         let data = {}
-        GameController.http.sendRequest(HTTPTYPE.getInvestInfo, 'POST', JSON.stringify(data), investModel.Instance.getInvestInfoBack.bind(this))
+        // GameController.http.sendRequest(HTTPTYPE.getInvestInfo, 'POST', JSON.stringify(data), investModel.Instance.getInvestInfoBack.bind(this))
+        GameController.http.sendData(HTTPTYPE.getInvestInfo, data, investModel.Instance.getInvestInfoBack.bind(this))
     }
 
     getInvestInfoBack(data) {
@@ -40,7 +42,7 @@ export default class investModel {
         this.SurplusTimes = data.SurplusTimes;
         GameController.commonData.gameTime = data.timestamp * 1000
 
-        this.freshRed();
+        this.checkRed();
 
         let investui = GameController.uiM.getUI(investUI);
         if (investui) {
@@ -66,8 +68,7 @@ export default class investModel {
         this.investData = data.investModel
         this.SurplusTimes = data.SurplusTimes
         GameController.commonData.gameTime = data.timestamp * 1000
-
-        this.freshRed()
+        this.checkRed();
 
         let investui = GameController.uiM.getUI(investUI);
         if (param.investMentType == 0) {
@@ -125,8 +126,8 @@ export default class investModel {
     }
 
     /** 刷新红点 */
-    freshRed() {
-        // let state = this.SurplusTimes > 0 ? true : false
-        // UiM.Instance.hallNode.getComponent(Main).setInvestRed(state)
+    checkRed() {
+        let state = this.SurplusTimes > 0 ? true : false
+        GameController.uiM.getUI(MainUI).invest_red.active = state
     }
 }

+ 27 - 7
tower_sanguo/assets/scripts/module/main/MainUI.ts

@@ -24,6 +24,8 @@ import PiggyBankModel from "../piggyBank/PiggyBankModel";
 import CheckpointRedBagModle from "../checkpointRedBag/CheckpointRedBagModle";
 import GetLiangCaoUI from "../getLiangCao/GetLiangCaoUI";
 import GetLiangCaoModel from "../getLiangCao/GetLiangCaoModel";
+import investUI from "../invest/investUI";
+import investModel from "../invest/investModel";
 
 const { ccclass, property } = cc._decorator;
 
@@ -77,6 +79,10 @@ export default class MainUI extends BaseUI {
     barracks_red: cc.Node = null;
     @property({ type: cc.Node, displayName: "任务红点" })
     task_red: cc.Node = null;
+    @property({ type: cc.Node, displayName: "转盘红点" })
+    turntable_red: cc.Node = null;
+    @property({ type: cc.Node, displayName: "投资红点" })
+    invest_red: cc.Node = null;
 
 
     @property({ type: cc.Node, displayName: "气泡_统帅" })
@@ -133,6 +139,9 @@ export default class MainUI extends BaseUI {
         GameController.gameData.player.addComponent(this, PLAYERPROP.TURNTABLE_LUCK_TIMES);
         GameController.gameData.player.addComponent(this, PLAYERPROP.USE_SKILLS_TIMES);
         GameController.gameData.player.addComponent(this, PLAYERPROP.LOOK_VIDEO_TIMES);
+        //转盘每日次数
+        GameController.gameData.player.addComponent(this, PLAYERPROP.TURNTABLE_LEFTTIMES);
+        GameController.gameData.player.addComponent(this, PLAYERPROP.TURNTABLE_CARD);
 
         this.mission = this.ui.missions.getComponent(MenuMission) as MenuMission;
 
@@ -140,6 +149,10 @@ export default class MainUI extends BaseUI {
 
         this.barracks_red.active = barracksModel.getInstance().checkRed();
         turntableModel.Instance.updateResetTurntable();
+        this.turntable_red.active = turntableModel.Instance.checkRed();
+
+        investModel.Instance.getInvestInfo();
+
         this.task_red.active = TaskModel.checkMainRed();
 
         this.initScheduler();
@@ -175,7 +188,7 @@ export default class MainUI extends BaseUI {
         });
     }
     private checkOpenUI(data: FunData) {
-        // this[data.btn_src].active = GameController.gameData.player.max_mission >= data.openmission;
+        this[data.btn_src].node.active = GameController.gameData.player.max_mission >= data.openmission;
     }
 
     updateProp(type: PLAYERPROP, value: number) {
@@ -215,6 +228,11 @@ export default class MainUI extends BaseUI {
                 this.task_red.active = TaskModel.checkMainRed();
                 // cc.log('类型' + type + ':%o', value)
                 break;
+
+            case PLAYERPROP.TURNTABLE_LEFTTIMES:
+            case PLAYERPROP.TURNTABLE_CARD:
+                this.turntable_red.active = turntableModel.Instance.checkRed();
+                break
         }
     }
 
@@ -280,13 +298,11 @@ export default class MainUI extends BaseUI {
     }
 
     clickCashOut() {
-        GameController.http.savePiggyBox();
-        // GameController.http.saveStageReward();
+        
     }
 
     clickAddFood() {
-        GameController.http.getPiggyBox();
-        // GameController.http.getStageReward();
+        
     }
 
     clickOpenCommanderUI() {
@@ -323,8 +339,7 @@ export default class MainUI extends BaseUI {
     }
 
     clickOpenGetGeneralUI() {
-        //test
-        this.clickTurntableUI();
+
     }
 
     clickTurntableUI() {
@@ -332,6 +347,11 @@ export default class MainUI extends BaseUI {
         GameController.uiM.openUI(turntableUI, null, ViewZorder.UI);
     }
 
+    clickInvestUi() {
+        GameController.audioM.playEffect(AUDIO_TYPE.button);
+        GameController.uiM.openUI(investUI, null, ViewZorder.UI);
+    }
+
     clickOpenGeneralUI() {
         GameController.audioM.playEffect(AUDIO_TYPE.button);
         GameController.uiM.openUI(GeneralUI, null, ViewZorder.UI, null, null, { tab_type: 0 });

+ 7 - 11
tower_sanguo/assets/scripts/module/turntable/turntableModel.ts

@@ -125,9 +125,6 @@ export default class turntableModel {
         this.turntableTimes--
         GameController.gameData.player.setProp(PLAYERPROP.TURNTABLE_LEFTTIMES, this.turntableTimes);
         GameController.gameData.updateProp(PLAYERPROP.TURNTABLE_LEFTTIMES, this.turntableTimes);
-
-        this.setRed();
-
         // GameM.commonData.addDailyFinishTimesDataByType(2)
     }
 
@@ -148,16 +145,15 @@ export default class turntableModel {
         GameController.gameData.updateProp(PLAYERPROP.TURNTABLE_CARD, this.turntableCard);
         GameController.gameData.updateProp(PLAYERPROP.TURNTABLE_USECARDTIMES, this.turntableUseCardTimes);
 
-        this.setRed();
         // GameM.commonData.addDailyFinishTimesDataByType(2)
     }
 
-    setRed() {
-        // if (TurntableData.Instance.turntableTimes > 0 || GameM.commonData.roleData.turntableCard > 0) {
-        //     RedPointM.instance.ActiveRedPoint(RedPointType.Turnplate, true)
-        // }
-        // else {
-        //     RedPointM.instance.ActiveRedPoint(RedPointType.Turnplate, false)
-        // }
+    checkRed() {
+        if (this.turntableTimes > 0 || this.turntableCard > 0) {
+            return true;
+        }
+        else {
+            return false;
+        }
     }
 }

+ 1 - 1
tower_sanguo/assets/scripts/net/servertest/ServerManager.ts

@@ -24,7 +24,7 @@ import TaskResponse from "../msg/TaskResponse";
 
 export default class ServerManager {
     constructor() {
-
+        this.init();
     }
 
     init() {

+ 906 - 0
tower_sanguo/塔防接口.md

@@ -0,0 +1,906 @@
+用户相关: 
+	updatePlayerProp:更新用户属性
+	入参:
+		{
+		  "appVersion": "string",
+		  "playPropList": [
+			{
+			  "add": 0, (0当前值  1增加值)
+			  "propType": 0, (属性类型)
+			  "propValue": 0 (属性值)
+			}
+		  ],
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"playPropBackList": [
+			  {
+				"propType": 1, (属性类型)
+				"propValue": 222333, (当前值)
+				"addValue": 111 (增加值)
+			  }
+			]
+		  }
+		}
+		
+
+	getInfoCrypt: 获取用户属性
+	入参:
+		{
+		  "appVersion": "string",
+		  "tfChannel": 0,
+		  "versioncfg": "1.0"
+		}
+	返回:(encryp加密)
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": "{"lastTime":1621824357,
+		  "loginDays":3,
+		  "versioncfg":"1.0",
+		  "food":222333,
+		  "prestige":100,
+		  "yb":451,
+		  "redBag":0,
+		  "turntableCard":null,
+		  "turntableLeftTimes":null,
+		  "turntableRefreshTimes":null,
+		  "turntableUseCardTimes":null,
+		  "turntableTotal":null,
+		  "barrack":30,
+		  "foodMax":100,
+		  "foodConsume":null,
+		  "foodRecover":1,
+		  "mission_arrive":50,
+		  "mission_passed":1,
+		  "generalpack":[{
+			"id":111001,
+			"status":1,
+			"pos":0,
+			"exp":0,
+			"lv":1,
+			"star":2,
+			"fragment":186,
+			"receiveTimes":0,
+			"rewardFirstOpen":null
+			},{
+			"id":113011,
+			"status":0,
+			"pos":-1,
+			"exp":0,
+			"lv":30,
+			star":1,
+			"fragment":444,
+			"receiveTimes":0,
+			"rewardFirstOpen":null
+			},{
+			"id":111002,
+			"status":1,
+			"pos":1,
+			"exp":0,
+			"lv":30,
+			"star":3,
+			"fragment":62,
+			"receiveTimes":0,
+			"rewardFirstOpen":null}],
+			"useskill_time":0,
+			"dailyClearTimes":3,
+			"taskRedBag":0,
+			"dailyTask":{
+				"activeVideoTimes":0,
+				"activeToday":0,
+				"dailyTaskReceives":[],
+				"updateActiveTime":1621590851},
+			"gameUserData":{
+				"14":"0",
+				"12":"10",
+				"31":"[{
+					"id":1,
+					"state":3,
+					"task_stage":1,
+					"cur_bar":5,
+					"description":"武将训练{0}次",
+					"count1":5,
+					"count2":20,
+					"activevalue1":5,
+					"activevalue2":15
+					},{
+					"id":2,
+					"state":2,
+					"task_stage":1,
+					"cur_bar":0,
+					"description":"投资{0}次",
+					"count1":2,
+					"count2":4,
+					"activevalue1":5,
+					"activevalue2":10
+					},{
+					"id":3,
+					"state":2,
+					"task_stage":1,
+					"cur_bar":0,
+					"description":"抽取武将{0}次",
+					"count1":5,
+					"count2":10,
+					"activevalue1":5,
+					"activevalue2":15
+					},{
+					"id":4,
+					"state":2,
+					"task_stage":1,
+					"cur_bar":0,
+					"description":"转盘抽奖{0}次",
+					"count1":5,
+					"count2":10,
+					"activevalue1":5,
+					"activevalue2":15
+					},{
+					"id":5,
+					"state":2,
+					"task_stage":1,
+					"cur_bar":0,
+					"description":"使用统帅技能{0}次",
+					"count1":1,
+					"count2":3,
+					"activevalue1":5,
+					"activevalue2":15
+					},{
+					"id":6,
+					"state":2,
+					"task_stage":1,
+					"cur_bar":0,
+					"description":"观看视频广告{0}次",
+					"count1":15,
+					"count2":30,
+					"activevalue1":5,
+					"activevalue2":20
+					}
+				]",
+				"13":"1",
+				"33":"{
+					"cur_count":20,
+					"cumulative_count":20,
+					"limit_count":20
+					}",
+				"32":"[{
+					"id":1,
+					"icon":1,
+					"activevalue":20,
+					"isdouble":1,
+					"videotimes":0,
+					"task_box_state":2,
+					"tv_box_state":2,
+					"can_receive_tv_box":0
+					},{
+					"id":2,
+					"icon":1,
+					"activevalue":40,
+					"isdouble":0,
+					"videotimes":0,
+					"task_box_state":2,
+					"tv_box_state":2,
+					"can_receive_tv_box":0
+					},{
+					"id":3,
+					"icon":2,
+					"activevalue":60,
+					"isdouble":0,
+					"videotimes":0,
+					"task_box_state":2,
+					"tv_box_state":2,
+					"can_receive_tv_box":0
+					},{
+					"id":4,
+					"icon":1,
+					"activevalue":80,
+					"isdouble":0,
+					"videotimes":0,
+					"task_box_state":2,
+					"tv_box_state":2,
+					"can_receive_tv_box":0
+					},{
+					"id":5,
+					"icon":2,
+					"activevalue":100,
+					"isdouble":1,
+					"videotimes":0,
+					"task_box_state":2,
+					"tv_box_state":2,
+					"can_receive_tv_box":0
+				}]"},
+			"drawCardTimes1":null,
+			"drawCardTimes10":null,
+			"userExchangeTimes":3,
+			"qualityMissedTimes":null,
+			"turntableTimes":0,
+			"isNewDay":0,
+			"piggyBox":{
+				"piggyBox":0,
+				"piggyBoxYesterday":0,
+				"piggyBoxLastTime":1621818739,
+				"piggyBoxFull":0
+				},
+			"turntableAlreadyTotalTimes":0,
+			"restore":null
+		}"
+		}
+		
+	savePlayerProp: 更新用户的单个属性(极简风)
+	入参:
+		{
+		  "key": "string",
+		  "value": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"12": "10",
+			"13": "1",
+			"14": "0",
+			"31": "[{"id":1,"state":3,"task_stage":1,"cur_bar":5,"description":"武将训练{0}次","count1":5,"count2":20,"activevalue1":5,"activevalue2":15},{"id":2,"state":2,"task_stage":1,"cur_bar":0,"description":"投资{0}次","count1":2,"count2":4,"activevalue1":5,"activevalue2":10},{"id":3,"state":2,"task_stage":1,"cur_bar":0,"description":"抽取武将{0}次","count1":5,"count2":10,"activevalue1":5,"activevalue2":15},{"id":4,"state":2,"task_stage":1,"cur_bar":0,"description":"转盘抽奖{0}次","count1":5,"count2":10,"activevalue1":5,"activevalue2":15},{"id":5,"state":2,"task_stage":1,"cur_bar":0,"description":"使用统帅技能{0}次","count1":1,"count2":3,"activevalue1":5,"activevalue2":15},{"id":6,"state":2,"task_stage":1,"cur_bar":0,"description":"观看视频广告{0}次","count1":15,"count2":30,"activevalue1":5,"activevalue2":20}]",
+			"32": "[{"id":1,"icon":1,"activevalue":20,"isdouble":1,"videotimes":0,"task_box_state":2,"tv_box_state":2,"can_receive_tv_box":0},{"id":2,"icon":1,"activevalue":40,"isdouble":0,"videotimes":0,"task_box_state":2,"tv_box_state":2,"can_receive_tv_box":0},{"id":3,"icon":2,"activevalue":60,"isdouble":0,"videotimes":0,"task_box_state":2,"tv_box_state":2,"can_receive_tv_box":0},{"id":4,"icon":1,"activevalue":80,"isdouble":0,"videotimes":0,"task_box_state":2,"tv_box_state":2,"can_receive_tv_box":0},{"id":5,"icon":2,"activevalue":100,"isdouble":1,"videotimes":0,"task_box_state":2,"tv_box_state":2,"can_receive_tv_box":0}]",
+			"33": "{"cur_count":20,"cumulative_count":20,"limit_count":20}",
+			"1998": "2021"
+		  }
+		}
+		
+	saveAllPlayerProp: 更新用户所有的属性(极简风)
+	入参:	
+		{
+		  "needProp": {"1998":"2021","1990":"2010"}
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"12": "10",
+			"13": "1",
+			"14": "0",
+			"31": "[{"id":1,"state":3,"task_stage":1,"cur_bar":5,"description":"武将训练{0}次","count1":5,"count2":20,"activevalue1":5,"activevalue2":15},{"id":2,"state":2,"task_stage":1,"cur_bar":0,"description":"投资{0}次","count1":2,"count2":4,"activevalue1":5,"activevalue2":10},{"id":3,"state":2,"task_stage":1,"cur_bar":0,"description":"抽取武将{0}次","count1":5,"count2":10,"activevalue1":5,"activevalue2":15},{"id":4,"state":2,"task_stage":1,"cur_bar":0,"description":"转盘抽奖{0}次","count1":5,"count2":10,"activevalue1":5,"activevalue2":15},{"id":5,"state":2,"task_stage":1,"cur_bar":0,"description":"使用统帅技能{0}次","count1":1,"count2":3,"activevalue1":5,"activevalue2":15},{"id":6,"state":2,"task_stage":1,"cur_bar":0,"description":"观看视频广告{0}次","count1":15,"count2":30,"activevalue1":5,"activevalue2":20}]",
+			"32": "[{"id":1,"icon":1,"activevalue":20,"isdouble":1,"videotimes":0,"task_box_state":2,"tv_box_state":2,"can_receive_tv_box":0},{"id":2,"icon":1,"activevalue":40,"isdouble":0,"videotimes":0,"task_box_state":2,"tv_box_state":2,"can_receive_tv_box":0},{"id":3,"icon":2,"activevalue":60,"isdouble":0,"videotimes":0,"task_box_state":2,"tv_box_state":2,"can_receive_tv_box":0},{"id":4,"icon":1,"activevalue":80,"isdouble":0,"videotimes":0,"task_box_state":2,"tv_box_state":2,"can_receive_tv_box":0},{"id":5,"icon":2,"activevalue":100,"isdouble":1,"videotimes":0,"task_box_state":2,"tv_box_state":2,"can_receive_tv_box":0}]",
+			"33": "{"cur_count":20,"cumulative_count":20,"limit_count":20}",
+			"1990": "2010",
+			"1998": "2021"
+		  }
+		}
+		
+	getUserIsNewDay: 登录时获取是否新一天
+	入参:
+		{
+		  "appVersion": "string",
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"isNewDay": 1 (0.不是 1.是)
+		  }
+		}
+
+
+​		
+武将相关: /general
+​	updateKeyValueDemo: 更新数据demo
+​	入参:
+​		{
+​		  "key": "string",
+​		  "value": "string"
+​		}
+​	返回:
+​		{
+​		  "errcode": 0,
+​		  "errmsg": "ok",
+​		  "data": {
+​			"code": 1,
+​			"msg": "操作成功"
+​		  }
+​		}
+​		
+	getInitGeneralDemo: 获取初始武将用于测试
+	入参:
+		{
+		  "appVersion": "string",
+		  "id": 0,
+		  "num": 0,
+		  "tfChannel": 0,
+		  "type": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"GeneralProp": [
+			{
+				"id": Integer (武将Id)
+				"status": Integer (武将状态 是否激活)
+				"pos": Integer (位置 0-4表示在阵上 -1表示不在阵上)
+				"exp": BigDecimal (当前等级的经验)
+				"lv": Integer (当前等级)
+				"star": Integer (当前星级)
+				"fragment": Integer (当前碎片数)
+				"receiveTimes": Integer (领取次数)
+				"rewardFirstOpen": [ (首次开启时的奖励)
+					{
+						"type": Integer (道具类型)
+						"num": Integer (奖励数量)
+					}
+					]
+			}
+			]
+		  }
+		}
+		
+	changeEmbattle: 更换布阵
+	入参:
+		{
+		  "appVersion": "string",
+		  "changeEmbattles": [
+			{
+			  "gid": 0,
+			  "pos": 0
+			}
+		  ],
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功"
+		  }
+		}
+		
+	composeGeneral: 武将合成、升星
+	入参:
+		{
+		  "appVersion": "string",
+		  "id": 0,
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功",
+			"GeneralProp":
+				{
+				"id": Integer (武将Id)
+				"status": Integer (武将状态 是否激活)
+				"pos": Integer (位置 0-4表示在阵上 -1表示不在阵上)
+				"exp": BigDecimal (当前等级的经验)
+				"lv": Integer (当前等级)
+				"star": Integer (当前星级)
+				"fragment": Integer (当前碎片数)
+				"receiveTimes": Integer (领取次数)
+				"rewardFirstOpen": [ (首次开启时的奖励)
+					{
+						"type": Integer (道具类型)
+						"num": Integer (奖励数量)
+					}
+					]
+				}
+		  }
+		}
+		
+	generalExpUp: 升级武将
+	入参:
+		{
+		  "appVersion": "string",
+		  "generalExpUps": [
+			{
+			  "exp": 0,
+			  "gui": 0,
+			  "lv": 0
+			}
+		  ],
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功"
+		  }
+		}
+		
+	barracksLvUp: 升级兵营
+	入参:
+		{
+		  "appVersion": "string",
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"prestige": 
+			"barrack": 
+			"generalpack": [
+			{
+				"id": Integer (武将Id)
+				"status": Integer (武将状态 是否激活)
+				"pos": Integer (位置 0-4表示在阵上 -1表示不在阵上)
+				"exp": BigDecimal (当前等级的经验)
+				"lv": Integer (当前等级)
+				"star": Integer (当前星级)
+				"fragment": Integer (当前碎片数)
+				"receiveTimes": Integer (领取次数)
+				"rewardFirstOpen": [ (首次开启时的奖励)
+					{
+						"type": Integer (道具类型)
+						"num": Integer (奖励数量)
+					}
+					]
+			}
+			]
+		  }
+		}
+		
+	getInitGeneral: 获取初始武将
+	入参:
+		{
+		  "appVersion": "string",
+		  "id": 0,
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "初始成功",
+			"GeneralProp": 
+			{
+				"id": Integer (武将Id)
+				"status": Integer (武将状态 是否激活)
+				"pos": Integer (位置 0-4表示在阵上 -1表示不在阵上)
+				"exp": BigDecimal (当前等级的经验)
+				"lv": Integer (当前等级)
+				"star": Integer (当前星级)
+				"fragment": Integer (当前碎片数)
+				"receiveTimes": Integer (领取次数)
+				"rewardFirstOpen": [ (首次开启时的奖励)
+					{
+						"type": Integer (道具类型)
+						"num": Integer (奖励数量)
+					}
+					]
+			}
+		  }
+		}
+		
+	updateMission: 过关校验
+	入参:
+		{
+		  "appVersion": "string",
+		  "last": [
+			0
+		  ],
+		  "max": [
+			0
+		  ],
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功",
+			"sward": 1 (奖励id1:数量;奖励id2:数量;...)
+		  }
+		}
+		
+	drawCard: 武将抽卡
+	入参:
+		{
+		  "appVersion": "string",
+		  "tfChannel": 0,
+		  "type": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功",
+			"Yb": 1111,
+			"GeneralProp": [
+			{
+				"id": Integer (武将Id)
+				"status": Integer (武将状态 是否激活)
+				"pos": Integer (位置 0-4表示在阵上 -1表示不在阵上)
+				"exp": BigDecimal (当前等级的经验)
+				"lv": Integer (当前等级)
+				"star": Integer (当前星级)
+				"fragment": Integer (当前碎片数)
+				"receiveTimes": Integer (领取次数)
+				"rewardFirstOpen": [ (首次开启时的奖励)
+					{
+						"type": Integer (道具类型)
+						"num": Integer (奖励数量)
+					}
+					]
+			}
+			]
+		  }
+		}
+		
+	openGeneralReward: 开启武将奖励
+	入参:
+		{
+		  "appVersion": "string",
+		  "id": 0,
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功",
+			"GeneralReward": [
+			{
+				"id": Integer (武将Id)
+				"status": Integer (武将状态 是否激活)
+				"pos": Integer (位置 0-4表示在阵上 -1表示不在阵上)
+				"exp": BigDecimal (当前等级的经验)
+				"lv": Integer (当前等级)
+				"star": Integer (当前星级)
+				"fragment": Integer (当前碎片数)
+				"receiveTimes": Integer (领取次数)
+				"rewardFirstOpen": [ (首次开启时的奖励)
+					{
+						"type": Integer (道具类型)
+						"num": Integer (奖励数量)
+					}
+					]
+			}
+			]
+		  }
+		}
+		
+	receiveReward: 领取武将奖励
+	入参:
+		{
+		  "appVersion": "string",
+		  "id": 0,
+		  "isDouble": 0,
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功"
+		  }
+		}
+		
+	prayGeneral: 武将许愿
+	入参:
+		{
+		  "appVersion": "string",
+		  "generalId": 0,
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "ok!",
+			"data": {
+				id: Integer, (许愿武将ID)
+				weight: Integer, (权重)
+				achieveChance: double (提升后的倍数)
+			}
+		  }
+		}
+		
+	removePrayGeneral: 武将移除许愿池
+	入参:
+		{
+		  "appVersion": "string",
+		  "generalId": 0,
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "ok!"
+		  }
+		}
+		
+	redBagToYb: 兑换元宝
+	入参:
+		{
+		  "appVersion": "string",
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "ok!",
+			"data": {
+				"RedBag": Integer, (当前红包币)
+				"Yb": Integer, (当前元宝)
+				"UserExchangeTimes": Integer (当前剩余兑换次数)
+			}
+		  }
+		}
+
+
+​		
+每日任务:	/dailytask
+​	openTreasureChest: 开启宝箱
+​	入参:
+​		{
+​		  "appVersion": "string",
+​		  "taskId": 0,
+​		  "tfChannel": 0,
+​		  "versioncfg": "string"
+​		}
+​	返回:
+​		{
+​		  "errcode": 0,
+​		  "errmsg": "ok",
+​		  "data": {
+​			"code": 1,
+​			"msg": "操作成功",
+​			"dailyTaskReward": {
+​				"rewardType": Integer, (奖励类型 1粮草 3红包币)
+​				"reward": Integer (奖励)
+​			}
+​		  }
+​		}
+​		
+	exchangeTreasureChest: 领取宝箱
+	入参:
+		{
+		  "appVersion": "string",
+		  "isDouble": 0,
+		  "taskId": 0,
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功",
+			"dailyTaskReward": {
+				"rewardType": Integer, (奖励类型 1粮草 3红包币)
+				"reward": Integer (奖励)
+			}
+		  }
+		}
+		
+	saveActiveToday: 存活跃值
+	入参:
+		{
+		  "addActiveToday": 0,
+		  "appVersion": "string",
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功",
+			"dailyTask": {
+				"activeVideoTimes": 1, (今日视频数)
+				"activeToday": 100, (今日活跃)
+				"dailyTaskReceives": { 
+					"exchangeIds": 1, (已兑换Id)
+					"receiveTimes": 1 (领取次数)
+				},
+				"updateActiveTime": 1655533334 (活跃度更新时间)
+			}
+		  }
+		}
+		
+	saveYesterDayRedBag:  领取昨日任务红包币
+	入参:
+		{
+		  "appVersion": "string",
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功"
+		  }
+		}
+
+
+​		
+存钱罐:  /piggyBox
+​	savePiggyBox:  存钱罐进账
+​	入参:
+​		{
+​		  "appVersion": "string",
+​		  "tfChannel": 0,
+​		  "versioncfg": "string"
+​		}
+​	返回:
+​		{
+​		  "errcode": 0,
+​		  "errmsg": "ok",
+​		  "data": {
+​			"code": 1,
+​			"msg": "操作成功",
+​			"data": {
+​				"piggyBox": Integer,
+​				"piggyBoxYesterday": Integer,
+​				"piggyBoxLastTime": Long,
+​				"piggyBoxFull": Integer  (0.未满 1.已满)
+​			}
+​		  }
+​		}
+​	
+	getPiggyBox:  提取存钱罐
+	入参:
+		{
+		  "appVersion": "string",
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功",
+			"data": {
+				"piggyBox": Integer, (用户存钱罐金额)
+				"piggyBoxYesterday": Integer, (用户昨日存钱罐金额)
+				"piggyBoxLastTime": Long, (用户存钱罐最后修改时间)
+				"piggyBoxFull": Integer  (用户存钱罐是否已满 0.未满 1.已满)
+			}
+		  }
+		}
+
+
+​	
+通关红包: /stage
+​	getStageReward: 领取通关红包
+​	入参:
+​		{
+​		  "appVersion": "string",
+​		  "tfChannel": 0,
+​		  "versioncfg": "string"
+​		}
+​	返回:
+​		{
+​		  "errcode": 0,
+​		  "errmsg": "ok",
+​		  "data": {
+​			"code": 1,
+​			"msg": "操作成功",
+​			"data": {
+​				"stageRewardNum": Integer, (用户通关红包剩余数量)
+​				"stageRewardRedBag": Integer, (用户当前通关红包币数量)
+​				"stageRewardDrop": Integer, (用户当天红包掉落次数)
+​				"stageRewardLastTime": Long, (用户最后更新通关红包的时间)
+​				"stageRewardVideoTime": Integer (用户通关红包视频次数)
+​			}
+​		  }
+​		}
+​		
+	saveStageReward: 掉落通关红包
+	入参:
+		{
+		  "appVersion": "string",
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功",
+			"data": {
+				"stageRewardNum": Integer, (用户通关红包剩余数量)
+				"stageRewardRedBag": Integer, (用户当前通关红包币数量)
+				"stageRewardDrop": Integer, (用户当天红包掉落次数)
+				"stageRewardLastTime": Long, (用户最后更新通关红包的时间)
+				"stageRewardVideoTime": Integer (用户通关红包视频次数)
+			}
+		  }
+		}
+
+打开转盘: /
+	getInitTurntable:  打开转盘
+	入参:
+		{
+		  "appVersion": "string",
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功"
+		  }
+		}
+		
+	updateTurntable:  更新转盘
+	入参:
+		{
+		  "appVersion": "string",
+		  "index": 0,
+		  "tfChannel": 0,
+		  "versioncfg": "string"
+		}
+	返回:
+		{
+		  "errcode": 0,
+		  "errmsg": "ok",
+		  "data": {
+			"code": 1,
+			"msg": "操作成功",
+			"RedBag":  (获得红包币)
+		  }
+		}

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff