更新配置和优化

lua/app/common/time.lua

@@ -246,6 +246,25 @@ function Time:formatNumTimeStr(time)
     end
 end
 
+-- 大于1小时显示：X时前 globalkey:TIME_BEFORE_STR_H 小于1小时显示：X分钟前 globalkey:TIME_BEFORE_STR_M 小于1分钟显示：1分钟前
+function Time:formatBeforeTimeStr(time)
+    local passTime = Time:getServerTime() - time
+    if passTime <= 0 then
+        return GConst.EMPTY_STRING
+    end
+
+    local hour = math.floor(passTime // SECONDS_PRE_HOUR)
+    if hour >= 1 then -- 大于1小时显示：X时前
+        return I18N:getGlobalText(I18N.GlobalConst.TIME_BEFORE_STR_H, hour)
+    else
+        if passTime < SECONDS_PRE_MINUTE then
+            passTime = SECONDS_PRE_MINUTE
+        end
+        local min = math.floor(passTime // SECONDS_PRE_MINUTE)
+        return I18N:getGlobalText(I18N.GlobalConst.TIME_BEFORE_STR_M, min)
+    end
+end
+
 ---- 得到time周开始时的时间戳
 function Time:getWeekBeginTimeStamp(time)
     time = time or self:getServerTime()

lua/app/config/localization/localization_global_const.lua

@@ -347,6 +347,9 @@ local LocalizationGlobalConst =
 	COLLECTION_DESC_9 = "COLLECTION_DESC_9",
 	COLLECTION_DESC_10 = "COLLECTION_DESC_10",
 	COLLECTION_DESC_11 = "COLLECTION_DESC_11",
+	COLLECTION_DESC_12 = "COLLECTION_DESC_12",
+	TIME_BEFORE_STR_H = "TIME_BEFORE_STR_H",
+	TIME_BEFORE_STR_M = "TIME_BEFORE_STR_M",
 }
 
 return LocalizationGlobalConst

lua/app/config/monster_base.lua

@@ -519,6 +519,31 @@ local monster_base = {
 		["body"]=1,
 		["model_ui"]=1.0
 	},
+	[20039]={
+		["model_id"]="m20034",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20040]={
+		["model_id"]="m20035",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20041]={
+		["model_id"]="m20036",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20042]={
+		["model_id"]="m20037",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
+	[20043]={
+		["model_id"]="m20038",
+		["body"]=1,
+		["model_ui"]=1.0
+	},
 	[30001]={
 		["model_id"]="p0001",
 		["body"]=2,
@@ -646,6 +671,6 @@ local monster_base = {
 	}
 }
 local config = {
-data=monster_base,count=129
+data=monster_base,count=134
 }
 return config

lua/app/config/monster_dungeon_armor.lua.meta

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

lua/app/config/monster_dungeon_equip.lua

@@ -0,0 +1,102 @@
+local monster_dungeon_equip = {
+	[106]={
+		["monster_base"]=20039,
+		["hp"]=240000000,
+		["atk"]=1590000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30114,
+			30115,
+			30116
+		},
+		["skill"]={
+			10085
+		},
+		["passive_skill"]={
+			10008
+		},
+		["monster_exp"]=310000
+	},
+	[206]={
+		["monster_base"]=20040,
+		["hp"]=240000000,
+		["atk"]=1590000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30117,
+			30118,
+			30119
+		},
+		["skill"]={
+			10087
+		},
+		["passive_skill"]={
+			10009,
+			10086
+		},
+		["monster_exp"]=310000
+	},
+	[306]={
+		["monster_base"]=20041,
+		["hp"]=240000000,
+		["atk"]=1590000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30120,
+			30121,
+			30122
+		},
+		["skill"]={
+			10088,
+			10089
+		},
+		["passive_skill"]={
+			10010,
+			10090
+		},
+		["monster_exp"]=310000
+	},
+	[406]={
+		["monster_base"]=20042,
+		["hp"]=240000000,
+		["atk"]=1590000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30123,
+			30124,
+			30125
+		},
+		["skill"]={
+			10091,
+			10092
+		},
+		["passive_skill"]={
+			10011
+		},
+		["monster_exp"]=310000
+	},
+	[506]={
+		["monster_base"]=20043,
+		["hp"]=240000000,
+		["atk"]=1590000,
+		["atk_times"]=4,
+		["hurt_skill"]={
+			30126,
+			30127,
+			30128
+		},
+		["skill"]={
+			10094,
+			10095
+		},
+		["passive_skill"]={
+			10012,
+			10093
+		},
+		["monster_exp"]=310000
+	}
+}
+local config = {
+data=monster_dungeon_equip,count=5
+}
+return config

lua/app/config/monster_dungeon_equip.lua.meta

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

lua/app/config/skill.lua

@@ -9728,6 +9728,230 @@ local skill = {
 		["cd"]=0,
 		["cd_start"]=0
 	},
+	[10085]={
+		["skill_type"]=5,
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=20000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="weaken",
+				["num"]=2500,
+				["ratio"]=10000,
+				["round"]=3
+			}
+		},
+		["obj"]=2,
+		["cd"]=3,
+		["cd_start"]=0,
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["sound_hit"]={
+			10033
+		},
+		["name_act"]="skill01",
+		["fx_self"]=200020
+	},
+	[10086]={
+		["effect_type"]=2,
+		["trigger"]=5,
+		["effect"]={
+			{
+				["type"]="atkp_add",
+				["num"]=100,
+				["ratio"]=10000,
+				["round"]=999
+			}
+		},
+		["obj"]=1,
+		["cd"]=0,
+		["cd_start"]=0
+	},
+	[10087]={
+		["skill_type"]=6,
+		["skill_type_parameter"]={
+			1
+		},
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=20000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["cd"]=2,
+		["cd_start"]=0,
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["sound_hit"]={
+			10058
+		},
+		["name_act"]="skill01",
+		["fx_self"]=200146
+	},
+	[10088]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="heal",
+				["num"]=200000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1,
+		["cd"]=3,
+		["cd_start"]=0,
+		["sound_hit"]={
+			10058
+		},
+		["name_act"]="skill01"
+	},
+	[10089]={
+		["skill_type"]=3,
+		["skill_type_parameter"]={
+			23,
+			1
+		},
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=20000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["cd"]=3,
+		["cd_start"]=2,
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["sound_hit"]={
+			10058
+		},
+		["name_act"]="skill01"
+	},
+	[10090]={
+		["effect_type"]=2,
+		["trigger"]=3,
+		["effect"]={
+			{
+				["type"]="heal",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=1
+			}
+		},
+		["obj"]=1,
+		["cd"]=0,
+		["cd_start"]=0
+	},
+	[10091]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="shield_ice",
+				["num"]=1500,
+				["ratio"]=10000,
+				["round"]=3
+			}
+		},
+		["obj"]=1,
+		["cd"]=3,
+		["cd_start"]=0,
+		["name_act"]="skill01"
+	},
+	[10092]={
+		["skill_type"]=3,
+		["skill_type_parameter"]={
+			5,
+			3
+		},
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=20000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["cd"]=3,
+		["cd_start"]=2,
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["name_act"]="skill01"
+	},
+	[10093]={
+		["effect_type"]=2,
+		["trigger"]=2,
+		["effect"]={
+			{
+				["type"]="invincible_shield",
+				["num"]=5,
+				["ratio"]=10000,
+				["round"]=999
+			}
+		},
+		["obj"]=1,
+		["cd"]=0,
+		["cd_start"]=0,
+		["shake_time"]=0,
+		["shake_type"]=0
+	},
+	[10094]={
+		["skill_type"]=9,
+		["skill_type_parameter"]={
+			10000
+		},
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=20000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["cd"]=3,
+		["cd_start"]=2,
+		["shake_time"]=200,
+		["shake_type"]=6,
+		["name_act"]="skill01"
+	},
+	[10095]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="invincible_shield",
+				["num"]=5,
+				["ratio"]=10000,
+				["round"]=999
+			}
+		},
+		["obj"]=1,
+		["cd"]=3,
+		["cd_start"]=3,
+		["name_act"]="skill01"
+	},
 	[20001]={
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -17226,6 +17450,402 @@ local skill = {
 		["name_act"]="attack04",
 		["fx_self"]=200131
 	},
+	[30114]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="burn",
+				["num"]=5000,
+				["ratio"]=5000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000013
+		},
+		["name_act"]="attack01",
+		["fx_self"]=200142
+	},
+	[30115]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="bleed",
+				["num"]=3500,
+				["ratio"]=5000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000013
+		},
+		["name_act"]="attack02",
+		["fx_self"]=200143
+	},
+	[30116]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="poison",
+				["num"]=2500,
+				["ratio"]=5000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
+	[30117]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
+	[30118]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
+	[30119]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
+	[30120]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
+	[30121]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
+	[30122]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
+	[30123]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="normal_attack_dec",
+				["num"]=2,
+				["ratio"]=5000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
+	[30124]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="normal_attack_dec",
+				["num"]=2,
+				["ratio"]=5000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
+	[30125]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			},
+			{
+				["type"]="normal_attack_dec",
+				["num"]=2,
+				["ratio"]=5000,
+				["round"]=2
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
+	[30126]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
+	[30127]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
+	[30128]={
+		["effect_type"]=1,
+		["trigger"]=1,
+		["effect"]={
+			{
+				["type"]="hurt",
+				["num"]=10000,
+				["ratio"]=10000,
+				["round"]=0
+			}
+		},
+		["obj"]=2,
+		["skill_position"]={
+			2,
+			0
+		},
+		["shake_time"]=100,
+		["shake_type"]=1,
+		["sound_hit"]={
+			1000014
+		},
+		["name_act"]="attack03",
+		["fx_self"]=200144
+	},
 	[40001]={
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -22152,6 +22772,6 @@ local skill = {
 	}
 }
 local config = {
-data=skill,count=807
+data=skill,count=833
 }
 return config

lua/app/config/strings/cn/buff.lua

@@ -166,6 +166,12 @@ local buff = {
 		["id"]=75,
 		["desc"]="冰霜护盾：可承受最大生命值{0}的伤害，反弹400%对方伤害。",
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["show_name"]="意念护盾",
+		["desc"]="意念护盾：护盾存在时不会受到任何伤害，每被攻击命中1次将扣除1层护盾。",
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -199,12 +205,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

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

@@ -347,6 +347,9 @@ local localization_global =
     ["COLLECTION_DESC_9"] = "请领取当前奖励",
     ["COLLECTION_DESC_10"] = "收集奖励",
     ["COLLECTION_DESC_11"] = "帮助",
+    ["COLLECTION_DESC_12"] = "再升一级可领取",
+    ["TIME_BEFORE_STR_H"] = "{0}小时前",
+    ["TIME_BEFORE_STR_M"] = "{0}分钟前",
 }
 
 return localization_global

lua/app/config/strings/cn/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+		["desc"]="通关时总血量高于50%"
+	},
+	[2]={
+		["desc"]="5回合内击败最终BOSS"
+	},
+	[3]={
+		["desc"]="通关时中回合数不大于20"
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/cn/task_dungeon_armor.lua.meta

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

lua/app/config/strings/de/buff.lua

@@ -118,6 +118,10 @@ local buff = {
 	[75]={
 		["id"]=75,
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -151,12 +155,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

lua/app/config/strings/de/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/de/task_dungeon_armor.lua.meta

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

lua/app/config/strings/en/buff.lua

@@ -166,6 +166,10 @@ local buff = {
 		["id"]=75,
 		["desc"]="Frost Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP and reflects <color=#3cff28>400%</color> of the enemy's damage.",
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -199,12 +203,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

lua/app/config/strings/en/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/en/task_dungeon_armor.lua.meta

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

lua/app/config/strings/es/buff.lua

@@ -166,6 +166,10 @@ local buff = {
 		["id"]=75,
 		["desc"]="Escudo de Escarcha: soporta daño de <color=#3cff28>{0}</color> del HP máximo, y rebota <color=#3cff28>400%</color> del daño del rival.",
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -199,12 +203,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

lua/app/config/strings/es/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/es/task_dungeon_armor.lua.meta

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

lua/app/config/strings/fr/buff.lua

@@ -118,6 +118,10 @@ local buff = {
 	[75]={
 		["id"]=75,
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -151,12 +155,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

lua/app/config/strings/fr/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/fr/task_dungeon_armor.lua.meta

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

lua/app/config/strings/id/buff.lua

@@ -166,6 +166,10 @@ local buff = {
 		["id"]=75,
 		["desc"]="Perisai Frost: Menerima hingga <color=#3cff28>{0}</color> DMG HP maksimum, dan memantulkan <color=#3cff28>400%</color> DMG musuh.",
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -199,12 +203,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

lua/app/config/strings/id/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/id/task_dungeon_armor.lua.meta

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

lua/app/config/strings/ja/buff.lua

@@ -166,6 +166,10 @@ local buff = {
 		["id"]=75,
 		["desc"]="アイスシールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化し、<color=#3cff28>400%</color>のダメージを反射する。",
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -199,12 +203,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

lua/app/config/strings/ja/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/ja/task_dungeon_armor.lua.meta

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

lua/app/config/strings/ko/buff.lua

@@ -166,6 +166,10 @@ local buff = {
 		["id"]=75,
 		["desc"]="서리 보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수하며 상대가 준 대미지의 <color=#3cff28>400%</color>를 되돌려줍니다.",
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -199,12 +203,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

lua/app/config/strings/ko/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/ko/task_dungeon_armor.lua.meta

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

lua/app/config/strings/pt/buff.lua

@@ -166,6 +166,10 @@ local buff = {
 		["id"]=75,
 		["desc"]="Escudo Gélido: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima e reflete <color=#3cff28>400%</color> do dano do oponente.",
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -199,12 +203,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

lua/app/config/strings/pt/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/pt/task_dungeon_armor.lua.meta

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

lua/app/config/strings/ru/buff.lua

@@ -118,6 +118,10 @@ local buff = {
 	[75]={
 		["id"]=75,
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -151,12 +155,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

lua/app/config/strings/ru/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/ru/task_dungeon_armor.lua.meta

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

lua/app/config/strings/th/buff.lua

@@ -166,6 +166,10 @@ local buff = {
 		["id"]=75,
 		["desc"]="โล่ฟรอสต์: สามารถรับดาเมจของ HP สูงสุด<color=#3cff28>{0}</color> และสะท้อนดาเมจของฝ่ายตรงข้าม<color=#3cff28>400%</color>",
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -199,12 +203,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

lua/app/config/strings/th/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/th/task_dungeon_armor.lua.meta

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

lua/app/config/strings/vi/buff.lua

@@ -166,6 +166,10 @@ local buff = {
 		["id"]=75,
 		["desc"]="Khiên Băng Sương: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa, phản đòn <color=#3cff28>400%</color> sát thương lên đối phương.",
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -199,12 +203,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

lua/app/config/strings/vi/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/vi/task_dungeon_armor.lua.meta

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

lua/app/config/strings/zh/buff.lua

@@ -166,6 +166,10 @@ local buff = {
 		["id"]=75,
 		["desc"]="冰霜護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害，反彈<color=#3cff28>400%</color>敵方傷害。",
 		["name"]="shield_ice_rebound_400"
+	},
+	[79]={
+		["id"]=79,
+		["name"]="invincible_shield"
 	}
 }
 local keys = {
@@ -199,12 +203,13 @@ local keys = {
 		["thorns"]=buff[63],
 		["shield_rebound_400"]=buff[73],
 		["shield_ice"]=buff[74],
-		["shield_ice_rebound_400"]=buff[75]
+		["shield_ice_rebound_400"]=buff[75],
+		["invincible_shield"]=buff[79]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=30
+count=31
 }
 return config

lua/app/config/strings/zh/task_dungeon_armor.lua

@@ -0,0 +1,15 @@
+local task_dungeon_armor = {
+	[1]={
+
+	},
+	[2]={
+
+	},
+	[3]={
+
+	}
+}
+local config = {
+data=task_dungeon_armor,count=3
+}
+return config

lua/app/config/strings/zh/task_dungeon_armor.lua.meta

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

lua/app/ui/arena/arena_recent_battle_ui.lua

@@ -113,6 +113,11 @@ function ArenaRecentBattleUI:refreshRecord(obj, info)
 			uiMap["tx_result"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_18))
 		end
 	end
+
+	local timeObj = uiMap["tx_time"]
+	local time = GFunc.formatTimeStep(info.occur_at)
+	time = Time:getServerTime() - 1080
+	timeObj:setText(Time:formatBeforeTimeStr(time))
 end
 
 return ArenaRecentBattleUI

lua/app/ui/tips/base_tips.lua

@@ -105,22 +105,31 @@ function BaseTips:adaptWhenOverScreen(node, pivotX, pivotY)
     local rightX = anchoredPos.x + sizeDelta.x * (1 - pivotX)
     local topY = anchoredPos.y + sizeDelta.y * (1 - pivotY)
     local bottomY = anchoredPos.y - sizeDelta.y * (pivotY - 0)
+
+    local xOffset = 0
+    local yOffset = 0
     -- 左边超出屏幕
     if math.abs(leftX) > halfWidth then
         node:addAnchoredPosition(math.abs(leftX) - halfWidth, 0)
+        xOffset = math.abs(leftX) - halfWidth
     end
     -- 右边超出屏幕
     if math.abs(rightX) > halfWidth then
         node:addAnchoredPosition(halfWidth - math.abs(rightX), 0)
+        xOffset = xOffset + math.abs(leftX) - halfWidth
     end
     -- 上边超出屏幕
     if math.abs(topY) > halfHeight then
         node:addAnchoredPosition(0, halfHeight - math.abs(topY))
+        yOffset = halfHeight - math.abs(topY)
     end
     -- 下边超出屏幕
     if math.abs(bottomY) > halfHeight then
         node:addAnchoredPosition(0, math.abs(bottomY) - halfHeight)
+        yOffset = yOffset + math.abs(bottomY) - halfHeight
     end
+
+    return xOffset, yOffset
 end
 
 function BaseTips:finalSetPos(node)

lua/app/ui/tips/formation_tips.lua

@@ -19,6 +19,7 @@ function FormationTips:init()
 	local uiMap = self.root:genAllChildren()
     self.bg = uiMap["formation_tips.bg.bg"]
     self.heroFormation = uiMap["formation_tips.bg.hero_formation_comp"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_FORMATION_COMP)
+	self.arrow = uiMap["formation_tips.bg.bg.arrow"]
 end
 
 function FormationTips:onLoadRootComplete()
@@ -52,4 +53,11 @@ function FormationTips:onClose()
 	end
 end
 
+function FormationTips:adaptWhenOverScreen(...)
+	local xOffset, _ = BaseTips.adaptWhenOverScreen(self, ...)
+	if self.arrow then
+		self.arrow:setAnchoredPositionX(110 - xOffset)
+	end
+end
+
 return FormationTips