Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

lua/app/config/const.lua

@@ -94,8 +94,8 @@ local const = {
  			["type_for_nothing"]="Vw==",
 			["id"]=7,
  			["id_for_nothing"]="UQ==",
-			["num"]=10,
- 			["num_for_nothing"]="Vwg="
+			["num"]=2,
+ 			["num_for_nothing"]="VA=="
 		}
 	},
 	["bounty_senior_rise"]={

lua/app/config/func_open.lua

@@ -44,15 +44,19 @@ local func_open = {
 		["icon"]="main_daily_challenge"
 	},
 	["act_gift_show_open"]={
-		["stage"]=3,
+		["stage"]=2,
 		["pop_ups"]=1
 	},
 	["first_charge"]={
 		["stage"]=2,
 		["pop_ups"]=1
+	},
+	["new_player_gift"]={
+		["stage"]=2,
+		["pop_ups"]=1
 	}
 }
 local config = {
-data=func_open,count=13
+data=func_open,count=14
 }
 return config

lua/app/config/localization/localization_global_const.lua

@@ -186,6 +186,8 @@ local LocalizationGlobalConst =
 	FUNC_OPEN_STAGE = "FUNC_OPEN_STAGE",
 	HERO_UNLOCK = "HERO_UNLOCK",
 	HERO_UNLOCK_DESC = "HERO_UNLOCK_DESC",
+	BOUNTY_TITLE = "BOUNTY_TITLE",
+	REMAIN_TIME = "REMAIN_TIME",
 }
 
 return LocalizationGlobalConst

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

@@ -186,6 +186,8 @@ local localization_global =
     ["FUNC_OPEN_STAGE"] = "通关章节{0}开启",
     ["HERO_UNLOCK"] = "英雄解锁",
     ["HERO_UNLOCK_DESC"] = "现在可从宝箱中获得",
+    ["BOUNTY_TITLE"] = "通行证",
+    ["REMAIN_TIME"] = "剩余时间：{0}",
 }
 
 return localization_global

lua/app/config/summon_exp.lua

@@ -3,10 +3,10 @@ local summon_exp = {
 		["exp"]=50
 	},
 	[2]={
-		["exp"]=150
+		["exp"]=320
 	},
 	[3]={
-		["exp"]=460
+		["exp"]=640
 	},
 	[4]={
 		["exp"]=1400
@@ -15,16 +15,16 @@ local summon_exp = {
 		["exp"]=5080
 	},
 	[6]={
-		["exp"]=17780
+		["exp"]=17800
 	},
 	[7]={
-		["exp"]=62290
+		["exp"]=62300
 	},
 	[8]={
-		["exp"]=218020
+		["exp"]=218000
 	},
 	[9]={
-		["exp"]=763070
+		["exp"]=763100
 	},
 	[10]={
 

lua/app/ui/bounty/bounty_buy_ui.lua

@@ -102,7 +102,11 @@ function BountyBuyUI:updateTime()
 		UIManager:closeUnderUI(self)
 		return self:closeUI()
 	end
-	self.timeTx:setText(GFunc.getTimeStr(remainTime))
+	if remainTime > 86400 then
+		self.timeTx:setText(I18N:getGlobalText(I18N.GlobalConst.REMAIN_TIME, GFunc.getTimeStrWithDH2(remainTime)))
+	else
+		self.timeTx:setText(I18N:getGlobalText(I18N.GlobalConst.REMAIN_TIME, GFunc.getTimeStrWithHMS2(remainTime)))
+	end
 end
 
 return BountyBuyUI