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

lua/app/config/chapter.lua

@@ -387,10 +387,10 @@ local chapter = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=4,
+				["id"]=43001,
- 				["id_for_nothing"]="Ug==",
+ 				["id_for_nothing"]="UgtcA2Q=",
-				["num"]=40,
+				["num"]=3,
- 				["num_for_nothing"]="Ugg="
+ 				["num_for_nothing"]="VQ=="
 			},
 			{
 				["type"]=1,
@@ -647,10 +647,10 @@ local chapter = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=5,
+				["id"]=23001,
- 				["id_for_nothing"]="Uw==",
+ 				["id_for_nothing"]="VAtcA2Q=",
-				["num"]=5,
+				["num"]=3,
- 				["num_for_nothing"]="Uw=="
+ 				["num_for_nothing"]="VQ=="
 			},
 			{
 				["type"]=1,
@@ -915,10 +915,10 @@ local chapter = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=5,
+				["id"]=33001,
- 				["id_for_nothing"]="Uw==",
+ 				["id_for_nothing"]="VQtcA2Q=",
-				["num"]=10,
+				["num"]=3,
- 				["num_for_nothing"]="Vwg="
+ 				["num_for_nothing"]="VQ=="
 			},
 			{
 				["type"]=1,

lua/app/config/hero.lua

@@ -162,7 +162,7 @@ local hero = {
 		["model_id"]="p0007",
 		["icon"]="7",
 		["item_id"]=23001,
-		["unlock_chapter"]=7
+		["unlock_chapter"]=6
 	},
 	[32001]={
 		["position"]=3,
@@ -272,7 +272,7 @@ local hero = {
 		["model_id"]="p0006",
 		["icon"]="6",
 		["item_id"]=33001,
-		["unlock_chapter"]=9
+		["unlock_chapter"]=8
 	},
 	[42001]={
 		["position"]=4,
@@ -382,7 +382,7 @@ local hero = {
 		["model_id"]="p0008",
 		["icon"]="8",
 		["item_id"]=43001,
-		["unlock_chapter"]=5
+		["unlock_chapter"]=4
 	},
 	[52001]={
 		["position"]=5,

lua/app/config/localization/localization_global_const.lua

@@ -52,6 +52,9 @@ local LocalizationGlobalConst =
 	TIME_STR_D = "TIME_STR_D",
 	TIME_MS = "TIME_MS",
 	TIME_HMS = "TIME_HMS",
+	LOADING_DESC = "LOADING_DESC",
+	CLICK_COPY_ACOUNT_DESC = "CLICK_COPY_ACOUNT_DESC",
+	APP = "APP",
 }
 
 return LocalizationGlobalConst

lua/app/config/skill.lua

@@ -2568,7 +2568,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=10029,
@@ -2587,7 +2587,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=10030,
@@ -2606,7 +2606,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["shake_time"]=100,
 		["shake_type"]=1,
 		["sound_hit"]=10031,
@@ -2630,7 +2630,7 @@ local skill = {
 			}
 		},
 		["obj"]=2,
-		["skill_position"]=1,
+		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=1,
 		["shake_time"]=100,

lua/app/config/skill_rogue.lua

@@ -788,7 +788,7 @@ local skill_rogue = {
 		["skill_position"]=4,
 		["effect"]={
 			{
-				["type"]="atkp",
+				["type"]="dmg_addition_all_add",
 				["num"]=1000,
 				["ratio"]=10000,
 				["round"]=1
@@ -888,7 +888,7 @@ local skill_rogue = {
 		["skill_position"]=1,
 		["effect"]={
 			{
-				["type"]="atkp",
+				["type"]="dmg_addition_all_add",
 				["num"]=1000,
 				["ratio"]=10000,
 				["round"]=1
@@ -942,7 +942,7 @@ local skill_rogue = {
 		["skill_position"]=3,
 		["effect"]={
 			{
-				["type"]="atkp",
+				["type"]="dmg_addition_all_add",
 				["num"]=1000,
 				["ratio"]=10000,
 				["round"]=1
@@ -1010,7 +1010,7 @@ local skill_rogue = {
 		["skill_position"]=2,
 		["effect"]={
 			{
-				["type"]="atkp",
+				["type"]="dmg_addition_all_add",
 				["num"]=1000,
 				["ratio"]=10000,
 				["round"]=1
@@ -1072,7 +1072,7 @@ local skill_rogue = {
 		["skill_position"]=4,
 		["effect"]={
 			{
-				["type"]="atkp",
+				["type"]="dmg_addition_all_add",
 				["num"]=1000,
 				["ratio"]=10000,
 				["round"]=1

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

@@ -52,6 +52,9 @@ local localization_global =
     ["TIME_STR_D"] = "{0}天",
     ["TIME_MS"] = "{0}:{1}",
     ["TIME_HMS"] = "{0}:{1}:{2}",
+    ["LOADING_DESC"] = "加载中.......",
+    ["CLICK_COPY_ACOUNT_DESC"] = "点击复制用户ID",
+    ["APP"] = "版本号：",
 }
 
 return localization_global

lua/app/config/strings/cn/skill_rogue.lua

@@ -18,13 +18,13 @@ local skill_rogue = {
 		["desc"]="红色攻击+<color=#3cff28>{0}</color>"
 	},
 	[7]={
-		["desc"]="黄色攻击+<color=#3cff28>{0}</color>"
+		["desc"]="金色攻击+<color=#3cff28>{0}</color>"
 	},
 	[8]={
-		["desc"]="黄色攻击+<color=#3cff28>{0}</color>"
+		["desc"]="金色攻击+<color=#3cff28>{0}</color>"
 	},
 	[9]={
-		["desc"]="黄色攻击+<color=#3cff28>{0}</color>"
+		["desc"]="金色攻击+<color=#3cff28>{0}</color>"
 	},
 	[10]={
 		["desc"]="绿色攻击+<color=#3cff28>{0}</color>"
@@ -96,13 +96,13 @@ local skill_rogue = {
 		["desc"]="将场上随机<color=#3cff28>5</color>个非红色元素变为红色"
 	},
 	[33]={
-		["desc"]="将场上随机<color=#3cff28>2</color>个非黄色元素变为黄色"
+		["desc"]="将场上随机<color=#3cff28>2</color>个非金色元素变为金色"
 	},
 	[34]={
-		["desc"]="将场上随机<color=#3cff28>4</color>个非黄色元素变为黄色"
+		["desc"]="将场上随机<color=#3cff28>4</color>个非金色元素变为金色"
 	},
 	[35]={
-		["desc"]="将场上随机<color=#3cff28>5</color>个非黄色元素变为黄色"
+		["desc"]="将场上随机<color=#3cff28>5</color>个非金色元素变为金色"
 	},
 	[36]={
 		["desc"]="将场上随机<color=#3cff28>2</color>个非绿色元素变为绿色"

lua/app/config/strings/de/global.lua

@@ -17,6 +17,9 @@ local localization_global =
     ["TIME_STR_D"] = "{0} Tag(e)",
     ["TIME_MS"] = "{0}:{1}",
     ["TIME_HMS"] = "{0}:{1}:{2}",
+    ["LOADING_DESC"] = "Laden…",
+    ["CLICK_COPY_ACOUNT_DESC"] = "Klicken Sie auf , um die Benutzer-ID zu kopieren",
+    ["APP"] = "Versionsnummer:",
 }
 
 return localization_global

lua/app/config/strings/en/global.lua

@@ -52,6 +52,9 @@ local localization_global =
     ["TIME_STR_D"] = "{0} d",
     ["TIME_MS"] = "{0}:{1}",
     ["TIME_HMS"] = "{0}:{1}:{2}",
+    ["LOADING_DESC"] = "Loading…",
+    ["CLICK_COPY_ACOUNT_DESC"] = "Click to copy your PlayerID",
+    ["APP"] = "Version:",
 }
 
 return localization_global

lua/app/config/strings/en/skill.lua

@@ -1,27 +1,27 @@
 local skill = {
 	[3200120]={
-
+		["desc"]="Lance Thrust: Dealing tons of damage"
 	},
 	[2200120]={
-
+		["desc"]="Unsheathe: Dealing tons of damage"
 	},
 	[4200120]={
-
+		["desc"]="Elemental Link: Clear random 3 extra elements"
 	},
 	[5200120]={
-
+		["desc"]="Magic Shield: Generates a Magic Shield that absorbs damage up to 10% of your Max HP. The shield lasts for 1 round"
 	},
 	[1200120]={
-
+		["desc"]="Disperse in Dance: Clears elements on <color=#3cff28>2</color> tiles on the left and right side"
 	},
 	[3300120]={
-
+		["desc"]="Quick Regen: Immediately restores HP by an amount equal to 80% of Evelyn's Attack"
 	},
 	[2300120]={
-
+		["desc"]="Great Sword Combos: Increases the damage of each attack by 50%, ends with a huge sword that deals tons of damage"
 	},
 	[4300120]={
-
+		["desc"]="Frosty Blade Dance: Deals massive damage for one time and the applies Frost status on the enemy for 1 round (normal attack hits -1)"
 	}
 }
 local config = {

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

@@ -1,231 +1,231 @@
 local skill_rogue = {
 	[1]={
-
+		["desc"]="Global ATK +<color=#3cff28>{0}</color>"
 	},
 	[2]={
-
+		["desc"]="Global ATK +<color=#3cff28>{0}</color>"
 	},
 	[3]={
-
+		["desc"]="Global ATK +<color=#3cff28>{0}</color>"
 	},
 	[4]={
-
+		["desc"]="Red ATK +<color=#3cff28>{0}</color>"
 	},
 	[5]={
-
+		["desc"]="Red ATK +<color=#3cff28>{0}</color>"
 	},
 	[6]={
-
+		["desc"]="Red ATK +<color=#3cff28>{0}</color>"
 	},
 	[7]={
-
+		["desc"]="Golden ATK +<color=#3cff28>{0}</color>"
 	},
 	[8]={
-
+		["desc"]="Golden ATK +<color=#3cff28>{0}</color>"
 	},
 	[9]={
-
+		["desc"]="Golden ATK +<color=#3cff28>{0}</color>"
 	},
 	[10]={
-
+		["desc"]="Green ATK +<color=#3cff28>{0}</color>"
 	},
 	[11]={
-
+		["desc"]="Green ATK +<color=#3cff28>{0}</color>"
 	},
 	[12]={
-
+		["desc"]="Green ATK +<color=#3cff28>{0}</color>"
 	},
 	[13]={
-
+		["desc"]="Blue ATK +<color=#3cff28>{0}</color>"
 	},
 	[14]={
-
+		["desc"]="Blue ATK +<color=#3cff28>{0}</color>"
 	},
 	[15]={
-
+		["desc"]="Blue ATK +<color=#3cff28>{0}</color>"
 	},
 	[16]={
-
+		["desc"]="Purple ATK +<color=#3cff28>{0}</color>"
 	},
 	[17]={
-
+		["desc"]="Purple ATK +<color=#3cff28>{0}</color>"
 	},
 	[18]={
-
+		["desc"]="Purple ATK +<color=#3cff28>{0}</color>"
 	},
 	[19]={
-
+		["desc"]="All DMG +<color=#3cff28>30%</color> when your HP is below 50%"
 	},
 	[20]={
-
+		["desc"]="EXP obtained +<color=#3cff28>5%</color>"
 	},
 	[21]={
-
+		["desc"]="Max HP +<color=#3cff28>{0}</color>"
 	},
 	[22]={
-
+		["desc"]="Max HP +<color=#3cff28>{0}</color>"
 	},
 	[23]={
-
+		["desc"]="Max HP +<color=#3cff28>{0}</color>"
 	},
 	[24]={
-
+		["desc"]="Restores HP by <color=#3cff28>1%</color> when the round starts"
 	},
 	[25]={
-
+		["desc"]="Increases HP restored by <color=#3cff28>5%</color>"
 	},
 	[26]={
-
+		["desc"]="Increases Block Chance by <color=#3cff28>5%</color>"
 	},
 	[27]={
-
+		["desc"]="Crit Rate +<color=#3cff28>4%</color>"
 	},
 	[28]={
-
+		["desc"]="Reduces Damage Taken by <color=#3cff28>5%</color>"
 	},
 	[29]={
-
+		["desc"]="Restores Character’s HP by <color=#3cff28>5%</color>"
 	},
 	[30]={
-
+		["desc"]="Turns <color=#3cff28>2</color> random Non-Red elements into Red"
 	},
 	[31]={
-
+		["desc"]="Turns <color=#3cff28>4</color> random Non-Red elements into Red"
 	},
 	[32]={
-
+		["desc"]="Turns <color=#3cff28>5</color> random Non-Red elements into Red"
 	},
 	[33]={
-
+		["desc"]="Turns <color=#3cff28>2</color> random Non-Golden elements into Golden"
 	},
 	[34]={
-
+		["desc"]="Turns <color=#3cff28>4</color> random Non-Golden elements into Golden"
 	},
 	[35]={
-
+		["desc"]="Turns <color=#3cff28>5</color> random Non-Golden elements into Golden"
 	},
 	[36]={
-
+		["desc"]="Turns <color=#3cff28>2</color> random Non-Green elements into Green"
 	},
 	[37]={
-
+		["desc"]="Turns <color=#3cff28>4</color> random Non-Green elements into Green"
 	},
 	[38]={
-
+		["desc"]="Turns <color=#3cff28>5</color> random Non-Green elements into Green"
 	},
 	[39]={
-
+		["desc"]="Turns <color=#3cff28>2</color> random Non-Blue elements into Blue"
 	},
 	[40]={
-
+		["desc"]="Turns <color=#3cff28>4</color> random Non-Blue elements into Blue"
 	},
 	[41]={
-
+		["desc"]="Turns <color=#3cff28>5</color> random Non-Blue elements into Blue"
 	},
 	[42]={
-
+		["desc"]="Turns <color=#3cff28>2</color> random Non-Purple elements into Purple"
 	},
 	[43]={
-
+		["desc"]="Turns <color=#3cff28>4</color> random Non-Purple elements into Purple"
 	},
 	[44]={
-
+		["desc"]="Turns <color=#3cff28>5</color> random Non-Purple elements into Purple"
 	},
 	[200100]={
-
+		["desc"]="Lance Thrust: Aske deals massive damage for <color=#3cff28>1</color> time"
 	},
 	[200101]={
-
+		["desc"]="Lance Thrust <color=#3cff28>restores HP</color>"
 	},
 	[200102]={
-
+		["desc"]="<color=#3cff28>Increases the damage</color> of Lance Thrust"
 	},
 	[200103]={
-
+		["desc"]="Lance Thrust has a <color=#3cff28>30%</color> chance to stun the enemy for <color=#3cff28>1</color> round"
 	},
 	[200200]={
-
+		["desc"]="Unsheathe: Carla deals massive damage for <color=#3cff28>1</color> time"
 	},
 	[200201]={
-
+		["desc"]="Unsheathe: <color=#3cff28>Increases the damage</color> of Unsheathe"
 	},
 	[200202]={
-
+		["desc"]="When performing Unsheathe, clears <color=#3cff28>1</color> tile on the top, bottom, left and right side respectively."
 	},
 	[200203]={
-
+		["desc"]="Unsheathe Ultimate Skill can be unleashed for <color=#3cff28>twice</color>"
 	},
 	[200300]={
-
+		["desc"]="Elemental Link: Clears random <color=#3cff28>3</color> extra elements"
 	},
 	[200301]={
-
+		["desc"]="Increases the number of random elements cleared by Elemental Link by <color=#3cff28>2</color>"
 	},
 	[200302]={
-
+		["desc"]="Increases the damage of elements cleared by Elemental Link by <color=#3cff28>10%</color>"
 	},
 	[200303]={
-
+		["desc"]="Increases the number of random elements cleared by Elemental Link by <color=#3cff28>2</color>"
 	},
 	[200400]={
-
+		["desc"]="Magic Shield: Allen generates a Magic Shield that lasts for <color=#3cff28>1</color> round"
 	},
 	[200401]={
-
+		["desc"]="<color=#3cff28>Increases the damage taken</color> by the Magic Shield"
 	},
 	[200402]={
-
+		["desc"]="Magic Shield lasts for <color=#3cff28>1</color> more round if it isn’t destroyed"
 	},
 	[200403]={
-
+		["desc"]="Magic Shield reflects and deals <color=#3cff28>400% damage</color> back to the enemy when activated"
 	},
 	[200500]={
-
+		["desc"]="Disperse in Dance: Clears elements on <color=#3cff28>2</color> tiles on the left and right"
 	},
 	[200501]={
-
+		["desc"]="Disperse in Dance clears elements on <color=#3cff28>1</color> extra tile on the top and bottom"
 	},
 	[200502]={
-
+		["desc"]="Increases the damage of elements connected by the same link of Disperse in Dance by <color=#3cff28>10%</color>"
 	},
 	[200503]={
-
+		["desc"]="Increases Block Chance by <color=#3cff28>2%</color> in the current round for every 1 element connected to Disperse in Dance"
 	},
 	[200600]={
-
+		["desc"]="Quick Regen: Evelyn can restore HP equal to <color=#3cff28>80%</color> of her Attack"
 	},
 	[200601]={
-
+		["desc"]="Increases the <color=#3cff28>amount of HP restored</color> by Quick Regen"
 	},
 	[200602]={
-
+		["desc"]="Increases the damage of elements connected by the same link of Quick Regen by <color=#3cff28>10%</color>"
 	},
 	[200603]={
-
+		["desc"]="Each attack of elements connected by the same link of Quick Regen restores <color=#3cff28>2%</color> HP"
 	},
 	[200700]={
-
+		["desc"]="Great Sword Combos: Increases the damage of each attack by <color=#3cff28>50%</color>"
 	},
 	[200701]={
-
+		["desc"]="Great Sword Combos clears <color=#3cff28>4</color> elements on the top, bottom, left and right side when connected"
 	},
 	[200702]={
-
+		["desc"]="Increases the damage of elements connected by the same link of Great Sword Combos by <color=#3cff28>10%</color>"
 	},
 	[200703]={
-
+		["desc"]="Great Sword Combos clears <color=#3cff28>4</color> elements on the diagonal directions when connected"
 	},
 	[200800]={
-
+		["desc"]="Frosty Blade Dance: White-Hair Catherine deals extra damage for <color=#3cff28>1</color> time and applies Frost status on the enemy for <color=#3cff28>1</color> round (normal attack hits -1)"
 	},
 	[200801]={
-
+		["desc"]="When performing Frosty Blade Dance, clears <color=#3cff28>4</color> elements on the top, bottom, left and right side"
 	},
 	[200802]={
-
+		["desc"]="Increases the damage of elements connected by the same link of Frosty Blade Dance by <color=#3cff28>10%</color>"
 	},
 	[200803]={
-
+		["desc"]="Frost status caused by Frosty Blade Dance lasts for <color=#3cff28>2</color> rounds"
 	}
 }
 local config = {

lua/app/config/strings/fr/global.lua

@@ -17,6 +17,9 @@ local localization_global =
     ["TIME_STR_D"] = "{0} jour(s)",
     ["TIME_MS"] = "{0}:{1}",
     ["TIME_HMS"] = "{0}:{1}:{2}",
+    ["LOADING_DESC"] = "Chargement…",
+    ["CLICK_COPY_ACOUNT_DESC"] = "Cliquez pour copier l'identifiant de l'utilisateur",
+    ["APP"] = "Numéro de version",
 }
 
 return localization_global

lua/app/config/strings/ja/global.lua

@@ -17,6 +17,9 @@ local localization_global =
     ["TIME_STR_D"] = "{0}日",
     ["TIME_MS"] = "{0}:{1}",
     ["TIME_HMS"] = "{0}:{1}:{2}",
+    ["LOADING_DESC"] = "読み込み中…",
+    ["CLICK_COPY_ACOUNT_DESC"] = "クリックするとユーザーIDがコピーされます",
+    ["APP"] = "バージョン番号：",
 }
 
 return localization_global

lua/app/config/strings/ko/global.lua

@@ -17,6 +17,9 @@ local localization_global =
     ["TIME_STR_D"] = "{0}일",
     ["TIME_MS"] = "{0}:{1}",
     ["TIME_HMS"] = "{0}:{1}:{2}",
+    ["LOADING_DESC"] = "로딩 중…",
+    ["CLICK_COPY_ACOUNT_DESC"] = "사용자 ID를 복사하려면 클릭합니다.",
+    ["APP"] = "버전 번호:",
 }
 
 return localization_global

lua/app/config/strings/zh/global.lua

@@ -17,6 +17,9 @@ local localization_global =
     ["TIME_STR_D"] = "{0}天",
     ["TIME_MS"] = "{0}:{1}",
     ["TIME_HMS"] = "{0}:{1}:{2}",
+    ["LOADING_DESC"] = "加載中.......",
+    ["CLICK_COPY_ACOUNT_DESC"] = "點擊複製用戶ID",
+    ["APP"] = "版本號：",
 }
 
 return localization_global