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

lua/app/config/func_open.lua

@@ -9,19 +9,19 @@ local func_open = {
 	},
 	["task"]={
 		["stage"]=3,
-		["icon"]="main_task"
+		["icon"]="module_unlock_task"
 	},
 	["act_level_gift"]={
 		["level"]=5,
-		["icon"]="main_act_level_gift"
+		["icon"]="module_unlock_fund"
 	},
 	["idle_drop"]={
 		["stage"]=2,
-		["icon"]="main_idle_drop"
+		["icon"]="module_unlock_idle"
 	},
 	["act_sevenday"]={
 		["stage"]=2,
-		["icon"]="main_act_sevenday"
+		["icon"]="module_unlock_sevenday"
 	},
 	["mall"]={
 		["stage"]=2,
@@ -29,7 +29,7 @@ local func_open = {
 	},
 	["mall_daily"]={
 		["stage"]=4,
-		["icon"]="main_mall_daily"
+		["icon"]="module_unlock_dailyshop"
 	},
 	["store_box_open"]={
 		["stage"]=2,
@@ -41,7 +41,7 @@ local func_open = {
 	},
 	["daily_challenge"]={
 		["stage"]=4,
-		["icon"]="main_daily_challenge"
+		["icon"]="module_unlock_dailychallenge"
 	},
 	["act_gift_show_open"]={
 		["stage"]=3,

lua/app/config/grid_type.lua

@@ -173,6 +173,7 @@ local grid_type = {
 		["bftc_icon"]="battle_obstacle_lamp",
 		["cant_link"]=1,
 		["element_invalid"]=1,
+		["break_sfx"]="sfx_piece_za_b01",
 		["effect"]=3,
 		["effect_trigger"]=2
 	},

lua/app/config/strings/cn/buff_daily_challenge.lua

@@ -1,45 +1,45 @@
 local buff_daily_challenge = {
 	[1]={
-		["desc"]="获取经验+10%"
+		["desc"]="获取经验+<color=#3cff28>10%</color>"
 	},
 	[2]={
-		["desc"]="所有伤害+5%"
+		["desc"]="所有伤害+<color=#3cff28>5%</color>"
 	},
 	[3]={
-		["desc"]="受到所有伤害-10%"
+		["desc"]="受到所有伤害-<color=#3cff28>10%</color>"
 	},
 	[4]={
-		["desc"]="暴击率+20%，暴击伤害+30%"
+		["desc"]="暴击率+<color=#3cff28>20%</color>，暴击伤害+<color=#3cff28>30%</color>"
 	},
 	[5]={
-		["desc"]="技能伤害+15%"
+		["desc"]="技能伤害+<color=#3cff28>15%</color>"
 	},
 	[6]={
-		["desc"]="回合开始前生命值+1%"
+		["desc"]="回合开始前生命值恢复<color=#3cff28>1%</color>"
 	},
 	[7]={
-		["desc"]="生命值恢复效果+5%"
+		["desc"]="生命值恢复效果提升<color=#3cff28>5%</color>"
 	},
 	[8]={
-		["desc"]="回合开始前生命值+1%"
+		["desc"]="回合开始前生命值恢复<color=#3cff28>1%</color>"
 	},
 	[9]={
-		["desc"]="敌方攻击力+5%"
+		["desc"]="敌方攻击力+<color=#3cff28>5%</color>"
 	},
 	[10]={
-		["desc"]="敌方造成伤害+5%"
+		["desc"]="敌方造成伤害+<color=#3cff28>5%</color>"
 	},
 	[11]={
-		["desc"]="敌方普攻次数+1"
+		["desc"]="敌方普攻次数+<color=#3cff28>1</color>"
 	},
 	[12]={
-		["desc"]="治疗效果-10%"
+		["desc"]="治疗效果-<color=#3cff28>10%</color>"
 	},
 	[13]={
-		["desc"]="敌方格挡概率+5%"
+		["desc"]="敌方格挡概率+<color=#3cff28>5%</color>"
 	},
 	[14]={
-		["desc"]="受到所有伤害-5%"
+		["desc"]="受到所有伤害-<color=#3cff28>5%</color>"
 	}
 }
 local config = {

lua/app/config/strings/cn/hero.lua

@@ -1,83 +1,83 @@
 local hero = {
 	[12001]={
 		["name"]="舞娘",
-		["desc"]="舞娘起舞，轻盈的舞步甩在敌人的脸上。"
+		["desc"]="扇子好看吗，打人的时候更好看哟。"
 	},
 	[13001]={
 		["name"]="克劳德",
-		["desc"]="克劳德挥舞大剑，剑气形成旋风，灼灼逼人。"
+		["desc"]="他一跃而起，扛起巨剑，犹如旋风般使出连击。"
 	},
 	[13002]={
 		["name"]="火旺",
-		["desc"]="火旺擅长炎拳，拳拳带火花，有谁不服，就是邦邦两拳。"
+		["desc"]="有谁不服，就是梆梆两拳，打到服为止，打不过另说。"
 	},
 	[14001]={
 		["name"]="亚历山大",
-		["desc"]="亚历山大的装备，可不是用来好看的。"
+		["desc"]="没人能抗住亚历山大的钢铁重击，如果扛住了，那就再来一击。"
 	},
 	[22001]={
 		["name"]="刀妹",
-		["desc"]="刀妹使用一次拔刀斩终结技，造成大量伤害。"
+		["desc"]="剑一出鞘，必要见血。"
 	},
 	[23001]={
 		["name"]="野蛮人",
-		["desc"]="野蛮人的多段伤害，附加流血。"
+		["desc"]="最有效的伤害，往往要采用最朴素的殴打方式。"
 	},
 	[23002]={
 		["name"]="二丫",
-		["desc"]="二丫的链接可以增伤。"
+		["desc"]="牛仔的击剑术，敌人和我，只能活一个"
 	},
 	[24001]={
 		["name"]="巨剑魔童",
-		["desc"]="巨剑魔童可以造成大量伤害，并概率眩晕敌人。"
+		["desc"]="我可能拿不起巨剑，但不妨碍我用它轰人。"
 	},
 	[32001]={
 		["name"]="洋葱头",
-		["desc"]="洋葱头使用一次长枪突刺终结技，造成大量伤害并恢复自身血量。"
+		["desc"]="盾牌只是为了掩饰下一次突刺。"
 	},
 	[33001]={
 		["name"]="小鹿",
-		["desc"]="小鹿的急速治疗法，起死回生不过一瞬。"
+		["desc"]="温柔又单纯的森林子民，与生俱来的是治疗的能力。"
 	},
 	[33002]={
 		["name"]="森林狼",
-		["desc"]="森林狼的链接可以增伤，概率附加易伤效果。"
+		["desc"]="嗷嗷嗷嗷嗷嗷嗷嗷嗷——————。"
 	},
 	[34001]={
 		["name"]="木兰",
-		["desc"]="木兰的链接可以增伤，并附加易伤效果。"
+		["desc"]="这一箭下去你可能会死。"
 	},
 	[42001]={
 		["name"]="冰心",
-		["desc"]="冰心的攻击随机消除额外元素，并造成伤害，有概率冰冻敌人。"
+		["desc"]="我的心和我的法术一样冰冷。"
 	},
 	[43001]={
 		["name"]="冰女",
-		["desc"]="冰女的攻击附加冰霜，并增加灼烧伤害。"
+		["desc"]="我喜欢冰块，你也要来一块吗。"
 	},
 	[43002]={
 		["name"]="鸦姐",
-		["desc"]="鸦姐的攻击一定给敌人附加腐败状态。"
+		["desc"]="我这把可是沾满毒药的匕首。"
 	},
 	[44001]={
 		["name"]="寒冰妖姬",
-		["desc"]="寒冰妖姬随机消除元素，释放一次附带冰霜效果的剑舞攻击。"
+		["desc"]="有人持剑起舞，寒冰妖姬用剑让敌人起舞。"
 	},
 	[52001]={
 		["name"]="忍者伦",
-		["desc"]="忍者伦生成的魔法罩可以承受伤害。"
+		["desc"]="虽然带的是手里剑，但是最擅长的还是护盾术，忍者伦最大的愿望还是世界和平。"
 	},
 	[53001]={
 		["name"]="魔女琪琪",
-		["desc"]="魔女琪琪的扫帚攻击命中可以附加负面负面状态。"
+		["desc"]="魔女琪琪的魔法扫帚，不仅能扫地，还能扫人。"
 	},
 	[53002]={
 		["name"]="灵魂猎手",
-		["desc"]="灵魂猎手攻击冰霜敌人概率冰冻敌人。"
+		["desc"]="这玩意儿可比用牙吸血好用多啦。"
 	},
 	[54001]={
 		["name"]="蝴蝶",
-		["desc"]="蝴蝶的技能可以随机增加技能的能量。"
+		["desc"]="蝴蝶破茧而出，美丽又坚韧，坚韧的不止是内心，还有手里同样美丽的长刀。"
 	}
 }
 local config = {

lua/app/config/strings/en/buff_daily_challenge.lua

@@ -1,45 +1,45 @@
 local buff_daily_challenge = {
 	[1]={
-
+		["desc"]="EXP gained +<color=#3cff28>10%</color>"
 	},
 	[2]={
-
+		["desc"]="All damage +<color=#3cff28>5%</color>"
 	},
 	[3]={
-
+		["desc"]="all damage taken -<color=#3cff28>10%</color>"
 	},
 	[4]={
-
+		["desc"]="Crti Rate +<color=#3cff28>20%</color>, Crit Damage +<color=#3cff28>30%</color>"
 	},
 	[5]={
-
+		["desc"]="Skill damage +<color=#3cff28>15%</color>"
 	},
 	[6]={
-
+		["desc"]="HP recovers <color=#3cff28>1%</color> when turn begins"
 	},
 	[7]={
-
+		["desc"]="HP recovery effect increases by <color=#3cff28>5%</color>"
 	},
 	[8]={
-
+		["desc"]="HP recovers <color=#3cff28>1%</color> when turn begins"
 	},
 	[9]={
-
+		["desc"]="Enemy Attack +<color=#3cff28>5%</color>"
 	},
 	[10]={
-
+		["desc"]="Enemy damage dealt +<color=#3cff28>5%</color>"
 	},
 	[11]={
-
+		["desc"]="Enemy normal attacks +<color=#3cff28>1</color>"
 	},
 	[12]={
-
+		["desc"]="Healing effect -<color=#3cff28>10%</color>"
 	},
 	[13]={
-
+		["desc"]="Enemy block rate +<color=#3cff28>5%</color>"
 	},
 	[14]={
-
+		["desc"]="all damage taken -<color=#3cff28>5%</color>"
 	}
 }
 local config = {

lua/app/config/strings/en/hero.lua

@@ -1,63 +1,83 @@
 local hero = {
 	[12001]={
-		["name"]="Dancer"
+		["name"]="Dancer",
+		["desc"]="Does the fan look good? It looks even better when using it to hit someone."
 	},
 	[13001]={
-		["name"]="Claude"
+		["name"]="Claude",
+		["desc"]="He jumped up, picked up the giant sword, and made a combo of blows like a whirlwind."
 	},
 	[13002]={
-		["name"]="Flare"
+		["name"]="Flare",
+		["desc"]="If anyone challenges me, I'll just punch him until he is convinced, and it was another story if I defeated, of course."
 	},
 	[14001]={
-		["name"]="Alexander"
+		["name"]="Alexander",
+		["desc"]="No one can withstand Alexander's heavy blow of steel, and if he bears it, then hit again."
 	},
 	[22001]={
-		["name"]="Blade Maid"
+		["name"]="Blade Maid",
+		["desc"]="As soon as the sword is unsheathed, blood must be seen."
 	},
 	[23001]={
-		["name"]="Barbarian"
+		["name"]="Barbarian",
+		["desc"]="The most effective damage often takes the simplest form of beating."
 	},
 	[23002]={
-		["name"]="Er-Ya"
+		["name"]="Er-Ya",
+		["desc"]="Cowboy fencing, the enemy and I, only one to live"
 	},
 	[24001]={
-		["name"]="Claymore Kid"
+		["name"]="Claymore Kid",
+		["desc"]="I may not be able to hold the greatsword, but that doesn't stop me from blasting people with it."
 	},
 	[32001]={
-		["name"]="Onion"
+		["name"]="Onion",
+		["desc"]="The shield is just to cover the next thrust."
 	},
 	[33001]={
-		["name"]="Fawn"
+		["name"]="Fawn",
+		["desc"]="The gentle and simple forest people are born with the ability to heal."
 	},
 	[33002]={
-		["name"]="Timberwolf"
+		["name"]="Timberwolf",
+		["desc"]="Aoooooooooooooooooooooooo!!!!!!!"
 	},
 	[34001]={
-		["name"]="Mulan"
+		["name"]="Mulan",
+		["desc"]="You may die with this arrow."
 	},
 	[42001]={
-		["name"]="Iceheart"
+		["name"]="Iceheart",
+		["desc"]="My heart is as cold as my spells."
 	},
 	[43001]={
-		["name"]="Ice Maiden"
+		["name"]="Ice Maiden",
+		["desc"]="I like ice cubes, would you like one too?"
 	},
 	[43002]={
-		["name"]="Raven"
+		["name"]="Raven",
+		["desc"]="My dagger is covered in poison."
 	},
 	[44001]={
-		["name"]="Frost Enchantress"
+		["name"]="Frost Enchantress",
+		["desc"]="Someone danced with a sword, and Frost Enchantress used the sword to make the enemy dance."
 	},
 	[52001]={
-		["name"]="Ninja Lun"
+		["name"]="Ninja Lun",
+		["desc"]="Although he is carrying a shuriken, he is best at shielding. Ninja Lun's greatest wish is world peace."
 	},
 	[53001]={
-		["name"]="Witch Kiki"
+		["name"]="Witch Kiki",
+		["desc"]="Witch Kiki's magic broom can not only sweep the floor, but also sweep enemies."
 	},
 	[53002]={
-		["name"]="Soul Hunter"
+		["name"]="Soul Hunter",
+		["desc"]="This thing is much better than sucking blood with teeth."
 	},
 	[54001]={
-		["name"]="Butterfly"
+		["name"]="Butterfly",
+		["desc"]="The butterfly emerges from the cocoon, beautiful and tough, not only the heart is tough, but also the beautiful long knife in the hand."
 	}
 }
 local config = {

lua/app/config/strings/en/skill_rogue.lua

@@ -144,7 +144,7 @@ local skill_rogue = {
 		["desc"]="Dispersion Dance deals <color=#3cff28>50%</color> more damage to freeze enemies."
 	},
 	[1200104]={
-		["desc"]="Dispersion Dance clears an additional 4 grids vertically."
+		["desc"]="Dispersion Dance clears an additional <color=#3cff28>4</color> grids vertically."
 	},
 	[1200105]={
 		["desc"]="When Dispersion Dance links <color=#3cff28>5</color> or more elements, applies Rage to the team for <color=#3cff28>2</color> turns."
@@ -234,7 +234,7 @@ local skill_rogue = {
 		["desc"]="Unsheathe damage increases."
 	},
 	[2200102]={
-		["desc"]="Unsheathe clears an additional 4 grids vertically."
+		["desc"]="Unsheathe clears an additional <color=#3cff28>4</color> grids vertically."
 	},
 	[2200103]={
 		["desc"]="Unsheathe deals <color=#3cff28>50%</color> more damage to burning enemies."
@@ -402,7 +402,7 @@ local skill_rogue = {
 		["desc"]="Moonchaser can inflict Vulnerable for <color=#3cff28>2</color> turns."
 	},
 	[3400102]={
-		["desc"]="Moonchaser clears an additional 4 grids vertically."
+		["desc"]="Moonchaser clears an additional <color=#3cff28>4</color> grids vertically."
 	},
 	[3400103]={
 		["desc"]="Mulan's attack increases by <color=#3cff28>15%</color>."
@@ -522,7 +522,7 @@ local skill_rogue = {
 		["desc"]="The shield from Shield Art absorbs more damage."
 	},
 	[5200102]={
-		["desc"]="Shield Art have a <color=#3cff28>10%</color> chance of poisoning with this attack for <color=#3cff28>2</color> turns when used."
+		["desc"]="Shield Art have a <color=#3cff28>10%</color> chance of poisoning the enemy with normal attacks for <color=#3cff28>2</color> turns."
 	},
 	[5200103]={
 		["desc"]="Shield from Shield Art lasts +<color=#3cff28>1</color> turns."

lua/app/config/strings/en/tutorial.lua

@@ -1,18 +1,18 @@
 local tutorial = {
 	["tutorial_txt_1"]={
-		["value"]="Select a skill and continue the battle"
+		["value"]="Select skills to continue battle"
 	},
 	["tutorial_txt_2"]={
-		["value"]="Claim chest to unlock new heroes"
+		["value"]="Claim chest to unlock new hero"
 	},
 	["tutorial_txt_3"]={
-		["value"]="Claim chest to obtain hero shards"
+		["value"]="Claim chest to obtain Hero Shard"
 	},
 	["tutorial_txt_4"]={
-		["value"]="Claim chest to unlock the 5th hero"
+		["value"]="Claim chest to obtain the fifth hero"
 	},
 	["tutorial_txt_5"]={
-
+		["value"]="Head to the shop for more heroes!"
 	}
 }
 local config = {

lua/app/config/strings/zh/buff_daily_challenge.lua

@@ -1,45 +1,45 @@
 local buff_daily_challenge = {
 	[1]={
-
+		["desc"]="獲取經驗+<color=#3cff28>10%</color>"
 	},
 	[2]={
-
+		["desc"]="所有傷害+<color=#3cff28>5%</color>"
 	},
 	[3]={
-
+		["desc"]="受到所有傷害-<color=#3cff28>10%</color>"
 	},
 	[4]={
-
+		["desc"]="暴擊率+<color=#3cff28>20%</color>，暴擊傷害+<color=#3cff28>30%</color>"
 	},
 	[5]={
-
+		["desc"]="技能傷害+<color=#3cff28>15%</color>"
 	},
 	[6]={
-
+		["desc"]="回合開始前生命值恢復<color=#3cff28>1%</color>"
 	},
 	[7]={
-
+		["desc"]="生命值恢復效果提升<color=#3cff28>5%</color>"
 	},
 	[8]={
-
+		["desc"]="回合開始前生命值恢復<color=#3cff28>1%</color>"
 	},
 	[9]={
-
+		["desc"]="敵方攻擊力+<color=#3cff28>5%</color>"
 	},
 	[10]={
-
+		["desc"]="敵方造成傷害+<color=#3cff28>5%</color>"
 	},
 	[11]={
-
+		["desc"]="敵方普攻次數+<color=#3cff28>1</color>"
 	},
 	[12]={
-
+		["desc"]="治療效果-<color=#3cff28>10%</color>"
 	},
 	[13]={
-
+		["desc"]="敵方格擋概率+<color=#3cff28>5%</color>"
 	},
 	[14]={
-
+		["desc"]="受到所有傷害-<color=#3cff28>5%</color>"
 	}
 }
 local config = {

lua/app/config/strings/zh/skill_rogue.lua

@@ -522,7 +522,7 @@ local skill_rogue = {
 		["desc"]="護盾術增加的護盾，承受傷害提高。"
 	},
 	[5200102]={
-
+		["desc"]="護盾術使用時本次普攻有<color=#3cff28>10%</color>概率附加中毒效果，<color=#3cff28>2</color>回合。"
 	},
 	[5200103]={
 		["desc"]="護盾術增加的護盾，回合數+<color=#3cff28>1</color>。"

lua/app/config/strings/zh/tutorial.lua

@@ -12,7 +12,7 @@ local tutorial = {
 		["value"]="領取寶箱，獲取第五位英雄"
 	},
 	["tutorial_txt_5"]={
-
+		["value"]="前往商城，獲得更多英雄！"
 	}
 }
 local config = {

lua/app/global/global_const.lua

@@ -193,6 +193,7 @@ GConst.ATLAS_PATH = {
 	HERO = "assets/arts/atlas/ui/hero.asset",
 	FUND = "assets/arts/atlas/ui/fund.asset",
 	SEVEN_DAY = "assets/arts/atlas/ui/sevenday.asset",
+	MODULE = "assets/arts/atlas/ui/module.asset",
 }
 
 GConst.TOUCH_EVENT = {

lua/app/ui/main_city/module_unlock_ui.lua

@@ -60,6 +60,9 @@ function ModuleUnlockUI:showModuleUnlockAnimation()
 		return false
 	end
 	self.moduleNameTx:setText(i18nInfo.name)
+	if info.icon then
+		self.moduleIcon:setSprite(GConst.ATLAS_PATH.MODULE, info.icon)
+	end
 	return true
 end