更新配置

lua/app/config/buff.lua

@@ -186,10 +186,7 @@ local buff = {
 	[34]={
 		["name"]="shield",
 		["buff_type"]=2,
-		["icon"]="shield",
+		["icon"]="shield"
-		["fx_continued"]={
-			4001
-		}
 	},
 	[35]={
 		["name"]="atkp_add",
@@ -205,10 +202,7 @@ local buff = {
 	},
 	[37]={
 		["name"]="normal_attack_add",
-		["buff_type"]=1,
+		["buff_type"]=1
-		["fx_continued"]={
-			4001
-		}
 	},
 	[38]={
 		["name"]="block",
@@ -241,6 +235,11 @@ local buff = {
 	[45]={
 		["name"]="skill_fire_times",
 		["buff_type"]=7
+	},
+	[34]={
+		["name"]="shield_rebound_200",
+		["buff_type"]=2,
+		["icon"]="shield"
 	}
 }
 local keys = {
@@ -289,12 +288,13 @@ local keys = {
 		["exp_time_add"]=buff[42],
 		["cured_add"]=buff[43],
 		["add_skill"]=buff[44],
-		["skill_fire_times"]=buff[45]
+		["skill_fire_times"]=buff[45],
+		["shield_rebound_200"]=buff[34]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=45
+count=46
 }
 return config

lua/app/config/chapter_board.lua

@@ -1050,7 +1050,7 @@ local chapter_board = {
 			},
 			{
 				1,
-				1
+				0
 			},
 			{
 				0,
@@ -1058,23 +1058,23 @@ local chapter_board = {
 			},
 			{
 				0,
-				3
+				2
 			},
 			{
 				0,
 				3
 			},
-			{
-				0,
-				1
-			},
 			{
 				1,
 				0
 			},
 			{
 				1,
-				4
+				0
+			},
+			{
+				1,
+				0
 			},
 			{
 				0,
@@ -1098,39 +1098,39 @@ local chapter_board = {
 			},
 			{
 				1,
-				4
+				0
 			},
 			{
 				3,
-				3
-			},
-			{
-				0,
 				0
 			},
 			{
 				0,
 				1
 			},
+			{
+				0,
+				4
+			},
 			{
 				2,
 				0
 			},
 			{
 				0,
-				1
+				4
 			},
 			{
 				0,
+				1
+			},
+			{
+				3,
 				0
 			},
 			{
 				3,
-				3
+				0
-			},
-			{
-				3,
-				3
 			},
 			{
 				0,
@@ -1142,7 +1142,7 @@ local chapter_board = {
 			},
 			{
 				0,
-				0
+				2
 			},
 			{
 				0,
@@ -1154,39 +1154,39 @@ local chapter_board = {
 			},
 			{
 				3,
-				3
+				0
 			},
 			{
 				1,
-				3
-			},
-			{
-				0,
-				4
-			},
-			{
-				0,
 				0
 			},
 			{
 				0,
-				0
+				3
 			},
 			{
 				0,
-				0
+				3
 			},
 			{
 				0,
-				4
+				2
 			},
 			{
-				1,
+				0,
+				3
+			},
+			{
+				0,
 				3
 			},
 			{
 				1,
-				4
+				0
+			},
+			{
+				1,
+				0
 			},
 			{
 				1,
@@ -1210,7 +1210,7 @@ local chapter_board = {
 			},
 			{
 				1,
-				4
+				0
 			}
 		}
 	},

lua/app/config/const.lua

@@ -16,9 +16,12 @@ local const = {
 	},
 	["shake_level_3"]={
 		["value"]=60
+	},
+	["shield_rebound_value"]={
+		["value"]=200
 	}
 }
 local config = {
-data=const,count=6
+data=const,count=7
 }
 return config

lua/app/config/skill.lua

@@ -1,4 +1,30 @@
 local skill = {
+	[9]={
+		["effect_type"]=2,
+		["trigger"]=6,
+		["effect"]={
+			{
+				["type"]="stun",
+				["num"]=0,
+				["ratio"]=3000,
+				["round"]=1
+			}
+		},
+		["obj"]=2
+	},
+	[10]={
+		["effect_type"]=2,
+		["trigger"]=6,
+		["effect"]={
+			{
+				["type"]="heal",
+				["num"]=6000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1
+	},
 	[11]={
 		["effect_type"]=2,
 		["trigger"]=4,
@@ -39,8 +65,7 @@ local skill = {
 				["round"]=1
 			}
 		},
-		["obj"]=2,
+		["obj"]=2
-		["skill_position"]=2
 	},
 	[14]={
 		["effect_type"]=2,
@@ -274,7 +299,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_yellow",
-				["num"]=30000,
+				["num"]=70000,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -289,11 +314,8 @@ local skill = {
 	[2200121]={
 		["energy"]=10,
 		["position"]=2,
-		["method"]=1,
+		["method"]=2,
-		["skill_type"]=2,
+		["skill_type"]=1,
-		["skill_type_parameter"]={
-			2
-		},
 		["boardrange"]={
 			{
 				["type"]=1,
@@ -319,7 +341,7 @@ local skill = {
 		["effect"]={
 			{
 				["type"]="hurt_yellow",
-				["num"]=30000,
+				["num"]=70000,
 				["ratio"]=10000,
 				["round"]=0
 			}
@@ -447,11 +469,8 @@ local skill = {
 	[2300121]={
 		["energy"]=10,
 		["position"]=2,
-		["method"]=1,
+		["method"]=2,
-		["skill_type"]=2,
+		["skill_type"]=1,
-		["skill_type_parameter"]={
-			2
-		},
 		["boardrange"]={
 			{
 				["type"]=1,
@@ -470,10 +489,10 @@ local skill = {
 				["range"]=1
 			}
 		},
-		["icon"]=70,
+		["icon"]=20,
-		["battle_icon"]="7",
+		["battle_icon"]="2",
-		["effect_type"]=2,
+		["effect_type"]=1,
-		["trigger"]=3,
+		["trigger"]=1,
 		["effect"]={
 			{
 				["type"]="dmg_addition_yellow_add",
@@ -494,22 +513,6 @@ local skill = {
 			2
 		},
 		["boardrange"]={
-			{
-				["type"]=1,
-				["range"]=1
-			},
-			{
-				["type"]=2,
-				["range"]=1
-			},
-			{
-				["type"]=3,
-				["range"]=1
-			},
-			{
-				["type"]=4,
-				["range"]=1
-			},
 			{
 				["type"]=5,
 				["range"]=1
@@ -638,23 +641,26 @@ local skill = {
 	[3200120]={
 		["energy"]=10,
 		["position"]=3,
-		["method"]=2,
+		["method"]=1,
-		["skill_type"]=1,
+		["skill_type"]=0,
-		["boardrange"]={
-			{
-				["type"]=1,
-				["range"]=1
-			},
-			{
-				["type"]=2,
-				["range"]=1
-			}
-		},
 		["icon"]=10,
 		["battle_icon"]="1",
 		["effect_type"]=1,
 		["trigger"]=1,
-		["skill_position"]=1
+		["effect"]={
+			{
+				["type"]="hurt_green",
+				["num"]=40000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]=1,
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["name_act"]="skill01",
+		["fx_self"]=300003
 	},
 	[3300110]={
 		["position"]=3,
@@ -872,7 +878,7 @@ local skill = {
 		["boardrange"]={
 			{
 				["type"]=0,
-				["range"]=2
+				["range"]=3
 			}
 		},
 		["icon"]=30,
@@ -1163,7 +1169,31 @@ local skill = {
 			}
 		},
 		["obj"]=1,
-		["skill_position"]=2
+		["skill_position"]=2,
+		["name_act"]="skill01",
+		["fx_self"]=300016
+	},
+	[5200121]={
+		["energy"]=10,
+		["position"]=5,
+		["method"]=1,
+		["skill_type"]=0,
+		["icon"]=40,
+		["battle_icon"]="4",
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="shield_rebound_200",
+				["num"]=1000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1,
+		["skill_position"]=2,
+		["name_act"]="skill01",
+		["fx_self"]=300016
 	},
 	[10001]={
 		["effect_type"]=1,
@@ -1586,7 +1616,7 @@ local skill = {
 		["trigger"]=2,
 		["effect"]={
 			{
-				["type"]="dec_dmg_ryellow_add",
+				["type"]="dec_dmg_yellow_add",
 				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=999
@@ -1749,7 +1779,13 @@ local skill = {
 		["trigger"]=2,
 		["effect"]={
 			{
-				["type"]="dec_dmg_random_add",
+				["type"]="weakness_red_add",
+				["num"]=5000,
+				["ratio"]=10000,
+				["round"]=999
+			},
+			{
+				["type"]="weakness_purple_add",
 				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=999
@@ -2221,7 +2257,7 @@ local skill = {
 		["trigger"]=2,
 		["effect"]={
 			{
-				["type"]="dec_dmg_ryellow_add",
+				["type"]="dec_dmg_yellow_add",
 				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=999
@@ -2513,7 +2549,7 @@ local skill = {
 		["trigger"]=2,
 		["effect"]={
 			{
-				["type"]="dec_dmg_ryellow_add",
+				["type"]="dec_dmg_yellow_add",
 				["num"]=5000,
 				["ratio"]=10000,
 				["round"]=999
@@ -2598,6 +2634,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=138
+data=skill,count=141
 }
 return config

lua/app/config/skill_rogue.lua

@@ -660,37 +660,31 @@ local skill_rogue = {
 	},
 	[200101]={
 		["limit_times"]=1,
-		["weight"]=2000,
+		["weight"]=1000,
-		["qlt"]=3,
+		["qlt"]=4,
-		["type"]=2,
+		["type"]=12,
-		["skill_position"]=3,
-		["boardrange"]={
-			{
-				["type"]=1,
-				["range"]=1
-			},
-			{
-				["type"]=2,
-				["range"]=1
-			}
-		},
-		["icon"]="31"
-	},
-	[200102]={
-		["limit_times"]=2,
-		["weight"]=3000,
-		["qlt"]=2,
-		["type"]=3,
 		["skill_position"]=3,
 		["effect"]={
 			{
-				["type"]="atkp",
+				["type"]="add_skill",
-				["num"]=1000,
+				["num"]=10,
 				["ratio"]=10000,
 				["round"]=1
 			}
 		},
 		["obj"]=1,
+		["icon"]="31"
+	},
+	[200102]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=2,
+		["type"]=7,
+		["parameter"]={
+			1,
+			3000
+		},
+		["skill_position"]=5,
 		["icon"]="32"
 	},
 	[200103]={
@@ -702,12 +696,12 @@ local skill_rogue = {
 		["effect"]={
 			{
 				["type"]="add_skill",
-				["num"]=13,
+				["num"]=9,
 				["ratio"]=10000,
 				["round"]=1
 			}
 		},
-		["obj"]=2,
+		["obj"]=1,
 		["icon"]="33"
 	},
 	[200200]={
@@ -719,6 +713,18 @@ local skill_rogue = {
 		["icon"]="56"
 	},
 	[200201]={
+		["limit_times"]=1,
+		["weight"]=3000,
+		["qlt"]=2,
+		["type"]=7,
+		["parameter"]={
+			1,
+			3000
+		},
+		["skill_position"]=5,
+		["icon"]="34"
+	},
+	[200202]={
 		["limit_times"]=1,
 		["weight"]=2000,
 		["qlt"]=3,
@@ -727,23 +733,6 @@ local skill_rogue = {
 			2200121
 		},
 		["skill_position"]=2,
-		["icon"]="34"
-	},
-	[200202]={
-		["limit_times"]=2,
-		["weight"]=3000,
-		["qlt"]=2,
-		["type"]=3,
-		["skill_position"]=2,
-		["effect"]={
-			{
-				["type"]="atkp",
-				["num"]=1000,
-				["ratio"]=10000,
-				["round"]=1
-			}
-		},
-		["obj"]=1,
 		["icon"]="35"
 	},
 	[200203]={
@@ -779,14 +768,20 @@ local skill_rogue = {
 	},
 	[200301]={
 		["limit_times"]=1,
-		["weight"]=2000,
+		["weight"]=1000,
-		["qlt"]=3,
+		["qlt"]=4,
-		["type"]=4,
+		["type"]=2,
 		["skill_position"]=4,
-		["icon"]="37"
+		["boardrange"]={
+			{
+				["type"]=0,
+				["range"]=2
+			}
+		},
+		["icon"]="39"
 	},
 	[200302]={
-		["limit_times"]=3,
+		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=2,
 		["type"]=11,
@@ -803,7 +798,7 @@ local skill_rogue = {
 		["icon"]="38"
 	},
 	[200303]={
-		["limit_times"]=2,
+		["limit_times"]=1,
 		["weight"]=1000,
 		["qlt"]=4,
 		["type"]=2,
@@ -826,25 +821,17 @@ local skill_rogue = {
 	},
 	[200401]={
 		["limit_times"]=1,
-		["weight"]=2000,
-		["qlt"]=3,
-		["type"]=4,
-		["skill_position"]=5,
-		["icon"]="40"
-	},
-	[200402]={
-		["limit_times"]=2,
 		["weight"]=3000,
 		["qlt"]=2,
 		["type"]=7,
 		["parameter"]={
 			1,
-			1000
+			600
 		},
 		["skill_position"]=5,
 		["icon"]="41"
 	},
-	[200403]={
+	[200402]={
 		["limit_times"]=1,
 		["weight"]=1000,
 		["qlt"]=4,
@@ -856,6 +843,17 @@ local skill_rogue = {
 		["skill_position"]=5,
 		["icon"]="42"
 	},
+	[200403]={
+		["limit_times"]=1,
+		["weight"]=2000,
+		["qlt"]=3,
+		["type"]=1,
+		["parameter"]={
+			5200121
+		},
+		["skill_position"]=2,
+		["icon"]="40"
+	},
 	[200500]={
 		["limit_times"]=1,
 		["weight"]=30000,
@@ -883,7 +881,7 @@ local skill_rogue = {
 		["icon"]="43"
 	},
 	[200502]={
-		["limit_times"]=2,
+		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=2,
 		["type"]=3,
@@ -926,14 +924,18 @@ local skill_rogue = {
 	},
 	[200601]={
 		["limit_times"]=1,
-		["weight"]=2000,
+		["weight"]=3000,
-		["qlt"]=3,
+		["qlt"]=2,
-		["type"]=4,
+		["type"]=7,
-		["skill_position"]=3,
+		["parameter"]={
+			1,
+			400
+		},
+		["skill_position"]=5,
 		["icon"]="46"
 	},
 	[200602]={
-		["limit_times"]=2,
+		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=2,
 		["type"]=3,
@@ -986,7 +988,7 @@ local skill_rogue = {
 		["icon"]="49"
 	},
 	[200702]={
-		["limit_times"]=2,
+		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=2,
 		["type"]=3,
@@ -1033,7 +1035,7 @@ local skill_rogue = {
 		["icon"]="52"
 	},
 	[200802]={
-		["limit_times"]=2,
+		["limit_times"]=1,
 		["weight"]=3000,
 		["qlt"]=2,
 		["type"]=3,

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

@@ -14,7 +14,7 @@ local localization_global =
     ["ITEM_NOT_ENOUGH"] = "{0}不足",
     ["START_DESC"] = "开始",
     ["ELEMENT_NAME_1"] = "红色元素",
-    ["ELEMENT_NAME_2"] = "黄色元素",
+    ["ELEMENT_NAME_2"] = "金色元素",
     ["ELEMENT_NAME_3"] = "绿色元素",
     ["ELEMENT_NAME_4"] = "蓝色元素",
     ["ELEMENT_NAME_5"] = "紫色元素",

lua/app/config/strings/cn/skill.lua

@@ -1,12 +1,12 @@
 local skill = {
 	[3200120]={
-		["desc"]="长枪突刺：将上下2格元素进行消除"
+		["desc"]="长枪突刺：造成大量伤害"
 	},
 	[2200120]={
-		["desc"]="拔刀斩：使用一次拔刀斩终结技，造成大量伤害"
+		["desc"]="拔刀斩：造成大量伤害"
 	},
 	[4200120]={
-		["desc"]="元素链接：随机额外消除2个元素"
+		["desc"]="元素链接：随机额外消除3个元素"
 	},
 	[5200120]={
 		["desc"]="魔法罩：生成一个魔法罩持续1回合，可承受最大生命值10%伤害"
@@ -21,7 +21,7 @@ local skill = {
 		["desc"]="巨剑连斩：每一次攻击的伤害将增加50%"
 	},
 	[4300120]={
-		["desc"]="霜冻剑舞：额外造成1次伤害并给敌人1回合冰霜效果（普攻次数-1）"
+		["desc"]="霜冻剑舞：造成1次大量伤害并给敌人1回合冰霜效果（普攻次数-1）"
 	}
 }
 local config = {

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

@@ -1,231 +1,231 @@
 local skill_rogue = {
 	[1]={
-		["desc"]="全局攻击力+{0}"
+		["desc"]="全局攻击力+<color=#3cff28>{0}</color>"
 	},
 	[2]={
-		["desc"]="全局攻击力+{0}"
+		["desc"]="全局攻击力+<color=#3cff28>{0}</color>"
 	},
 	[3]={
-		["desc"]="全局攻击力+{0}"
+		["desc"]="全局攻击力+<color=#3cff28>{0}</color>"
 	},
 	[4]={
-		["desc"]="红色攻击+{0}"
+		["desc"]="红色攻击+<color=#3cff28>{0}</color>"
 	},
 	[5]={
-		["desc"]="红色攻击+{0}"
+		["desc"]="红色攻击+<color=#3cff28>{0}</color>"
 	},
 	[6]={
-		["desc"]="红色攻击+{0}"
+		["desc"]="红色攻击+<color=#3cff28>{0}</color>"
 	},
 	[7]={
-		["desc"]="黄色攻击+{0}"
+		["desc"]="黄色攻击+<color=#3cff28>{0}</color>"
 	},
 	[8]={
-		["desc"]="黄色攻击+{0}"
+		["desc"]="黄色攻击+<color=#3cff28>{0}</color>"
 	},
 	[9]={
-		["desc"]="黄色攻击+{0}"
+		["desc"]="黄色攻击+<color=#3cff28>{0}</color>"
 	},
 	[10]={
-		["desc"]="绿色攻击+{0}"
+		["desc"]="绿色攻击+<color=#3cff28>{0}</color>"
 	},
 	[11]={
-		["desc"]="绿色攻击+{0}"
+		["desc"]="绿色攻击+<color=#3cff28>{0}</color>"
 	},
 	[12]={
-		["desc"]="绿色攻击+{0}"
+		["desc"]="绿色攻击+<color=#3cff28>{0}</color>"
 	},
 	[13]={
-		["desc"]="蓝色攻击+{0}"
+		["desc"]="蓝色攻击+<color=#3cff28>{0}</color>"
 	},
 	[14]={
-		["desc"]="蓝色攻击+{0}"
+		["desc"]="蓝色攻击+<color=#3cff28>{0}</color>"
 	},
 	[15]={
-		["desc"]="蓝色攻击+{0}"
+		["desc"]="蓝色攻击+<color=#3cff28>{0}</color>"
 	},
 	[16]={
-		["desc"]="紫色攻击+{0}"
+		["desc"]="紫色攻击+<color=#3cff28>{0}</color>"
 	},
 	[17]={
-		["desc"]="紫色攻击+{0}"
+		["desc"]="紫色攻击+<color=#3cff28>{0}</color>"
 	},
 	[18]={
-		["desc"]="紫色攻击+{0}"
+		["desc"]="紫色攻击+<color=#3cff28>{0}</color>"
 	},
 	[19]={
-		["desc"]="角色血量低于50%时所有伤害增加40%"
+		["desc"]="角色血量低于50%时所有伤害增加<color=#3cff28>40%</color>"
 	},
 	[20]={
-		["desc"]="获得经验+5%"
+		["desc"]="获得经验+<color=#3cff28>5%</color>"
 	},
 	[21]={
-		["desc"]="最大生命值+{0}"
+		["desc"]="最大生命值+<color=#3cff28>{0}</color>"
 	},
 	[22]={
-		["desc"]="最大生命值+{0}"
+		["desc"]="最大生命值+<color=#3cff28>{0}</color>"
 	},
 	[23]={
-		["desc"]="最大生命值+{0}"
+		["desc"]="最大生命值+<color=#3cff28>{0}</color>"
 	},
 	[24]={
-		["desc"]="回合开始前生命值恢复1%"
+		["desc"]="回合开始前生命值恢复<color=#3cff28>1%</color>"
 	},
 	[25]={
-		["desc"]="生命值恢复效果提升5%"
+		["desc"]="生命值恢复效果提升<color=#3cff28>5%</color>"
 	},
 	[26]={
-		["desc"]="格挡概率增加5%"
+		["desc"]="格挡概率增加<color=#3cff28>5%</color>"
 	},
 	[27]={
-		["desc"]="暴击率+4%"
+		["desc"]="暴击率+<color=#3cff28>4%</color>"
 	},
 	[28]={
-		["desc"]="受到伤害降低5%"
+		["desc"]="受到伤害降低<color=#3cff28>5%</color>"
 	},
 	[29]={
-		["desc"]="角色血量恢复5%"
+		["desc"]="角色血量恢复<color=#3cff28>5%</color>"
 	},
 	[30]={
-		["desc"]="将场上随机2个非红色元素变为红色"
+		["desc"]="将场上随机<color=#3cff28>2</color>个非红色元素变为红色"
 	},
 	[31]={
-		["desc"]="将场上随机4个非红色元素变为红色"
+		["desc"]="将场上随机<color=#3cff28>4</color>个非红色元素变为红色"
 	},
 	[32]={
-		["desc"]="将场上随机5个非红色元素变为红色"
+		["desc"]="将场上随机<color=#3cff28>5</color>个非红色元素变为红色"
 	},
 	[33]={
-		["desc"]="将场上随机2个非黄色元素变为黄色"
+		["desc"]="将场上随机<color=#3cff28>2</color>个非黄色元素变为黄色"
 	},
 	[34]={
-		["desc"]="将场上随机4个非黄色元素变为黄色"
+		["desc"]="将场上随机<color=#3cff28>4</color>个非黄色元素变为黄色"
 	},
 	[35]={
-		["desc"]="将场上随机5个非黄色元素变为黄色"
+		["desc"]="将场上随机<color=#3cff28>5</color>个非黄色元素变为黄色"
 	},
 	[36]={
-		["desc"]="将场上随机2个非绿色元素变为绿色"
+		["desc"]="将场上随机<color=#3cff28>2</color>个非绿色元素变为绿色"
 	},
 	[37]={
-		["desc"]="将场上随机4个非绿色元素变为绿色"
+		["desc"]="将场上随机<color=#3cff28>4</color>个非绿色元素变为绿色"
 	},
 	[38]={
-		["desc"]="将场上随机5个非绿色元素变为绿色"
+		["desc"]="将场上随机<color=#3cff28>5</color>个非绿色元素变为绿色"
 	},
 	[39]={
-		["desc"]="将场上随机2个非蓝色元素变为蓝色"
+		["desc"]="将场上随机<color=#3cff28>2</color>个非蓝色元素变为蓝色"
 	},
 	[40]={
-		["desc"]="将场上随机4个非蓝色元素变为蓝色"
+		["desc"]="将场上随机<color=#3cff28>4</color>个非蓝色元素变为蓝色"
 	},
 	[41]={
-		["desc"]="将场上随机5个非蓝色元素变为蓝色"
+		["desc"]="将场上随机<color=#3cff28>5</color>个非蓝色元素变为蓝色"
 	},
 	[42]={
-		["desc"]="将场上随机2个非紫色元素变为紫色"
+		["desc"]="将场上随机<color=#3cff28>2</color>个非紫色元素变为紫色"
 	},
 	[43]={
-		["desc"]="将场上随机4个非紫色元素变为紫色"
+		["desc"]="将场上随机<color=#3cff28>4</color>个非紫色元素变为紫色"
 	},
 	[44]={
-		["desc"]="将场上随机5个非紫色元素变为紫色"
+		["desc"]="将场上随机<color=#3cff28>5</color>个非紫色元素变为紫色"
 	},
 	[200100]={
-		["desc"]="长枪突刺：将上下2格元素进行消除"
+		["desc"]="长枪突刺：阿斯克可造成<color=#3cff28>1</color>次巨量伤害"
 	},
 	[200101]={
-		["desc"]="长枪突刺可上下多消1格"
+		["desc"]="长枪突刺可<color=#3cff28>恢复生命</color>"
 	},
 	[200102]={
-		["desc"]="跟长枪突刺连接线上的元素伤害增加10%"
+		["desc"]="长枪突刺<color=#3cff28>伤害提升</color>"
 	},
 	[200103]={
-		["desc"]="连接长枪突刺每次攻击有10%概率眩晕对手1回合。"
+		["desc"]="长枪突刺有<color=#3cff28>30%</color>概率眩晕对手<color=#3cff28>1</color>回合"
 	},
 	[200200]={
-		["desc"]="拔刀斩：卡拉可造成大量伤害"
+		["desc"]="拔刀斩：卡拉可造成<color=#3cff28>1</color>次巨量伤害"
 	},
 	[200201]={
-		["desc"]="拔刀斩被连接时其上下左右4个元素变为金色元素"
+		["desc"]="拔刀斩<color=#3cff28>伤害提升</color>"
 	},
 	[200202]={
-		["desc"]="跟拔刀斩连接线上的元素伤害增加10%"
+		["desc"]="拔刀斩释放时上下左右各消除<color=#3cff28>1</color>格"
 	},
 	[200203]={
-		["desc"]="拔刀斩终结技可放2次"
+		["desc"]="拔刀斩终结技可放<color=#3cff28>2</color>次"
 	},
 	[200300]={
-		["desc"]="元素链接：随机额外消除2个元素"
+		["desc"]="元素链接：随机额外消除<color=#3cff28>3</color>个元素"
 	},
 	[200301]={
-		["desc"]="元素链接可与任何颜色链接"
+		["desc"]="元素链接随机消除元素增加<color=#3cff28>2</color>个"
 	},
 	[200302]={
-		["desc"]="被元素链接技能消除的元素造成的伤害提升10%"
+		["desc"]="被元素链接技能消除的元素造成的伤害提升<color=#3cff28>10%</color>"
 	},
 	[200303]={
-		["desc"]="元素链接随机消除元素增加2个"
+		["desc"]="元素链接随机消除元素增加<color=#3cff28>2</color>个"
 	},
 	[200400]={
-		["desc"]="魔法罩：艾伦可生成一个魔法罩持续1回合"
+		["desc"]="魔法罩：艾伦可生成一个魔法罩持续<color=#3cff28>1</color>回合"
 	},
 	[200401]={
-		["desc"]="魔法罩可与任何颜色链接"
+		["desc"]="增加魔法罩承受<color=#3cff28>伤害增加</color>。"
 	},
 	[200402]={
-		["desc"]="增加魔法罩承受伤害10%"
+		["desc"]="生成的魔法罩如果没有破可以额外持续<color=#3cff28>1</color>回合"
 	},
 	[200403]={
-		["desc"]="生成的魔法罩如果没有破可以额外持续1回合"
+		["desc"]="魔法罩存在时可反伤对方造成<color=#3cff28>400%伤害</color>"
 	},
 	[200500]={
-		["desc"]="舞步消散：将左右2格元素进行消除"
+		["desc"]="舞步消散：将左右<color=#3cff28>2</color>格元素进行消除"
 	},
 	[200501]={
-		["desc"]="舞步消散左右可多消1格"
+		["desc"]="舞步消散左右可多消<color=#3cff28>1</color>格"
 	},
 	[200502]={
-		["desc"]="跟舞步消散连接线上的元素伤害增加10%"
+		["desc"]="跟舞步消散连接线上的元素伤害增加<color=#3cff28>10%</color>"
 	},
 	[200503]={
-		["desc"]="每有1个元素连接舞步消散则本回合格挡增加2%"
+		["desc"]="每有1个元素连接舞步消散则本回合格挡增加<color=#3cff28>2%</color>"
 	},
 	[200600]={
-		["desc"]="快速治愈：艾芙琳可恢复80%攻击力的生命值"
+		["desc"]="快速治愈：艾芙琳可恢复<color=#3cff28>80%</color>攻击力的生命值"
 	},
 	[200601]={
-		["desc"]="快速治愈可与任何元素连接"
+		["desc"]="快速治愈的<color=#3cff28>恢复量提升</color>"
 	},
 	[200602]={
-		["desc"]="跟快速治愈连接线上的元素伤害增加10%"
+		["desc"]="跟快速治愈连接线上的元素伤害增加<color=#3cff28>10%</color>"
 	},
 	[200603]={
-		["desc"]="连接快速治愈的每一击都将恢复2%生命值"
+		["desc"]="连接快速治愈的每一击都将恢复<color=#3cff28>2%</color>生命值"
 	},
 	[200700]={
-		["desc"]="巨剑连斩：每一次攻击的伤害将增加50%"
+		["desc"]="巨剑连斩：每一次攻击的伤害将增加<color=#3cff28>50%</color>"
 	},
 	[200701]={
-		["desc"]="巨剑连斩被连接时其上下左右4个元素变为金色元素"
+		["desc"]="巨剑连被连接消除其上下左右<color=#3cff28>4</color>个元素"
 	},
 	[200702]={
-		["desc"]="跟巨剑连斩连接线上的元素伤害增加10%"
+		["desc"]="跟巨剑连斩连接线上的元素伤害增加<color=#3cff28>10%</color>"
 	},
 	[200703]={
-		["desc"]="巨剑连斩被连接时周围8格元素变为金色元素"
+		["desc"]="巨剑连斩被连接消除其斜方向的<color=#3cff28>4</color>个元素"
 	},
 	[200800]={
-		["desc"]="霜冻剑舞：白发凯瑟琳可额外造成1次伤害并给敌人1回合冰霜效果（普攻次数-1）"
+		["desc"]="霜冻剑舞：白发凯瑟琳可额外造成<color=#3cff28>1</color>次伤害并给敌人<color=#3cff28>1</color>回合冰霜效果（普攻次数-1）"
 	},
 	[200801]={
-		["desc"]="霜冻剑舞被使用时可消除掉其上下左右4个元素"
+		["desc"]="霜冻剑舞被使用时可消除掉其上下左右<color=#3cff28>4</color>个元素"
 	},
 	[200802]={
-		["desc"]="跟霜冻剑舞连接线上的元素伤害增加10%"
+		["desc"]="跟霜冻剑舞连接线上的元素伤害增加<color=#3cff28>10%</color>"
 	},
 	[200803]={
-		["desc"]="霜冻剑舞造成的冰霜效果将持续2回合"
+		["desc"]="霜冻剑舞造成的冰霜效果将持续<color=#3cff28>2</color>回合"
 	}
 }
 local config = {

lua/app/ui/currency_bar/cell/currency_cell.lua

@@ -35,11 +35,12 @@ function ResourceCell:show(itemId, hideAddImg)
 
 	self.timeTx:setVisible(false)
 	self.itemId = itemId
-	if itemId == GConst.ItemConst.ITEM_ID_GOLD then
+	-- if itemId == GConst.ItemConst.ITEM_ID_GOLD then
-		self.addImg:setVisible(not hideAddImg)
+	-- 	self.addImg:setVisible(not hideAddImg)
-	else
+	-- else
-		self.addImg:setVisible(not hideAddImg)
+	-- 	self.addImg:setVisible(not hideAddImg)
-	end
+	-- end
+	self.addImg:setVisible(false) -- 没有来源，直接隐藏
 end
 
 function ResourceCell:updateTime()