提交一波

lua/app/common/bi_report.lua

@@ -75,6 +75,7 @@ BIReport.ITEM_GET_TYPE = {
 	MALL_TREASURE = "MallTreasure", -- 常驻钻石礼包
 	MALL_DAILY = "MallDaily", -- 每日特惠
 	MALL_DAILY_RESET = "MallDailyReset",
+	SUMMON = "Summon",
 	PLAYER_LV_UP = "PlayerLvUp",
 }
 

lua/app/config/act_gift.lua

@@ -9,7 +9,7 @@ local act_gift = {
 		["type"]=7,
 		["recharge_id"]=12,
 		["time_type"]=3,
-		["value"]=25
+		["value"]=2000
 	},
 	[20102]={
 		["type"]=2,
@@ -822,7 +822,7 @@ local act_gift = {
 	},
 	[60202]={
 		["type"]=6,
-		["recharge_id"]=5,
+		["recharge_id"]=7,
 		["time_type"]=3,
 		["limit"]=1,
 		["value"]=21

lua/app/config/localization/localization_global_const.lua

@@ -1,7 +1,5 @@
 local LocalizationGlobalConst = 
 {
-	COUNTER_ATTACK_DESC = "COUNTER_ATTACK_DESC",
-	BLOCK_DESC = "BLOCK_DESC",
 	MAIN_BTN_1 = "MAIN_BTN_1",
 	QLT_DESC_1 = "QLT_DESC_1",
 	QLT_DESC_2 = "QLT_DESC_2",
@@ -120,6 +118,19 @@ local LocalizationGlobalConst =
 	BTN_READ = "BTN_READ",
 	BATTLE_DESC_9 = "BATTLE_DESC_9",
 	BATTLE_DESC_10 = "BATTLE_DESC_10",
+	BLOCK_DESC = "BLOCK_DESC",
+	COUNTER_ATTACK_DESC = "COUNTER_ATTACK_DESC",
+	EXPIRES_IN_HOURS = "EXPIRES_IN_HOURS",
+	EXTRA_REWARDS = "EXTRA_REWARDS",
+	PLAYER_LEVEL_UP_DESC = "PLAYER_LEVEL_UP_DESC",
+	LEVEL_UP_REWARD = "LEVEL_UP_REWARD",
+	CLICK_TO_CONTINUE = "CLICK_TO_CONTINUE",
+	BOUNTY_DESC_4 = "BOUNTY_DESC_4",
+	RELOGIN = "RELOGIN",
+	GOLD_PIG_CLOSE_DESC = "GOLD_PIG_CLOSE_DESC",
+	GOLD_PIG_TITLE = "GOLD_PIG_TITLE",
+	GOLD_PIG_DESC = "GOLD_PIG_DESC",
+	SIDE_BAR_FULL = "SIDE_BAR_FULL",
 }
 
 return LocalizationGlobalConst

lua/app/config/strings/cn/chapter.lua

@@ -1,42 +1,96 @@
 local chapter = {
 	[1]={
-		["name"]="1.废弃小镇"
+		["name"]="废弃小镇（西）"
 	},
 	[2]={
-		["name"]="2.小镇幽径"
+		["name"]="废弃小镇（东）"
 	},
 	[3]={
-		["name"]="3.小镇矿山"
+		["name"]="小镇幽径"
 	},
 	[4]={
-		["name"]="4.幽深丛林"
+		["name"]="小镇矿山"
 	},
 	[5]={
-		["name"]="5.碎石溪岸（西）"
+		["name"]="幽深丛林"
 	},
 	[6]={
-		["name"]="6.碎石溪岸（东）"
+		["name"]="异雪丛林（西）"
 	},
 	[7]={
-		["name"]="7.城堡外围"
+		["name"]="异雪丛林（东）"
 	},
 	[8]={
-		["name"]="8.城堡大门"
+		["name"]="城堡外围"
 	},
 	[9]={
-		["name"]="9.城堡内部"
+		["name"]="城堡正门"
 	},
 	[10]={
-		["name"]="10.城堡深处"
+		["name"]="城堡内部"
 	},
 	[11]={
-		["name"]="11.城堡内部"
+		["name"]="城堡深处"
 	},
 	[12]={
-		["name"]="12.城堡深处"
+		["name"]="城堡密道"
+	},
+	[13]={
+		["name"]="密道出口"
+	},
+	[14]={
+		["name"]="城堡湖畔"
+	},
+	[15]={
+		["name"]="湖畔东岸"
+	},
+	[16]={
+		["name"]="腐败沼泽"
+	},
+	[17]={
+		["name"]="沼泽深处"
+	},
+	[18]={
+		["name"]="雨林入口"
+	},
+	[19]={
+		["name"]="热带雨林"
+	},
+	[20]={
+		["name"]="巨大神庙"
+	},
+	[21]={
+		["name"]="神庙庙门"
+	},
+	[22]={
+		["name"]="神秘祭坛"
+	},
+	[23]={
+		["name"]="恶魔祭坛"
+	},
+	[24]={
+		["name"]="奇怪洞穴"
+	},
+	[25]={
+		["name"]="洞穴深处"
+	},
+	[26]={
+		["name"]="魔都西街"
+	},
+	[27]={
+		["name"]="魔都东街"
+	},
+	[28]={
+		["name"]="魔都中心"
+	},
+	[29]={
+		["name"]="魔都通路"
+	},
+	[30]={
+		["name"]="魔都出口"
 	}
 }
 local config = {
-data=chapter,count=12
+data=chapter,count=30
 }
 return config

lua/app/config/strings/cn/global.lua

@@ -118,9 +118,19 @@ local localization_global =
     ["BTN_READ"] = "读取",
     ["BATTLE_DESC_9"] = "{0}攻击力：<color=#ffffff>{1}</color>",
     ["BATTLE_DESC_10"] = "已激活效果",
-
     ["BLOCK_DESC"] = "格挡",
     ["COUNTER_ATTACK_DESC"] = "反击",
+    ["EXPIRES_IN_HOURS"] = "{0}小时到期",
+    ["EXTRA_REWARDS"] = "额外奖励",
+    ["PLAYER_LEVEL_UP_DESC"] = "恭喜等级达到{0}级",
+    ["LEVEL_UP_REWARD"] = "升级奖励",
+    ["CLICK_TO_CONTINUE"] = "点击继续",
+    ["BOUNTY_DESC_4"] = "购买此通行证会超过通行证等级上限，会造成损失，是否购买？",
+    ["RELOGIN"] = "重新登录",
+    ["GOLD_PIG_CLOSE_DESC"] = "金猪已到期，请珍惜下次机会",
+    ["GOLD_PIG_TITLE"] = "超值金猪",
+    ["GOLD_PIG_DESC"] = "挑战关卡并收集钻石，你就可以获得一笔划算的交易。",
+    ["SIDE_BAR_FULL"] = "MAX",
 }
 
 return localization_global

lua/app/config/strings/cn/item.lua

@@ -75,10 +75,6 @@ local item = {
 		["name"]="随机碎片",
 		["desc"]="挂机可获得随机碎片，领取后数量和品质将根据关卡提升。"
 	},
-	[12001]={
-		["name"]="红SR-克劳德",
-		["desc"]="凑齐可解锁或升级。"
-	},
 	[13001]={
 		["name"]="红SR-克劳德",
 		["desc"]="凑齐可解锁或升级。"

lua/app/config/strings/de/chapter.lua

@@ -34,9 +34,63 @@ local chapter = {
 	},
 	[12]={
 
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=chapter,count=12
+data=chapter,count=30
 }
 return config

lua/app/config/strings/en/chapter.lua

@@ -34,9 +34,63 @@ local chapter = {
 	},
 	[12]={
 		["name"]="12. Inner Castle"
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=chapter,count=12
+data=chapter,count=30
 }
 return config

lua/app/config/strings/fr/chapter.lua

@@ -34,9 +34,63 @@ local chapter = {
 	},
 	[12]={
 
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=chapter,count=12
+data=chapter,count=30
 }
 return config

lua/app/config/strings/id/chapter.lua

@@ -34,9 +34,63 @@ local chapter = {
 	},
 	[12]={
 
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=chapter,count=12
+data=chapter,count=30
 }
 return config

lua/app/config/strings/ja/chapter.lua

@@ -34,9 +34,63 @@ local chapter = {
 	},
 	[12]={
 
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=chapter,count=12
+data=chapter,count=30
 }
 return config

lua/app/config/strings/ko/chapter.lua

@@ -34,9 +34,63 @@ local chapter = {
 	},
 	[12]={
 
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=chapter,count=12
+data=chapter,count=30
 }
 return config

lua/app/config/strings/pt/chapter.lua

@@ -34,9 +34,63 @@ local chapter = {
 	},
 	[12]={
 
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=chapter,count=12
+data=chapter,count=30
 }
 return config

lua/app/config/strings/ru/chapter.lua

@@ -34,9 +34,63 @@ local chapter = {
 	},
 	[12]={
 
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=chapter,count=12
+data=chapter,count=30
 }
 return config

lua/app/config/strings/th/chapter.lua

@@ -34,9 +34,63 @@ local chapter = {
 	},
 	[12]={
 
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=chapter,count=12
+data=chapter,count=30
 }
 return config

lua/app/config/strings/vi/chapter.lua

@@ -34,9 +34,63 @@ local chapter = {
 	},
 	[12]={
 
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=chapter,count=12
+data=chapter,count=30
 }
 return config

lua/app/config/strings/zh/chapter.lua

@@ -34,9 +34,63 @@ local chapter = {
 	},
 	[12]={
 		["name"]="12.城堡深處"
+	},
+	[13]={
+
+	},
+	[14]={
+
+	},
+	[15]={
+
+	},
+	[16]={
+
+	},
+	[17]={
+
+	},
+	[18]={
+
+	},
+	[19]={
+
+	},
+	[20]={
+
+	},
+	[21]={
+
+	},
+	[22]={
+
+	},
+	[23]={
+
+	},
+	[24]={
+
+	},
+	[25]={
+
+	},
+	[26]={
+
+	},
+	[27]={
+
+	},
+	[28]={
+
+	},
+	[29]={
+
+	},
+	[30]={
+
 	}
 }
 local config = {
-data=chapter,count=12
+data=chapter,count=30
 }
 return config

lua/app/config/task.lua

@@ -61,7 +61,7 @@ local task = {
 	},
 	[5]={
 		["type"]=2,
-		["number"]=650,
+		["number"]=1000,
 		["reward"]={
 			{
 				["type"]=1,
@@ -76,7 +76,7 @@ local task = {
 	},
 	[6]={
 		["type"]=2,
-		["number"]=800,
+		["number"]=1500,
 		["reward"]={
 			{
 				["type"]=1,
@@ -91,22 +91,22 @@ local task = {
 	},
 	[7]={
 		["type"]=2,
-		["number"]=1000,
+		["number"]=2000,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="2"
 	},
 	[8]={
 		["type"]=3,
-		["number"]=20,
+		["number"]=15,
 		["reward"]={
 			{
 				["type"]=1,
@@ -122,7 +122,7 @@ local task = {
 	},
 	[9]={
 		["type"]=3,
-		["number"]=25,
+		["number"]=20,
 		["reward"]={
 			{
 				["type"]=1,
@@ -154,15 +154,15 @@ local task = {
 	},
 	[11]={
 		["type"]=3,
-		["number"]=40,
+		["number"]=50,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["lock"]=3,
@@ -185,7 +185,7 @@ local task = {
 	},
 	[13]={
 		["type"]=4,
-		["number"]=650,
+		["number"]=1000,
 		["reward"]={
 			{
 				["type"]=1,
@@ -200,7 +200,7 @@ local task = {
 	},
 	[14]={
 		["type"]=4,
-		["number"]=800,
+		["number"]=1500,
 		["reward"]={
 			{
 				["type"]=1,
@@ -215,22 +215,22 @@ local task = {
 	},
 	[15]={
 		["type"]=4,
-		["number"]=1000,
+		["number"]=2000,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="4"
 	},
 	[16]={
 		["type"]=5,
-		["number"]=50,
+		["number"]=20,
 		["reward"]={
 			{
 				["type"]=1,
@@ -246,7 +246,7 @@ local task = {
 	},
 	[17]={
 		["type"]=5,
-		["number"]=65,
+		["number"]=30,
 		["reward"]={
 			{
 				["type"]=1,
@@ -262,7 +262,7 @@ local task = {
 	},
 	[18]={
 		["type"]=5,
-		["number"]=80,
+		["number"]=40,
 		["reward"]={
 			{
 				["type"]=1,
@@ -278,15 +278,15 @@ local task = {
 	},
 	[19]={
 		["type"]=5,
-		["number"]=100,
+		["number"]=60,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["lock"]=3,
@@ -324,7 +324,7 @@ local task = {
 	},
 	[22]={
 		["type"]=6,
-		["number"]=3,
+		["number"]=2,
 		["reward"]={
 			{
 				["type"]=1,
@@ -339,15 +339,15 @@ local task = {
 	},
 	[23]={
 		["type"]=6,
-		["number"]=4,
+		["number"]=3,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="6"
@@ -409,8 +409,8 @@ local task = {
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["lock"]=10,
@@ -465,15 +465,15 @@ local task = {
 	},
 	[31]={
 		["type"]=8,
-		["number"]=5,
+		["number"]=8,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="8"
@@ -495,7 +495,7 @@ local task = {
 	},
 	[33]={
 		["type"]=9,
-		["number"]=2,
+		["number"]=1,
 		["reward"]={
 			{
 				["type"]=1,
@@ -510,7 +510,7 @@ local task = {
 	},
 	[34]={
 		["type"]=9,
-		["number"]=3,
+		["number"]=2,
 		["reward"]={
 			{
 				["type"]=1,
@@ -525,15 +525,15 @@ local task = {
 	},
 	[35]={
 		["type"]=9,
-		["number"]=4,
+		["number"]=3,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="9"
@@ -587,22 +587,22 @@ local task = {
 	},
 	[39]={
 		["type"]=10,
-		["number"]=2,
+		["number"]=3,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="10"
 	},
 	[40]={
 		["type"]=11,
-		["number"]=5,
+		["number"]=10,
 		["reward"]={
 			{
 				["type"]=1,
@@ -618,7 +618,7 @@ local task = {
 	},
 	[41]={
 		["type"]=11,
-		["number"]=10,
+		["number"]=15,
 		["reward"]={
 			{
 				["type"]=1,
@@ -634,7 +634,7 @@ local task = {
 	},
 	[42]={
 		["type"]=11,
-		["number"]=15,
+		["number"]=25,
 		["reward"]={
 			{
 				["type"]=1,
@@ -650,15 +650,15 @@ local task = {
 	},
 	[43]={
 		["type"]=11,
-		["number"]=20,
+		["number"]=40,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["lock"]=5,
@@ -718,8 +718,8 @@ local task = {
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="12"
@@ -778,15 +778,15 @@ local task = {
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="13"
 	},
 	[52]={
 		["type"]=14,
-		["number"]=20,
+		["number"]=200,
 		["reward"]={
 			{
 				["type"]=1,
@@ -801,7 +801,7 @@ local task = {
 	},
 	[53]={
 		["type"]=14,
-		["number"]=25,
+		["number"]=300,
 		["reward"]={
 			{
 				["type"]=1,
@@ -816,7 +816,7 @@ local task = {
 	},
 	[54]={
 		["type"]=14,
-		["number"]=30,
+		["number"]=400,
 		["reward"]={
 			{
 				["type"]=1,
@@ -831,15 +831,15 @@ local task = {
 	},
 	[55]={
 		["type"]=14,
-		["number"]=40,
+		["number"]=600,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="14"
@@ -898,8 +898,8 @@ local task = {
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="15"
@@ -936,7 +936,7 @@ local task = {
 	},
 	[62]={
 		["type"]=16,
-		["number"]=3,
+		["number"]=4,
 		["reward"]={
 			{
 				["type"]=1,
@@ -951,22 +951,22 @@ local task = {
 	},
 	[63]={
 		["type"]=16,
-		["number"]=4,
+		["number"]=6,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="16"
 	},
 	[64]={
 		["type"]=17,
-		["number"]=5,
+		["number"]=1,
 		["reward"]={
 			{
 				["type"]=1,
@@ -981,7 +981,7 @@ local task = {
 	},
 	[65]={
 		["type"]=17,
-		["number"]=6,
+		["number"]=2,
 		["reward"]={
 			{
 				["type"]=1,
@@ -996,7 +996,7 @@ local task = {
 	},
 	[66]={
 		["type"]=17,
-		["number"]=8,
+		["number"]=3,
 		["reward"]={
 			{
 				["type"]=1,
@@ -1011,15 +1011,15 @@ local task = {
 	},
 	[67]={
 		["type"]=17,
-		["number"]=10,
+		["number"]=5,
 		["reward"]={
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="17"
@@ -1078,8 +1078,8 @@ local task = {
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
+				["num"]=150,
+ 				["num_for_nothing"]="Vw1c"
 			}
 		},
 		["icon"]="18"
@@ -1131,22 +1131,7 @@ local task = {
 	},
 	[75]={
 		["type"]=19,
-		["number"]=30,
-		["reward"]={
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=7,
- 				["id_for_nothing"]="UQ==",
-				["num"]=125,
- 				["num_for_nothing"]="VwpZ"
-			}
-		},
-		["icon"]="19"
-	},
-	[76]={
-		["type"]=2,
-		["number"]=1200,
+		["number"]=40,
 		["reward"]={
 			{
 				["type"]=1,
@@ -1157,6 +1142,21 @@ local task = {
  				["num_for_nothing"]="Vw1c"
 			}
 		},
+		["icon"]="19"
+	},
+	[76]={
+		["type"]=2,
+		["number"]=2500,
+		["reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=7,
+ 				["id_for_nothing"]="UQ==",
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
+			}
+		},
 		["icon"]="2"
 	},
 	[77]={
@@ -1176,7 +1176,7 @@ local task = {
 	},
 	[78]={
 		["type"]=5,
-		["number"]=120,
+		["number"]=60,
 		["reward"]={
 			{
 				["type"]=1,
@@ -1238,7 +1238,7 @@ local task = {
 	},
 	[82]={
 		["type"]=9,
-		["number"]=5,
+		["number"]=3,
 		["reward"]={
 			{
 				["type"]=1,
@@ -1315,7 +1315,7 @@ local task = {
 	},
 	[87]={
 		["type"]=14,
-		["number"]=50,
+		["number"]=650,
 		["reward"]={
 			{
 				["type"]=1,
@@ -1337,15 +1337,15 @@ local task = {
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=150,
- 				["num_for_nothing"]="Vw1c"
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
 			}
 		},
 		["icon"]="15"
 	},
 	[89]={
 		["type"]=16,
-		["number"]=5,
+		["number"]=8,
 		["reward"]={
 			{
 				["type"]=1,
@@ -1382,15 +1382,15 @@ local task = {
  				["type_for_nothing"]="Vw==",
 				["id"]=7,
  				["id_for_nothing"]="UQ==",
-				["num"]=150,
- 				["num_for_nothing"]="Vw1c"
+				["num"]=100,
+ 				["num_for_nothing"]="Vwhc"
 			}
 		},
 		["icon"]="18"
 	},
 	[92]={
 		["type"]=19,
-		["number"]=35,
+		["number"]=50,
 		["reward"]={
 			{
 				["type"]=1,

lua/app/config/task_daily.lua

@@ -559,21 +559,13 @@ local task_daily = {
 		["type"]=2,
 		["reset"]=1,
 		["task"]={
-			{
-				26,
-				100
-			},
-			{
-				27,
-				100
-			},
 			{
 				76,
-				50
+				100
 			},
 			{
-				77,
-				50
+				46,
+				100
 			}
 		}
 	},
@@ -581,10 +573,6 @@ local task_daily = {
 		["type"]=2,
 		["reset"]=1,
 		["task"]={
-			{
-				38,
-				100
-			},
 			{
 				39,
 				100
@@ -603,13 +591,9 @@ local task_daily = {
 				50,
 				100
 			},
-			{
-				51,
-				100
-			},
 			{
 				91,
-				50
+				100
 			}
 		}
 	},
@@ -617,16 +601,12 @@ local task_daily = {
 		["type"]=2,
 		["reset"]=1,
 		["task"]={
-			{
-				66,
-				100
-			},
 			{
 				67,
 				100
 			},
 			{
-				82,
+				77,
 				50
 			}
 		}
@@ -635,10 +615,6 @@ local task_daily = {
 		["type"]=2,
 		["reset"]=1,
 		["task"]={
-			{
-				30,
-				100
-			},
 			{
 				31,
 				100
@@ -651,14 +627,10 @@ local task_daily = {
 		["task"]={
 			{
 				87,
-				50
-			},
-			{
-				42,
 				100
 			},
 			{
-				43,
+				42,
 				100
 			}
 		}
@@ -669,19 +641,19 @@ local task_daily = {
 		["task"]={
 			{
 				88,
-				50
+				100
 			},
 			{
 				89,
 				50
 			},
 			{
-				46,
+				34,
 				100
 			},
 			{
-				47,
-				100
+				82,
+				50
 			}
 		},
 		["bounty"]=true
@@ -697,10 +669,6 @@ local task_daily = {
 			{
 				22,
 				100
-			},
-			{
-				23,
-				100
 			}
 		},
 		["bounty"]=true

lua/app/module/shop/shop_manager.lua

@@ -8,6 +8,15 @@ function ShopManager:showBoxLevelUI()
     UIManager:showUI("app/ui/shop/box_level_ui")
 end
 
+function ShopManager:showBoxOpenUI(params)
+    UIManager:showUI("app/ui/shop/box_open_ui", params)
+end
+
+-- 商店宝箱奖励展示界面
+function ShopManager:showBoxRewardUI(params)
+    UIManager:showUI("app/ui/shop/box_reward_ui", params)
+end
+
 -- 购买每日特惠商品
 function ShopManager:buyMallDailyGift(id, isAd)
     if not DataManager.ShopData:getMallDailyIsOpen() then

lua/app/module/summon/summon_manager.lua

@@ -1,5 +1,37 @@
 local SummonManager = class("SummonManager", BaseModule)
 
+-- 商城宝箱
+function SummonManager:summon(summonType, costType)
+    if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.STORE_BOX_OPEN, true) then
+        return
+    end
 
+    if summonType == GConst.SummonConst.SUMMON_TYPE.LV_3 and not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.STORE_BOX_3_OPEN, true) then
+        return
+    end
+
+    local costItem, cost  = DataManager.SummonData:getSummonCost(summonType)
+    if costType == 1 then
+        if not GFunc.checkCost(costItem.id, costItem.num, false) then
+            return
+        end
+    else
+        if not GFunc.checkCost(cost.id, cost.num, false) then
+            return
+        end
+    end
+
+    local params = {type = summonType, consume_type = costType}
+    local responseData = {}
+    self:sendMessage(ProtoMsgType.FromMsgEnum.SummonReq, params, responseData, self.summonFinish, BIReport.ITEM_GET_TYPE.SUMMON)
+end
+
+function SummonManager:summonFinish(result)
+    if result.err_code == GConst.ERROR_STR.SUCCESS then
+        DataManager.SummonData:cacheSummonRewards(result.rewards) -- 缓存一下 防止有其他地方需要使用
+        DataManager.SummonData:init(result.summon_info)
+        ModuleManager.ShopManager:showBoxOpenUI({type = result.reqData.type})
+    end
+end
 
 return SummonManager

lua/app/ui/main_city/main_city_ui.lua

@@ -176,6 +176,13 @@ function MainCityUI:_bind()
             end
         end
     end)
+    self:bind(DataManager.SummonData, "isDirty", function()
+        if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.SHOP and self.subComps[self.selectedIndex] then
+            if self.subComps[self.selectedIndex] then
+                self.subComps[self.selectedIndex]:refresh()
+            end
+        end
+    end)
 end
 
 function MainCityUI:initBottomUI()

lua/app/ui/shop/box_hero_ui.lua

@@ -69,11 +69,14 @@ function BoxHeroUI:refresh()
 			self.itemCellList[i]:refreshByCfg(rewards[i].id, 0)
 			self.itemCellList[i]:setNum("")
 			self.itemTextList[i]:setText(rewards[i].num)
+			self.itemCellList[i]:addClickListener(function()
+				ModuleManager.TipsManager:showItemTips(rewards[i].id, self.itemCellList[i]:getBaseObject())
+			end)
 
 			if ConfigManager:getConfig("item")[rewards[i].id].type == 3 then
 				self.itemHelpList[i]:setVisible(true)
 				self.itemHelpList[i]:addClickListener(function()
-					-- TODOJ
+					ModuleManager.TipsManager:showHeroFragmentTips(rewards[i].id)
 				end)
 			else
 				self.itemHelpList[i]:setVisible(false)
@@ -96,6 +99,14 @@ function BoxHeroUI:refresh()
 end
 
 function BoxHeroUI:onClickSummon()
+	local costItem, cost = DataManager.SummonData:getSummonCost(self.summonType)
+	if GFunc.checkCost(costItem.id, costItem.num, false) then
+		ModuleManager.SummonManager:summon(self.summonType, 1)
+		self:closeUI()
+	elseif GFunc.checkCost(cost.id, cost.num, false) then
+		ModuleManager.SummonManager:summon(self.summonType, 2)
+		self:closeUI()
+	end
 end
 
 return BoxHeroUI

lua/app/ui/shop/box_open_ui.lua

@@ -0,0 +1,39 @@
+local BoxOpenUI = class("BoxOpenUI", BaseUI)
+
+local ICON_NAME = {
+	[GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1", -- TODOJ
+	[GConst.SummonConst.SUMMON_TYPE.LV_2] = "shop_chest_2",
+	[GConst.SummonConst.SUMMON_TYPE.LV_3] = "shop_chest_3"
+}
+
+function BoxOpenUI:ctor(params)
+    self.params = params or {} -- 将信息传递给下一个界面
+    self.summonType = self.params.type or GConst.SummonConst.SUMMON_TYPE.LV_1
+end
+
+function BoxOpenUI:isFullScreen()
+    return true
+end
+
+function BoxOpenUI:getPrefabPath()
+    return "assets/prefabs/ui/shop/box_open_ui.prefab"
+end
+
+function BoxOpenUI:onLoadRootComplete()
+    self.uiMap = self.root:genAllChildren()
+
+    self.bg = self.uiMap["box_open_ui.bg"]
+	self.boxImg = self.uiMap["box_open_ui.box"]
+    self.openBtn = self.uiMap["box_open_ui.open_btn"]
+    self.btnText = self.uiMap["box_open_ui.open_btn.text"]
+
+    self.boxImg:setSprite(GConst.ATLAS_PATH.SHOP, ICON_NAME[self.summonType])
+    self.btnText:setText("立即打开") -- TODOJ
+
+    self.openBtn:addClickListener(function()
+        ModuleManager.ShopManager:showBoxRewardUI(self.params)
+        self:closeUI()
+    end)
+end
+
+return BoxOpenUI

lua/app/ui/shop/box_open_ui.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: ec611b1975a74654aa3cda5ebf0ea461
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/ui/shop/box_reward_ui.lua

@@ -0,0 +1,68 @@
+local BoxRewardUI = class("BoxRewardUI", BaseUI)
+local BOX_HERO_CELL = "app/ui/shop/cell/box_hero_cell"
+
+function BoxRewardUI:ctor(params)
+    self.params = params or {}
+    self.rewards = DataManager.SummonData:getLastSummonRewards() -- 目前从缓存里拿
+
+    self.fragmentRewards = {}
+    self.coinNum = 0
+    local fragmentMap = {}
+    -- 将服务器格式转为前端用的格式
+    for _, reward in ipairs(self.rewards) do
+        if reward.type == GConst.REWARD_TYPE.ITEM and reward.item.id == GConst.ItemConst.ITEM_ID_GOLD then
+            self.coinNum = self.coinNum + reward.item.count
+        else
+            local id = reward.item.id
+            local count = reward.item.count
+            fragmentMap[id] = (fragmentMap[id] or 0) + count
+        end
+    end
+    for id, count in pairs(fragmentMap) do
+        table.insert(self.fragmentRewards, {id = id, count = count})
+    end
+end
+
+function BoxRewardUI:isFullScreen()
+    return true
+end
+
+function BoxRewardUI:getPrefabPath()
+    return "assets/prefabs/ui/shop/box_reward_ui.prefab"
+end
+
+function BoxRewardUI:onLoadRootComplete()
+    self.uiMap = self.root:genAllChildren()
+
+    self.titleTx = self.uiMap["box_reward_ui.title.text"]
+
+    self.scrollRectObj = self.uiMap["box_reward_ui.scroll_rect"]
+    self.scrollRect = self.scrollRectObj:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
+    self.scrollRect:addInitCallback(function()
+		return BOX_HERO_CELL
+	end)
+	self.scrollRect:addRefreshCallback(function(index, cell)
+		cell:refresh(self.fragmentRewards[index])
+	end)
+    self.scrollRect:clearCells()
+    self.scrollRect:refillCells(#self.fragmentRewards)
+
+    self.coinNode = self.uiMap["box_reward_ui.coin_node"]
+    self.coinIcon = self.uiMap["box_reward_ui.coin_node.coin"]
+    self.coinTx = self.uiMap["box_reward_ui.coin_node.text"]
+    if self.coinNum > 0 then
+        self.coinNode:setVisible(true)
+        self.coinTx:setText(self.coinNum)
+        GFunc.centerImgAndTx(self.coinIcon, self.coinTx, 20)
+    else
+        self.coinNode:setVisible(false)
+    end
+
+    self.closeTx = self.uiMap["box_reward_ui.close_tx"]
+    self.closeTx:setText("点击关闭TD") -- TODOJ
+    self.closeTx:addClickListener(function()
+        self:closeUI()
+    end)
+end
+
+return BoxRewardUI

lua/app/ui/shop/box_reward_ui.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 46d2b5d91a9f98348a9799f5084c8044
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/ui/shop/cell/box_hero_cell.lua

@@ -0,0 +1,22 @@
+local BoxHeroCell = class("BoxHeroCell", BaseCell)
+
+function BoxHeroCell:init()
+	local uiMap = self.baseObject:genAllChildren()
+    self.heroCell = CellManager:addCellComp(uiMap["cell.hero_cell"], GConst.TYPEOF_LUA_CLASS.HERO_CELL) 
+    self.heroNumText = uiMap["cell.num_tx"]
+end
+
+function BoxHeroCell:refresh(data)
+    self.data = data
+    local id = data.id
+    local num = data.count
+    
+    self.heroCell:refreshWithCfgId(id)
+    self.heroNumText:setText("X" .. tostring(num))
+end
+
+function BoxHeroCell:setVisible(visible)
+	self.baseObject:setVisible(visible)
+end
+
+return BoxHeroCell

lua/app/ui/shop/cell/box_hero_cell.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 3482ec01640b03a488ecb2abda8a4fb0
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/ui/shop/cell/box_sell_cell.lua

@@ -29,6 +29,7 @@ function BoxSellCell:init()
 	self.boxBuyBtn3 = uiMap["box_sell_cell.bg.box_3.buy_btn"]
 	self.boxBuyBtnCoin3 = uiMap["box_sell_cell.bg.box_3.buy_btn.coin"]
 	self.boxBuyBtnTx3 = uiMap["box_sell_cell.bg.box_3.buy_btn.buy_tx"]
+	self.progressSlider = uiMap["box_sell_cell.bg.progress_slider"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)
 	self.progressLv = uiMap["box_sell_cell.bg.progress_lv"]
 	self.progressTx = uiMap["box_sell_cell.bg.progress_tx"]
 	self.helpBtn = uiMap["box_sell_cell.bg.help_btn"]
@@ -74,8 +75,10 @@ function BoxSellCell:refreshLv()
 	self.progressLv:setText("Lv." .. tostring(lv)) -- TODOJ
 	if maxExp and maxExp > 0 then
 		self.progressTx:setText(tostring(exp) .. "/" .. tostring(maxExp)) -- TODOJ
+		self.progressSlider.value = exp / maxExp
 	else
 		self.progressTx:setText("MAX") -- TODOJ
+		self.progressSlider.value = 1
 	end
 end
 

lua/app/ui/shop/cell/hot_cell.lua

@@ -42,9 +42,6 @@ function HotCell:refresh(data)
 
         self.heroCell:refreshWithCfgId(reward.id)
         self.heroNumText:setText("X" .. tostring(reward.num))
-
-        Logger.printTable(reward)
-
         self.nameText:setText(ModuleManager.ItemManager:getItemName(reward.id))
     else
         self.icon:setVisible(true)

lua/app/userdata/summon/summon_data.lua

@@ -19,10 +19,16 @@ function SummonData:initCrossDay()
 end
 
 function SummonData:init(summon)
-    summon = summon or {}
+    if EDITOR_MODE then
+        Logger.logHighlight("召唤初始化")
+        Logger.printTable(summon)
+    end
 
+    summon = summon or {}
     self.level = summon.level or 1
     self.exp = summon.exp or 0
+
+    self:setDirty()
 end
 
 function SummonData:getSummonLevel()
@@ -57,10 +63,6 @@ end
 function SummonData:getSummonRewardByLv(summonType, level)
     level = level or self:getSummonLevel()
     local cfgInfo = self:getSummonConfig()[summonType]
-
-    Logger.logHighlight("getSummonRewardByLv -- summonType:%s level:%s ",summonType,level)
-    Logger.printTable(cfgInfo)
-
     if level == 1 then
         return cfgInfo.box_lv_base
     else
@@ -97,4 +99,14 @@ function SummonData:getSummonMaxExp(level)
     return cfg[#cfg].exp or 0
 end
 
+-- 缓存上次抽宝箱的奖励
+function SummonData:cacheSummonRewards(rewards)
+    self.summonRewards = rewards
+end
+
+-- 获取缓存的数据
+function SummonData:getLastSummonRewards()
+    return self.summonRewards or {}
+end
+
 return SummonData