修改主界面 训练次数

tower_sanguo/assets/resources/data/TimemoneyCfg_data.json

@@ -0,0 +1,34 @@
+{
+	"1": {
+		"index": 1,
+		"type": 1,
+		"time": 300,
+		"name": "许昌",
+		"reward": 1,
+		"num": 1000
+	},
+	"2": {
+		"index": 2,
+		"type": 1,
+		"time": 900,
+		"name": "建邺",
+		"reward": 1,
+		"num": 2000
+	},
+	"3": {
+		"index": 3,
+		"type": 1,
+		"time": 4500,
+		"name": "长安",
+		"reward": 1,
+		"num": 4000
+	},
+	"4": {
+		"index": 4,
+		"type": 1,
+		"time": 43200,
+		"name": "洛阳",
+		"reward": 1,
+		"num": 15000
+	}
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "bce950ff-c7fb-4104-90c6-284b50994519",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/data/general_data.json

@@ -9,7 +9,7 @@
 		"needChip": 10,
 		"attSpeed": 0.7,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wei_KX",
 		"atk_res": 1,
 		"hit_res": 1,
 		"attack": 100,
@@ -29,7 +29,7 @@
 		"needChip": 10,
 		"attSpeed": 0.9,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wei_LX",
 		"atk_res": 3,
 		"hit_res": 3,
 		"attack": 100,
@@ -49,7 +49,7 @@
 		"needChip": 10,
 		"attSpeed": 0.75,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wei_WZ",
 		"atk_res": 3,
 		"hit_res": 3,
 		"attack": 100,
@@ -69,7 +69,7 @@
 		"needChip": 10,
 		"attSpeed": 0.8,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wei_LK",
 		"atk_res": 4,
 		"hit_res": 4,
 		"attack": 100,
@@ -89,7 +89,7 @@
 		"needChip": 30,
 		"attSpeed": 0.85,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wei_LD",
 		"atk_res": 5,
 		"hit_res": 5,
 		"attack": 150,
@@ -109,7 +109,7 @@
 		"needChip": 30,
 		"attSpeed": 0.75,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wei_XY",
 		"atk_res": 4,
 		"hit_res": 4,
 		"attack": 150,
@@ -129,7 +129,7 @@
 		"needChip": 30,
 		"attSpeed": 0.65,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wei_XY_01",
 		"atk_res": 5,
 		"hit_res": 5,
 		"attack": 150,
@@ -149,7 +149,7 @@
 		"needChip": 30,
 		"attSpeed": 0.8,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wei_XHD",
 		"atk_res": 1,
 		"hit_res": 1,
 		"attack": 150,
@@ -169,7 +169,7 @@
 		"needChip": 80,
 		"attSpeed": 0.7,
 		"skillID": 100021,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wei_GJ",
 		"atk_res": 3,
 		"hit_res": 3,
 		"attack": 180,
@@ -329,7 +329,7 @@
 		"needChip": 10,
 		"attSpeed": 0.75,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_shu_GP",
 		"atk_res": 3,
 		"hit_res": 3,
 		"attack": 100,
@@ -349,7 +349,7 @@
 		"needChip": 10,
 		"attSpeed": 0.65,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_shu_ZB",
 		"atk_res": 4,
 		"hit_res": 4,
 		"attack": 100,
@@ -369,7 +369,7 @@
 		"needChip": 30,
 		"attSpeed": 0.65,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_shu_MD",
 		"atk_res": 5,
 		"hit_res": 5,
 		"attack": 150,
@@ -389,7 +389,7 @@
 		"needChip": 30,
 		"attSpeed": 0.9,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_shu_ZC",
 		"atk_res": 4,
 		"hit_res": 4,
 		"attack": 150,
@@ -409,7 +409,7 @@
 		"needChip": 30,
 		"attSpeed": 0.75,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_shu_WY",
 		"atk_res": 5,
 		"hit_res": 5,
 		"attack": 150,
@@ -429,7 +429,7 @@
 		"needChip": 30,
 		"attSpeed": 0.7,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_shu_LH",
 		"atk_res": 1,
 		"hit_res": 1,
 		"attack": 150,
@@ -449,7 +449,7 @@
 		"needChip": 80,
 		"attSpeed": 0.85,
 		"skillID": 100021,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_shu_PT",
 		"atk_res": 3,
 		"hit_res": 3,
 		"attack": 180,
@@ -609,7 +609,7 @@
 		"needChip": 10,
 		"attSpeed": 0.8,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wu_HD",
 		"atk_res": 3,
 		"hit_res": 3,
 		"attack": 100,
@@ -629,7 +629,7 @@
 		"needChip": 10,
 		"attSpeed": 0.8,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wu_ZM",
 		"atk_res": 4,
 		"hit_res": 4,
 		"attack": 100,
@@ -649,7 +649,7 @@
 		"needChip": 10,
 		"attSpeed": 0.85,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wu_JQ",
 		"atk_res": 5,
 		"hit_res": 5,
 		"attack": 100,
@@ -669,7 +669,7 @@
 		"needChip": 30,
 		"attSpeed": 0.8,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wu_CP",
 		"atk_res": 4,
 		"hit_res": 4,
 		"attack": 150,
@@ -689,7 +689,7 @@
 		"needChip": 30,
 		"attSpeed": 0.9,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wu_LC",
 		"atk_res": 5,
 		"hit_res": 5,
 		"attack": 150,
@@ -709,7 +709,7 @@
 		"needChip": 30,
 		"attSpeed": 0.9,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wu_DF",
 		"atk_res": 1,
 		"hit_res": 1,
 		"attack": 150,
@@ -729,7 +729,7 @@
 		"needChip": 30,
 		"attSpeed": 0.9,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wu_ZZ",
 		"atk_res": 3,
 		"hit_res": 3,
 		"attack": 150,
@@ -769,7 +769,7 @@
 		"needChip": 80,
 		"attSpeed": 0.85,
 		"skillID": 100021,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wu_TSC",
 		"atk_res": 4,
 		"hit_res": 4,
 		"attack": 180,
@@ -789,7 +789,7 @@
 		"needChip": 80,
 		"attSpeed": 0.85,
 		"skillID": 100021,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_wu_SC",
 		"atk_res": 5,
 		"hit_res": 5,
 		"attack": 180,
@@ -889,7 +889,7 @@
 		"needChip": 10,
 		"attSpeed": 0.75,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_qun_HS",
 		"atk_res": 3,
 		"hit_res": 3,
 		"attack": 100,
@@ -909,7 +909,7 @@
 		"needChip": 10,
 		"attSpeed": 0.65,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_qun_LL",
 		"atk_res": 4,
 		"hit_res": 4,
 		"attack": 100,
@@ -929,7 +929,7 @@
 		"needChip": 10,
 		"attSpeed": 0.7,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_qun_CYQ",
 		"atk_res": 5,
 		"hit_res": 5,
 		"attack": 100,
@@ -949,7 +949,7 @@
 		"needChip": 10,
 		"attSpeed": 0.65,
 		"skillID": 100001,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_qun_CB",
 		"atk_res": 4,
 		"hit_res": 4,
 		"attack": 100,
@@ -969,7 +969,7 @@
 		"needChip": 30,
 		"attSpeed": 0.75,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_qun_ZB",
 		"atk_res": 5,
 		"hit_res": 5,
 		"attack": 150,
@@ -989,7 +989,7 @@
 		"needChip": 30,
 		"attSpeed": 0.85,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_qun_ZL",
 		"atk_res": 1,
 		"hit_res": 1,
 		"attack": 150,
@@ -1009,7 +1009,7 @@
 		"needChip": 30,
 		"attSpeed": 0.75,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_qun_GL",
 		"atk_res": 3,
 		"hit_res": 3,
 		"attack": 150,
@@ -1029,7 +1029,7 @@
 		"needChip": 30,
 		"attSpeed": 0.65,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_qun_CG",
 		"atk_res": 3,
 		"hit_res": 3,
 		"attack": 150,
@@ -1049,7 +1049,7 @@
 		"needChip": 30,
 		"attSpeed": 0.65,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_qun_LJ",
 		"atk_res": 4,
 		"hit_res": 4,
 		"attack": 150,
@@ -1069,7 +1069,7 @@
 		"needChip": 30,
 		"attSpeed": 0.8,
 		"skillID": 100011,
-		"hero_res": "hero_shu_GY",
+		"hero_res": "hero_qun_JL",
 		"atk_res": 5,
 		"hit_res": 5,
 		"attack": 150,

tower_sanguo/assets/resources/data/help_data.json

@@ -1 +1 @@
-{"1":{"id":1,"title":"帮助","des":"1、统帅位放置武将才能激活和使用统帅技能。\n\n2、武将升星，可以获得技能点，学习更高等级的统帅技能。\n\n3、统帅位武将的统帅值越高，释放技能带来的增益效果也越强。\n\n4、统帅技能可以在主界面的技能快捷栏查看、切换和使用。"},"2":{"id":2,"title":"帮助","des":"1、兵营升级需要威望石。\n\n2、通关BOSS关卡可以获得威望石。\n\n3、兵营升级后，可以大大加快武将的升级速度。\n\n4、武将的训练等级随兵营等级提升而提高。"},"3":{"id":3},"4":{"id":4,"title":"帮助","des":"1、完成任务获得活跃值\n\n2、活跃值积攒到一定数量，可以领取活跃奖励，获得粮草和红包币\n\n3、完成尽可能多的任务，有机会获得更多红包币\n\n4、所有奖励和任务每日重置"},"5":{"id":5},"6":{"id":6,"title":"帮助","des":"1.每次转转盘都可100%获得\n奖励\n\n2.每天有10次转转盘机会\n\n3.每日12点、18点、0点、将\n自动重置转盘次数"}}
+{"1":{"id":1,"title":"帮助","des":"1.统帅位放置武将才能激活和使用统帅技能。\n\n2.武将升星，可以学习新的统帅技能和升级统帅技能。\n\n3.统帅位武将的统帅值越高，释放技能带来的增益效果也越强。"},"2":{"id":2,"title":"帮助","des":"1.兵营升级需要威望石。\n\n2.通关BOSS关卡可以获得威望石。\n\n3.兵营升级后，可以大大加快武将的升级速度。\n\n4.武将的训练等级随兵营等级提升而提高。"},"3":{"id":3,"title":"帮助","des":"1.上阵符合条件的武将，可以激活羁绊属性。\n\n2.在点将台可以抽取新武将。\n\n3.获得新武将后在武将图鉴领取红包币奖励。"},"4":{"id":4,"title":"帮助","des":"1.完成任务获得活跃值。\n\n2.活跃值积达到指定进度，可以领取对应活跃奖励。n\n3.日常任务每日0点重置。\n\n4.未领取的活跃奖励，次日可观看视频补领。"},"5":{"id":5,"title":"帮助","des":"1.每日最多可进行50次招募，5次十连招募。\n\n2.每30次招募，必得一个3星武将。\n\n3.心愿武将需要确认更改方可生效。\n\n4.添加心愿武将，获得3星武将的总概率不变。"},"6":{"id":6,"title":"帮助","des":"1.每次转转盘都可100%获得奖励。\n\n2.每天有10次转转盘机会。\n\n3.每日12点、18点、24点将自动重置转盘次数。"},"7":{"id":7},"8":{"id":8},"9":{"id":9}}

tower_sanguo/assets/resources/data/heroReward_data.json

@@ -1 +1,26 @@
-{}
+{
+	"15": {
+		"ecpmMin": 15,
+		"ecpmMax": 60,
+		"rewardType": 1,
+		"rewardNum": 5000,
+		"videoRewardType": 3,
+		"videoRewardNum": 300
+	},
+	"60": {
+		"ecpmMin": 60,
+		"ecpmMax": 200,
+		"rewardType": 3,
+		"rewardNum": 300,
+		"videoRewardType": 3,
+		"videoRewardNum": 300
+	},
+	"200": {
+		"ecpmMin": 200,
+		"ecpmMax": 9999,
+		"rewardType": 3,
+		"rewardNum": 300,
+		"videoRewardType": 3,
+		"videoRewardNum": 600
+	}
+}

tower_sanguo/assets/resources/data/openfun_data.json

@@ -2,10 +2,10 @@
 	"1": {
 		"id": 1,
 		"name": "统帅台",
-		"openmission": 1,
+		"openmission": 5,
 		"btn_src": "btn_marshalstage",
 		"uiID": 1,
-		"ui_src": "MarshalStageUI"
+		"ui_src": "marshalStageUI"
 	},
 	"2": {
 		"id": 2,
@@ -18,7 +18,7 @@
 	"3": {
 		"id": 3,
 		"name": "武将",
-		"openmission": 1,
+		"openmission": 2,
 		"btn_src": "btn_general",
 		"uiID": 3,
 		"ui_src": "GeneralUI"
@@ -26,7 +26,7 @@
 	"4": {
 		"id": 4,
 		"name": "日常任务",
-		"openmission": 1,
+		"openmission": 3,
 		"btn_src": "btn_task",
 		"uiID": 4,
 		"ui_src": "TaskUI"
@@ -34,9 +34,29 @@
 	"5": {
 		"id": 5,
 		"name": "点将台",
-		"openmission": 1,
+		"openmission": 4,
 		"btn_src": "btn_getgeneral",
 		"uiID": 5,
 		"ui_src": "GetGeneralUI"
+	},
+	"6": {
+		"id": 6,
+		"name": "转盘",
+		"openmission": 1
+	},
+	"7": {
+		"id": 7,
+		"name": "投资",
+		"openmission": 1
+	},
+	"8": {
+		"id": 8,
+		"name": "存钱罐",
+		"openmission": 1
+	},
+	"9": {
+		"id": 9,
+		"name": "通关红包",
+		"openmission": 1
 	}
 }

tower_sanguo/assets/resources/data/stageReward_data.json

@@ -1 +1,146 @@
-{}
+{
+	"1": {
+		"id": 1,
+		"videoMin": 1,
+		"videoMax": 3,
+		"ecpmMin": 0,
+		"ecpmMax": 15,
+		"paraA": 0.4,
+		"paraB": 300
+	},
+	"2": {
+		"id": 2,
+		"videoMin": 1,
+		"videoMax": 3,
+		"ecpmMin": 15,
+		"ecpmMax": 60,
+		"paraA": 0.4,
+		"paraB": 150
+	},
+	"3": {
+		"id": 3,
+		"videoMin": 1,
+		"videoMax": 3,
+		"ecpmMin": 60,
+		"ecpmMax": 200,
+		"paraA": 0.4,
+		"paraB": 300
+	},
+	"4": {
+		"id": 4,
+		"videoMin": 1,
+		"videoMax": 3,
+		"ecpmMin": 200,
+		"ecpmMax": 9999,
+		"paraA": 0.4,
+		"paraB": 500
+	},
+	"5": {
+		"id": 5,
+		"videoMin": 4,
+		"videoMax": 10,
+		"ecpmMin": 0,
+		"ecpmMax": 15,
+		"paraA": 0.25,
+		"paraB": 160
+	},
+	"6": {
+		"id": 6,
+		"videoMin": 4,
+		"videoMax": 10,
+		"ecpmMin": 15,
+		"ecpmMax": 60,
+		"paraA": 0.25,
+		"paraB": 80
+	},
+	"7": {
+		"id": 7,
+		"videoMin": 4,
+		"videoMax": 10,
+		"ecpmMin": 60,
+		"ecpmMax": 200,
+		"paraA": 0.25,
+		"paraB": 160
+	},
+	"8": {
+		"id": 8,
+		"videoMin": 4,
+		"videoMax": 10,
+		"ecpmMin": 200,
+		"ecpmMax": 9999,
+		"paraA": 0.25,
+		"paraB": 300
+	},
+	"9": {
+		"id": 9,
+		"videoMin": 11,
+		"videoMax": 20,
+		"ecpmMin": 0,
+		"ecpmMax": 15,
+		"paraA": 0.15,
+		"paraB": 100
+	},
+	"10": {
+		"id": 10,
+		"videoMin": 11,
+		"videoMax": 20,
+		"ecpmMin": 15,
+		"ecpmMax": 60,
+		"paraA": 0.15,
+		"paraB": 50
+	},
+	"11": {
+		"id": 11,
+		"videoMin": 11,
+		"videoMax": 20,
+		"ecpmMin": 60,
+		"ecpmMax": 200,
+		"paraA": 0.15,
+		"paraB": 100
+	},
+	"12": {
+		"id": 12,
+		"videoMin": 11,
+		"videoMax": 20,
+		"ecpmMin": 200,
+		"ecpmMax": 9999,
+		"paraA": 0.15,
+		"paraB": 150
+	},
+	"13": {
+		"id": 13,
+		"videoMin": 21,
+		"videoMax": 99999,
+		"ecpmMin": 0,
+		"ecpmMax": 15,
+		"paraA": 0.1,
+		"paraB": 0
+	},
+	"14": {
+		"id": 14,
+		"videoMin": 21,
+		"videoMax": 99999,
+		"ecpmMin": 15,
+		"ecpmMax": 60,
+		"paraA": 0.1,
+		"paraB": 0
+	},
+	"15": {
+		"id": 15,
+		"videoMin": 21,
+		"videoMax": 99999,
+		"ecpmMin": 60,
+		"ecpmMax": 200,
+		"paraA": 0.1,
+		"paraB": 0
+	},
+	"16": {
+		"id": 16,
+		"videoMin": 21,
+		"videoMax": 99999,
+		"ecpmMin": 200,
+		"ecpmMax": 9999,
+		"paraA": 0.1,
+		"paraB": 0
+	}
+}

tower_sanguo/assets/resources/data/task_data.json

@@ -6,7 +6,7 @@
 		"activevalue1": 5,
 		"count2": 20,
 		"activevalue2": 15,
-		"gotoui":1
+		"gotoui": 0
 	},
 	"2": {
 		"id": 2,
@@ -15,7 +15,7 @@
 		"activevalue1": 5,
 		"count2": 4,
 		"activevalue2": 10,
-		"gotoui":1
+		"gotoui": 7
 	},
 	"3": {
 		"id": 3,
@@ -24,7 +24,7 @@
 		"activevalue1": 5,
 		"count2": 10,
 		"activevalue2": 15,
-		"gotoui":1
+		"gotoui": 5
 	},
 	"4": {
 		"id": 4,
@@ -33,7 +33,7 @@
 		"activevalue1": 5,
 		"count2": 10,
 		"activevalue2": 15,
-		"gotoui":1
+		"gotoui": 6
 	},
 	"5": {
 		"id": 5,
@@ -42,7 +42,7 @@
 		"activevalue1": 5,
 		"count2": 3,
 		"activevalue2": 15,
-		"gotoui":1
+		"gotoui": 1
 	},
 	"6": {
 		"id": 6,
@@ -51,6 +51,6 @@
 		"activevalue1": 5,
 		"count2": 30,
 		"activevalue2": 20,
-		"gotoui":-1
+		"gotoui": -1
 	}
 }

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

@@ -237,7 +237,11 @@ export default class MainUI extends BaseUI {
         let btn: cc.Button = this[data.btn_src];
         if (btn) {
             //未开启显示灰色+XX级开启
-            btn.interactable = GameController.gameData.player.max_mission >= data.openmission;
+            let b = GameController.gameData.player.max_mission >= data.openmission;
+            btn.interactable = b;
+            if(!b){
+                console.log(data.name + " 功能未开启");
+            }
         }
     }
 
@@ -252,6 +256,10 @@ export default class MainUI extends BaseUI {
                 let food_count = GameController.gameData.player.getProp(PLAYERPROP.FOOD);
                 let consume_food = GameController.gameData.player.getProp(PLAYERPROP.FOODCONSUME);
                 this.lbl_food_bar.string = consume_food + '/' + food_count;
+                let a = Math.floor(food_count / consume_food);
+                let vo = GameController.gameData.getMissionByID(GameController.gameData.player.max_mission);
+                let b = Math.floor(vo.foodMax / consume_food);
+                this.lbl_train_times.string = a + '/' + b;
                 let bar_value = consume_food / food_count;
                 this.spr_food_bar.fillRange = bar_value;
                 this.task_red.active = TaskModel.checkMainRed();