From de04cbc6fffdb4dc2e7bbc1a5b7cbdc81622540d Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 17 Jul 2023 17:21:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE=E5=92=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/time.lua | 19 + .../localization_global_const.lua | 3 + lua/app/config/monster_base.lua | 27 +- lua/app/config/monster_dungeon_armor.lua | 1483 +++++++++++++++++ lua/app/config/monster_dungeon_armor.lua.meta | 10 + lua/app/config/monster_dungeon_equip.lua | 102 ++ lua/app/config/monster_dungeon_equip.lua.meta | 10 + lua/app/config/skill.lua | 622 ++++++- lua/app/config/strings/cn/buff.lua | 11 +- lua/app/config/strings/cn/global.lua | 3 + .../config/strings/cn/task_dungeon_armor.lua | 15 + .../strings/cn/task_dungeon_armor.lua.meta | 10 + lua/app/config/strings/de/buff.lua | 9 +- .../config/strings/de/task_dungeon_armor.lua | 15 + .../strings/de/task_dungeon_armor.lua.meta | 10 + lua/app/config/strings/en/buff.lua | 9 +- .../config/strings/en/task_dungeon_armor.lua | 15 + .../strings/en/task_dungeon_armor.lua.meta | 10 + lua/app/config/strings/es/buff.lua | 9 +- .../config/strings/es/task_dungeon_armor.lua | 15 + .../strings/es/task_dungeon_armor.lua.meta | 10 + lua/app/config/strings/fr/buff.lua | 9 +- .../config/strings/fr/task_dungeon_armor.lua | 15 + .../strings/fr/task_dungeon_armor.lua.meta | 10 + lua/app/config/strings/id/buff.lua | 9 +- .../config/strings/id/task_dungeon_armor.lua | 15 + .../strings/id/task_dungeon_armor.lua.meta | 10 + lua/app/config/strings/ja/buff.lua | 9 +- .../config/strings/ja/task_dungeon_armor.lua | 15 + .../strings/ja/task_dungeon_armor.lua.meta | 10 + lua/app/config/strings/ko/buff.lua | 9 +- .../config/strings/ko/task_dungeon_armor.lua | 15 + .../strings/ko/task_dungeon_armor.lua.meta | 10 + lua/app/config/strings/pt/buff.lua | 9 +- .../config/strings/pt/task_dungeon_armor.lua | 15 + .../strings/pt/task_dungeon_armor.lua.meta | 10 + lua/app/config/strings/ru/buff.lua | 9 +- .../config/strings/ru/task_dungeon_armor.lua | 15 + .../strings/ru/task_dungeon_armor.lua.meta | 10 + lua/app/config/strings/th/buff.lua | 9 +- .../config/strings/th/task_dungeon_armor.lua | 15 + .../strings/th/task_dungeon_armor.lua.meta | 10 + lua/app/config/strings/vi/buff.lua | 9 +- .../config/strings/vi/task_dungeon_armor.lua | 15 + .../strings/vi/task_dungeon_armor.lua.meta | 10 + lua/app/config/strings/zh/buff.lua | 9 +- .../config/strings/zh/task_dungeon_armor.lua | 15 + .../strings/zh/task_dungeon_armor.lua.meta | 10 + lua/app/ui/arena/arena_recent_battle_ui.lua | 5 + lua/app/ui/tips/base_tips.lua | 9 + lua/app/ui/tips/formation_tips.lua | 8 + 51 files changed, 2717 insertions(+), 28 deletions(-) create mode 100644 lua/app/config/monster_dungeon_armor.lua create mode 100644 lua/app/config/monster_dungeon_armor.lua.meta create mode 100644 lua/app/config/monster_dungeon_equip.lua create mode 100644 lua/app/config/monster_dungeon_equip.lua.meta create mode 100644 lua/app/config/strings/cn/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/cn/task_dungeon_armor.lua.meta create mode 100644 lua/app/config/strings/de/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/de/task_dungeon_armor.lua.meta create mode 100644 lua/app/config/strings/en/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/en/task_dungeon_armor.lua.meta create mode 100644 lua/app/config/strings/es/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/es/task_dungeon_armor.lua.meta create mode 100644 lua/app/config/strings/fr/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/fr/task_dungeon_armor.lua.meta create mode 100644 lua/app/config/strings/id/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/id/task_dungeon_armor.lua.meta create mode 100644 lua/app/config/strings/ja/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/ja/task_dungeon_armor.lua.meta create mode 100644 lua/app/config/strings/ko/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/ko/task_dungeon_armor.lua.meta create mode 100644 lua/app/config/strings/pt/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/pt/task_dungeon_armor.lua.meta create mode 100644 lua/app/config/strings/ru/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/ru/task_dungeon_armor.lua.meta create mode 100644 lua/app/config/strings/th/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/th/task_dungeon_armor.lua.meta create mode 100644 lua/app/config/strings/vi/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/vi/task_dungeon_armor.lua.meta create mode 100644 lua/app/config/strings/zh/task_dungeon_armor.lua create mode 100644 lua/app/config/strings/zh/task_dungeon_armor.lua.meta diff --git a/lua/app/common/time.lua b/lua/app/common/time.lua index ea3a7b6e..bf0b8bf6 100644 --- a/lua/app/common/time.lua +++ b/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() diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 2fef0ca7..32d258e7 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua index 0abe7abe..44f9a8f1 100644 --- a/lua/app/config/monster_base.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/monster_dungeon_armor.lua b/lua/app/config/monster_dungeon_armor.lua new file mode 100644 index 00000000..a888699d --- /dev/null +++ b/lua/app/config/monster_dungeon_armor.lua @@ -0,0 +1,1483 @@ +local monster_dungeon_armor = { + [107]={ + ["monster_base"]=30002, + ["hp"]=75000000, + ["atk"]=780000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50027, + 50028, + 50029, + 50030 + }, + ["skill"]={ + 50031 + }, + ["passive_skill"]={ + 10010 + }, + ["monster_exp"]=57000 + }, + [207]={ + ["monster_base"]=30001, + ["hp"]=109200000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50055, + 50056, + 50057, + 50058 + }, + ["skill"]={ + 50059 + }, + ["passive_skill"]={ + 50060, + 10010 + }, + ["monster_exp"]=54000 + }, + [307]={ + ["monster_base"]=30015, + ["hp"]=170400000, + ["atk"]=1050000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50113, + 50114, + 50115, + 50116 + }, + ["skill"]={ + 50117, + 50118 + }, + ["passive_skill"]={ + 10010 + }, + ["monster_exp"]=65650 + }, + [407]={ + ["monster_base"]=30009, + ["hp"]=228000000, + ["atk"]=1380000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50012, + 50013, + 50014, + 50015 + }, + ["skill"]={ + 50016 + }, + ["passive_skill"]={ + 10010 + }, + ["monster_exp"]=78300 + }, + [507]={ + ["monster_base"]=30008, + ["hp"]=240000000, + ["atk"]=1590000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50098, + 50099, + 50100, + 50101 + }, + ["skill"]={ + 50102 + }, + ["passive_skill"]={ + 10013, + 10010 + }, + ["monster_exp"]=63050 + }, + [607]={ + ["monster_base"]=30003, + ["hp"]=90000000, + ["atk"]=810000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50082, + 50083, + 50084, + 50085 + }, + ["skill"]={ + 50086 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=57000 + }, + [707]={ + ["monster_base"]=30002, + ["hp"]=128640000, + ["atk"]=990000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50027, + 50028, + 50029, + 50030 + }, + ["skill"]={ + 50031 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=54000 + }, + [807]={ + ["monster_base"]=30006, + ["hp"]=186420000, + ["atk"]=1110000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50061, + 50062, + 50063, + 50064 + }, + ["skill"]={ + 50066 + }, + ["passive_skill"]={ + 50065, + 10011 + }, + ["monster_exp"]=65650 + }, + [907]={ + ["monster_base"]=30019, + ["hp"]=246150000, + ["atk"]=1530000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50119, + 50120, + 50121, + 50122 + }, + ["skill"]={ + 50123, + 50124 + }, + ["passive_skill"]={ + 10013, + 10011 + }, + ["monster_exp"]=78300 + }, + [1007]={ + ["monster_base"]=30011, + ["hp"]=284400000, + ["atk"]=1710000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50017, + 50018, + 50019, + 50020 + }, + ["skill"]={ + 50021 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=63050 + }, + [1107]={ + ["monster_base"]=30005, + ["hp"]=130320000, + ["atk"]=1230000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50001, + 50002, + 50003, + 50004 + }, + ["skill"]={ + 50005, + 50006 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=57000 + }, + [1207]={ + ["monster_base"]=30003, + ["hp"]=164880000, + ["atk"]=1320000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50082, + 50083, + 50084, + 50085 + }, + ["skill"]={ + 50086 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=54000 + }, + [1307]={ + ["monster_base"]=30010, + ["hp"]=250170000, + ["atk"]=1560000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50032, + 50033, + 50034, + 50035 + }, + ["skill"]={ + 50036 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=65650 + }, + [1407]={ + ["monster_base"]=30020, + ["hp"]=295440000, + ["atk"]=1890000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50067, + 50068, + 50069, + 50070 + }, + ["skill"]={ + 50071 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=78300 + }, + [1507]={ + ["monster_base"]=30023, + ["hp"]=363600000, + ["atk"]=2250000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50125, + 50126, + 50127, + 50128 + }, + ["skill"]={ + 50129 + }, + ["passive_skill"]={ + 50130, + 10012 + }, + ["monster_exp"]=63050 + }, + [1607]={ + ["monster_base"]=30004, + ["hp"]=159120000, + ["atk"]=1560000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50108, + 50109, + 50110, + 50111 + }, + ["skill"]={ + 50112 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=57000 + }, + [1707]={ + ["monster_base"]=30014, + ["hp"]=209040000, + ["atk"]=1740000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50007, + 50008, + 50009, + 50010 + }, + ["skill"]={ + 50011, + 50137 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=54000 + }, + [1807]={ + ["monster_base"]=30021, + ["hp"]=322830000, + ["atk"]=2100000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50093, + 50094, + 50095, + 50096 + }, + ["skill"]={ + 50097 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=65650 + }, + [1907]={ + ["monster_base"]=30012, + ["hp"]=440790000, + ["atk"]=2880000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50037, + 50038, + 50039, + 50040 + }, + ["skill"]={ + 50041, + 50042 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=78300 + }, + [2007]={ + ["monster_base"]=30016, + ["hp"]=477000000, + ["atk"]=3030000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50072, + 50073, + 50074, + 50075 + }, + ["skill"]={ + 50076 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=63050 + }, + [2107]={ + ["monster_base"]=30001, + ["hp"]=203040000, + ["atk"]=2040000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50055, + 50056, + 50057, + 50058 + }, + ["skill"]={ + 50059 + }, + ["passive_skill"]={ + 50060, + 10009 + }, + ["monster_exp"]=57000 + }, + [2207]={ + ["monster_base"]=30015, + ["hp"]=256320000, + ["atk"]=2190000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50113, + 50114, + 50115, + 50116 + }, + ["skill"]={ + 50117, + 50118 + }, + ["passive_skill"]={ + 10009 + }, + ["monster_exp"]=54000 + }, + [2307]={ + ["monster_base"]=30009, + ["hp"]=370770000, + ["atk"]=2460000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50012, + 50013, + 50014, + 50015 + }, + ["skill"]={ + 50016 + }, + ["passive_skill"]={ + 10009 + }, + ["monster_exp"]=65650 + }, + [2407]={ + ["monster_base"]=30022, + ["hp"]=438090000, + ["atk"]=2910000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50087, + 50088, + 50089, + 50090 + }, + ["skill"]={ + 50091, + 50092 + }, + ["passive_skill"]={ + 10009 + }, + ["monster_exp"]=78300 + }, + [2507]={ + ["monster_base"]=30017, + ["hp"]=531000000, + ["atk"]=3450000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50049, + 50050, + 50051, + 50052 + }, + ["skill"]={ + 50053, + 50054 + }, + ["passive_skill"]={ + 10013, + 10009 + }, + ["monster_exp"]=63050 + }, + [2607]={ + ["monster_base"]=30002, + ["hp"]=230400000, + ["atk"]=2370000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50027, + 50028, + 50029, + 50030 + }, + ["skill"]={ + 50031 + }, + ["passive_skill"]={ + 10010 + }, + ["monster_exp"]=57000 + }, + [2707]={ + ["monster_base"]=30006, + ["hp"]=290880000, + ["atk"]=2520000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50061, + 50062, + 50063, + 50064 + }, + ["skill"]={ + 50066 + }, + ["passive_skill"]={ + 50065, + 10010 + }, + ["monster_exp"]=54000 + }, + [2807]={ + ["monster_base"]=30019, + ["hp"]=420510000, + ["atk"]=2820000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50119, + 50120, + 50121, + 50122 + }, + ["skill"]={ + 50123, + 50124 + }, + ["passive_skill"]={ + 10013, + 10010 + }, + ["monster_exp"]=65650 + }, + [2907]={ + ["monster_base"]=30014, + ["hp"]=496800000, + ["atk"]=3360000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50007, + 50008, + 50009, + 50010 + }, + ["skill"]={ + 50011, + 50137 + }, + ["passive_skill"]={ + 10010 + }, + ["monster_exp"]=78300 + }, + [3007]={ + ["monster_base"]=30025, + ["hp"]=592200000, + ["atk"]=3930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50103, + 50104, + 50105, + 50106 + }, + ["skill"]={ + 50107 + }, + ["passive_skill"]={ + 10013, + 10010 + }, + ["monster_exp"]=63050 + }, + [3107]={ + ["monster_base"]=30021, + ["hp"]=250560000, + ["atk"]=2610000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50093, + 50094, + 50095, + 50096 + }, + ["skill"]={ + 50097 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=57000 + }, + [3207]={ + ["monster_base"]=30010, + ["hp"]=316320000, + ["atk"]=2820000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50032, + 50033, + 50034, + 50035 + }, + ["skill"]={ + 50036 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=54000 + }, + [3307]={ + ["monster_base"]=30020, + ["hp"]=457230000, + ["atk"]=3120000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50067, + 50068, + 50069, + 50070 + }, + ["skill"]={ + 50071 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=65650 + }, + [3407]={ + ["monster_base"]=30015, + ["hp"]=540000000, + ["atk"]=3690000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50113, + 50114, + 50115, + 50116 + }, + ["skill"]={ + 50117, + 50118 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=78300 + }, + [3507]={ + ["monster_base"]=30018, + ["hp"]=652500000, + ["atk"]=4440000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50022, + 50023, + 50024, + 50025 + }, + ["skill"]={ + 50026 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=63050 + }, + [3607]={ + ["monster_base"]=30009, + ["hp"]=276840000, + ["atk"]=2970000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50012, + 50013, + 50014, + 50015 + }, + ["skill"]={ + 50016 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=57000 + }, + [3707]={ + ["monster_base"]=30022, + ["hp"]=370770000, + ["atk"]=3210000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50087, + 50088, + 50089, + 50090 + }, + ["skill"]={ + 50091, + 50092 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=54000 + }, + [3807]={ + ["monster_base"]=30012, + ["hp"]=534060000, + ["atk"]=3630000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50037, + 50038, + 50039, + 50040 + }, + ["skill"]={ + 50041, + 50042 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=65650 + }, + [3907]={ + ["monster_base"]=30006, + ["hp"]=675000000, + ["atk"]=4470000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50061, + 50062, + 50063, + 50064 + }, + ["skill"]={ + 50066 + }, + ["passive_skill"]={ + 50065, + 10012 + }, + ["monster_exp"]=78300 + }, + [4007]={ + ["monster_base"]=30026, + ["hp"]=829500000, + ["atk"]=5190000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50131, + 50132, + 50133, + 50134 + }, + ["skill"]={ + 50135, + 50136 + }, + ["passive_skill"]={ + 10013, + 10012 + }, + ["monster_exp"]=63050 + }, + [4107]={ + ["monster_base"]=30019, + ["hp"]=302040000, + ["atk"]=3270000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50119, + 50120, + 50121, + 50122 + }, + ["skill"]={ + 50123, + 50124 + }, + ["passive_skill"]={ + 10013, + 10008 + }, + ["monster_exp"]=57000 + }, + [4207]={ + ["monster_base"]=30014, + ["hp"]=404430000, + ["atk"]=3540000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50007, + 50008, + 50009, + 50010 + }, + ["skill"]={ + 50011, + 50137 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=54000 + }, + [4307]={ + ["monster_base"]=30021, + ["hp"]=582390000, + ["atk"]=4020000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50093, + 50094, + 50095, + 50096 + }, + ["skill"]={ + 50097 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=65650 + }, + [4407]={ + ["monster_base"]=30012, + ["hp"]=735690000, + ["atk"]=4920000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50037, + 50038, + 50039, + 50040 + }, + ["skill"]={ + 50041, + 50042 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=78300 + }, + [4507]={ + ["monster_base"]=30024, + ["hp"]=915600000, + ["atk"]=5820000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50077, + 50078, + 50079, + 50080 + }, + ["skill"]={ + 50081 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=63050 + }, + [4607]={ + ["monster_base"]=30001, + ["hp"]=321840000, + ["atk"]=3540000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50055, + 50056, + 50057, + 50058 + }, + ["skill"]={ + 50059 + }, + ["passive_skill"]={ + 50060, + 10009 + }, + ["monster_exp"]=57000 + }, + [4707]={ + ["monster_base"]=30015, + ["hp"]=430710000, + ["atk"]=3840000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50113, + 50114, + 50115, + 50116 + }, + ["skill"]={ + 50117, + 50118 + }, + ["passive_skill"]={ + 10009 + }, + ["monster_exp"]=54000 + }, + [4807]={ + ["monster_base"]=30009, + ["hp"]=620190000, + ["atk"]=4320000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50012, + 50013, + 50014, + 50015 + }, + ["skill"]={ + 50016 + }, + ["passive_skill"]={ + 10009 + }, + ["monster_exp"]=65650 + }, + [4907]={ + ["monster_base"]=30008, + ["hp"]=783360000, + ["atk"]=5280000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50098, + 50099, + 50100, + 50101 + }, + ["skill"]={ + 50102 + }, + ["passive_skill"]={ + 10013, + 10009 + }, + ["monster_exp"]=78300 + }, + [5007]={ + ["monster_base"]=30007, + ["hp"]=973350000, + ["atk"]=6270000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50043, + 50044, + 50045, + 50046 + }, + ["skill"]={ + 50047, + 50048 + }, + ["passive_skill"]={ + 10009 + }, + ["monster_exp"]=63050 + }, + [5107]={ + ["monster_base"]=30002, + ["hp"]=348120000, + ["atk"]=3870000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50027, + 50028, + 50029, + 50030 + }, + ["skill"]={ + 50031 + }, + ["passive_skill"]={ + 10010 + }, + ["monster_exp"]=57000 + }, + [5207]={ + ["monster_base"]=30020, + ["hp"]=465630000, + ["atk"]=4200000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50067, + 50068, + 50069, + 50070 + }, + ["skill"]={ + 50071 + }, + ["passive_skill"]={ + 10010 + }, + ["monster_exp"]=54000 + }, + [5307]={ + ["monster_base"]=30019, + ["hp"]=670140000, + ["atk"]=4740000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50119, + 50120, + 50121, + 50122 + }, + ["skill"]={ + 50123, + 50124 + }, + ["passive_skill"]={ + 10013, + 10010 + }, + ["monster_exp"]=65650 + }, + [5407]={ + ["monster_base"]=30011, + ["hp"]=846360000, + ["atk"]=5760000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50017, + 50018, + 50019, + 50020 + }, + ["skill"]={ + 50021 + }, + ["passive_skill"]={ + 10010 + }, + ["monster_exp"]=78300 + }, + [5507]={ + ["monster_base"]=30025, + ["hp"]=1034250000, + ["atk"]=6750000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50103, + 50104, + 50105, + 50106 + }, + ["skill"]={ + 50107 + }, + ["passive_skill"]={ + 10013, + 10010 + }, + ["monster_exp"]=63050 + }, + [5607]={ + ["monster_base"]=30003, + ["hp"]=362520000, + ["atk"]=4110000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50082, + 50083, + 50084, + 50085 + }, + ["skill"]={ + 50086 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=57000 + }, + [5707]={ + ["monster_base"]=30010, + ["hp"]=484770000, + ["atk"]=4410000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50032, + 50033, + 50034, + 50035 + }, + ["skill"]={ + 50036 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=54000 + }, + [5807]={ + ["monster_base"]=30006, + ["hp"]=697680000, + ["atk"]=5010000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50061, + 50062, + 50063, + 50064 + }, + ["skill"]={ + 50066 + }, + ["passive_skill"]={ + 50065, + 10011 + }, + ["monster_exp"]=65650 + }, + [5907]={ + ["monster_base"]=30023, + ["hp"]=881040000, + ["atk"]=6030000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50125, + 50126, + 50127, + 50128 + }, + ["skill"]={ + 50129 + }, + ["passive_skill"]={ + 50130, + 10011 + }, + ["monster_exp"]=78300 + }, + [6007]={ + ["monster_base"]=30018, + ["hp"]=1116150000, + ["atk"]=7380000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50022, + 50023, + 50024, + 50025 + }, + ["skill"]={ + 50026 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=63050 + }, + [6107]={ + ["monster_base"]=30014, + ["hp"]=390240000, + ["atk"]=4440000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50007, + 50008, + 50009, + 50010 + }, + ["skill"]={ + 50011, + 50137 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=57000 + }, + [6207]={ + ["monster_base"]=30022, + ["hp"]=521730000, + ["atk"]=4830000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50087, + 50088, + 50089, + 50090 + }, + ["skill"]={ + 50091, + 50092 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=54000 + }, + [6307]={ + ["monster_base"]=30012, + ["hp"]=750600000, + ["atk"]=5460000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50037, + 50038, + 50039, + 50040 + }, + ["skill"]={ + 50041, + 50042 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=65650 + }, + [6407]={ + ["monster_base"]=30016, + ["hp"]=947580000, + ["atk"]=6540000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50072, + 50073, + 50074, + 50075 + }, + ["skill"]={ + 50076 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=78300 + }, + [6507]={ + ["monster_base"]=30026, + ["hp"]=1161300000, + ["atk"]=7740000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50131, + 50132, + 50133, + 50134 + }, + ["skill"]={ + 50135, + 50136 + }, + ["passive_skill"]={ + 10013, + 10012 + }, + ["monster_exp"]=63050 + }, + [6607]={ + ["monster_base"]=30015, + ["hp"]=398160000, + ["atk"]=4560000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50113, + 50114, + 50115, + 50116 + }, + ["skill"]={ + 50117, + 50118 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=57000 + }, + [6707]={ + ["monster_base"]=30009, + ["hp"]=532440000, + ["atk"]=4950000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50012, + 50013, + 50014, + 50015 + }, + ["skill"]={ + 50016 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=54000 + }, + [6807]={ + ["monster_base"]=30021, + ["hp"]=765720000, + ["atk"]=5580000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50093, + 50094, + 50095, + 50096 + }, + ["skill"]={ + 50097 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=65650 + }, + [6907]={ + ["monster_base"]=30017, + ["hp"]=966720000, + ["atk"]=6720000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50049, + 50050, + 50051, + 50052 + }, + ["skill"]={ + 50053, + 50054 + }, + ["passive_skill"]={ + 10013, + 10008 + }, + ["monster_exp"]=78300 + }, + [7007]={ + ["monster_base"]=30024, + ["hp"]=1230600000, + ["atk"]=8280000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50077, + 50078, + 50079, + 50080 + }, + ["skill"]={ + 50081 + }, + ["passive_skill"]={ + 10008 + }, + ["monster_exp"]=63050 + }, + [7107]={ + ["monster_base"]=30020, + ["hp"]=421920000, + ["atk"]=4860000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50067, + 50068, + 50069, + 50070 + }, + ["skill"]={ + 50071 + }, + ["passive_skill"]={ + 10009 + }, + ["monster_exp"]=57000 + }, + [7207]={ + ["monster_base"]=30019, + ["hp"]=564060000, + ["atk"]=5250000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50119, + 50120, + 50121, + 50122 + }, + ["skill"]={ + 50123, + 50124 + }, + ["passive_skill"]={ + 10013, + 10009 + }, + ["monster_exp"]=54000 + }, + [7307]={ + ["monster_base"]=30014, + ["hp"]=811080000, + ["atk"]=5940000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50007, + 50008, + 50009, + 50010 + }, + ["skill"]={ + 50011, + 50137 + }, + ["passive_skill"]={ + 10009 + }, + ["monster_exp"]=65650 + }, + [7407]={ + ["monster_base"]=30008, + ["hp"]=1023840000, + ["atk"]=7140000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50098, + 50099, + 50100, + 50101 + }, + ["skill"]={ + 50102 + }, + ["passive_skill"]={ + 10013, + 10009 + }, + ["monster_exp"]=78300 + }, + [7507]={ + ["monster_base"]=30007, + ["hp"]=1303320000, + ["atk"]=8790000, + ["atk_times"]=4, + ["hurt_skill"]={ + 50043, + 50044, + 50045, + 50046 + }, + ["skill"]={ + 50047, + 50048 + }, + ["passive_skill"]={ + 10009 + }, + ["monster_exp"]=63050 + } +} +local config = { +data=monster_dungeon_armor,count=75 +} +return config \ No newline at end of file diff --git a/lua/app/config/monster_dungeon_armor.lua.meta b/lua/app/config/monster_dungeon_armor.lua.meta new file mode 100644 index 00000000..7d754a97 --- /dev/null +++ b/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} diff --git a/lua/app/config/monster_dungeon_equip.lua b/lua/app/config/monster_dungeon_equip.lua new file mode 100644 index 00000000..c250e6fd --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/monster_dungeon_equip.lua.meta b/lua/app/config/monster_dungeon_equip.lua.meta new file mode 100644 index 00000000..a5d2d47a --- /dev/null +++ b/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} diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 9eb64b18..551fed4a 100644 --- a/lua/app/config/skill.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua index f9af8c02..88b21575 100644 --- a/lua/app/config/strings/cn/buff.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 3d5ce62f..466a6261 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/cn/task_dungeon_armor.lua b/lua/app/config/strings/cn/task_dungeon_armor.lua new file mode 100644 index 00000000..ae06dd64 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/cn/task_dungeon_armor.lua.meta b/lua/app/config/strings/cn/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..f4f931c7 --- /dev/null +++ b/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} diff --git a/lua/app/config/strings/de/buff.lua b/lua/app/config/strings/de/buff.lua index 6b5bf41c..febae412 100644 --- a/lua/app/config/strings/de/buff.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/de/task_dungeon_armor.lua b/lua/app/config/strings/de/task_dungeon_armor.lua new file mode 100644 index 00000000..3c80b63d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/de/task_dungeon_armor.lua.meta b/lua/app/config/strings/de/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..57e724df --- /dev/null +++ b/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} diff --git a/lua/app/config/strings/en/buff.lua b/lua/app/config/strings/en/buff.lua index 0c611dc9..358f88f7 100644 --- a/lua/app/config/strings/en/buff.lua +++ b/lua/app/config/strings/en/buff.lua @@ -166,6 +166,10 @@ local buff = { ["id"]=75, ["desc"]="Frost Shield: Absorbs damage up to {0} of Max HP and reflects 400% 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 \ No newline at end of file diff --git a/lua/app/config/strings/en/task_dungeon_armor.lua b/lua/app/config/strings/en/task_dungeon_armor.lua new file mode 100644 index 00000000..3c80b63d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/en/task_dungeon_armor.lua.meta b/lua/app/config/strings/en/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..9c659223 --- /dev/null +++ b/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} diff --git a/lua/app/config/strings/es/buff.lua b/lua/app/config/strings/es/buff.lua index 633bf14c..016a6d29 100644 --- a/lua/app/config/strings/es/buff.lua +++ b/lua/app/config/strings/es/buff.lua @@ -166,6 +166,10 @@ local buff = { ["id"]=75, ["desc"]="Escudo de Escarcha: soporta daño de {0} del HP máximo, y rebota 400% 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 \ No newline at end of file diff --git a/lua/app/config/strings/es/task_dungeon_armor.lua b/lua/app/config/strings/es/task_dungeon_armor.lua new file mode 100644 index 00000000..3c80b63d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/es/task_dungeon_armor.lua.meta b/lua/app/config/strings/es/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..7fd94630 --- /dev/null +++ b/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} diff --git a/lua/app/config/strings/fr/buff.lua b/lua/app/config/strings/fr/buff.lua index 6b5bf41c..febae412 100644 --- a/lua/app/config/strings/fr/buff.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/fr/task_dungeon_armor.lua b/lua/app/config/strings/fr/task_dungeon_armor.lua new file mode 100644 index 00000000..3c80b63d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/fr/task_dungeon_armor.lua.meta b/lua/app/config/strings/fr/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..6bd45b9a --- /dev/null +++ b/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} diff --git a/lua/app/config/strings/id/buff.lua b/lua/app/config/strings/id/buff.lua index 4ccb4afa..db1b9ab2 100644 --- a/lua/app/config/strings/id/buff.lua +++ b/lua/app/config/strings/id/buff.lua @@ -166,6 +166,10 @@ local buff = { ["id"]=75, ["desc"]="Perisai Frost: Menerima hingga {0} DMG HP maksimum, dan memantulkan 400% 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 \ No newline at end of file diff --git a/lua/app/config/strings/id/task_dungeon_armor.lua b/lua/app/config/strings/id/task_dungeon_armor.lua new file mode 100644 index 00000000..3c80b63d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/id/task_dungeon_armor.lua.meta b/lua/app/config/strings/id/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..650b5dcc --- /dev/null +++ b/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} diff --git a/lua/app/config/strings/ja/buff.lua b/lua/app/config/strings/ja/buff.lua index 534807aa..0e311143 100644 --- a/lua/app/config/strings/ja/buff.lua +++ b/lua/app/config/strings/ja/buff.lua @@ -166,6 +166,10 @@ local buff = { ["id"]=75, ["desc"]="アイスシールド：最大HP{0}のダメージを無効化し、400%のダメージを反射する。", ["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 \ No newline at end of file diff --git a/lua/app/config/strings/ja/task_dungeon_armor.lua b/lua/app/config/strings/ja/task_dungeon_armor.lua new file mode 100644 index 00000000..3c80b63d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/ja/task_dungeon_armor.lua.meta b/lua/app/config/strings/ja/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..38b280a6 --- /dev/null +++ b/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} diff --git a/lua/app/config/strings/ko/buff.lua b/lua/app/config/strings/ko/buff.lua index 63917ad9..172e9ddd 100644 --- a/lua/app/config/strings/ko/buff.lua +++ b/lua/app/config/strings/ko/buff.lua @@ -166,6 +166,10 @@ local buff = { ["id"]=75, ["desc"]="서리 보호막: 최대 HP의 {0}에 달하는 대미지를 흡수하며 상대가 준 대미지의 400%를 되돌려줍니다.", ["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 \ No newline at end of file diff --git a/lua/app/config/strings/ko/task_dungeon_armor.lua b/lua/app/config/strings/ko/task_dungeon_armor.lua new file mode 100644 index 00000000..3c80b63d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/ko/task_dungeon_armor.lua.meta b/lua/app/config/strings/ko/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..49bd9a3d --- /dev/null +++ b/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} diff --git a/lua/app/config/strings/pt/buff.lua b/lua/app/config/strings/pt/buff.lua index 4ec3c1c0..bb36959c 100644 --- a/lua/app/config/strings/pt/buff.lua +++ b/lua/app/config/strings/pt/buff.lua @@ -166,6 +166,10 @@ local buff = { ["id"]=75, ["desc"]="Escudo Gélido: aguenta dano equivalente a {0} da Vida Máxima e reflete 400% 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 \ No newline at end of file diff --git a/lua/app/config/strings/pt/task_dungeon_armor.lua b/lua/app/config/strings/pt/task_dungeon_armor.lua new file mode 100644 index 00000000..3c80b63d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/pt/task_dungeon_armor.lua.meta b/lua/app/config/strings/pt/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..f1381872 --- /dev/null +++ b/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} diff --git a/lua/app/config/strings/ru/buff.lua b/lua/app/config/strings/ru/buff.lua index 6b5bf41c..febae412 100644 --- a/lua/app/config/strings/ru/buff.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/ru/task_dungeon_armor.lua b/lua/app/config/strings/ru/task_dungeon_armor.lua new file mode 100644 index 00000000..3c80b63d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/ru/task_dungeon_armor.lua.meta b/lua/app/config/strings/ru/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..9e2c8e88 --- /dev/null +++ b/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} diff --git a/lua/app/config/strings/th/buff.lua b/lua/app/config/strings/th/buff.lua index b92324d7..ddc9876a 100644 --- a/lua/app/config/strings/th/buff.lua +++ b/lua/app/config/strings/th/buff.lua @@ -166,6 +166,10 @@ local buff = { ["id"]=75, ["desc"]="โล่ฟรอสต์: สามารถรับดาเมจของ HP สูงสุด{0} และสะท้อนดาเมจของฝ่ายตรงข้าม400%", ["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 \ No newline at end of file diff --git a/lua/app/config/strings/th/task_dungeon_armor.lua b/lua/app/config/strings/th/task_dungeon_armor.lua new file mode 100644 index 00000000..3c80b63d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/th/task_dungeon_armor.lua.meta b/lua/app/config/strings/th/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..72da5566 --- /dev/null +++ b/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} diff --git a/lua/app/config/strings/vi/buff.lua b/lua/app/config/strings/vi/buff.lua index b2d96621..33aae869 100644 --- a/lua/app/config/strings/vi/buff.lua +++ b/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 {0} HP tối đa, phản đòn 400% 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 \ No newline at end of file diff --git a/lua/app/config/strings/vi/task_dungeon_armor.lua b/lua/app/config/strings/vi/task_dungeon_armor.lua new file mode 100644 index 00000000..3c80b63d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/vi/task_dungeon_armor.lua.meta b/lua/app/config/strings/vi/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..46505df9 --- /dev/null +++ b/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} diff --git a/lua/app/config/strings/zh/buff.lua b/lua/app/config/strings/zh/buff.lua index 9859b8e7..6a6cb4a1 100644 --- a/lua/app/config/strings/zh/buff.lua +++ b/lua/app/config/strings/zh/buff.lua @@ -166,6 +166,10 @@ local buff = { ["id"]=75, ["desc"]="冰霜護盾：可承受最大生命值{0}的傷害，反彈400%敵方傷害。", ["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 \ No newline at end of file diff --git a/lua/app/config/strings/zh/task_dungeon_armor.lua b/lua/app/config/strings/zh/task_dungeon_armor.lua new file mode 100644 index 00000000..3c80b63d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/lua/app/config/strings/zh/task_dungeon_armor.lua.meta b/lua/app/config/strings/zh/task_dungeon_armor.lua.meta new file mode 100644 index 00000000..b05d5494 --- /dev/null +++ b/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} diff --git a/lua/app/ui/arena/arena_recent_battle_ui.lua b/lua/app/ui/arena/arena_recent_battle_ui.lua index 479d491c..c60cf637 100644 --- a/lua/app/ui/arena/arena_recent_battle_ui.lua +++ b/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 \ No newline at end of file diff --git a/lua/app/ui/tips/base_tips.lua b/lua/app/ui/tips/base_tips.lua index e872658d..17348c7d 100644 --- a/lua/app/ui/tips/base_tips.lua +++ b/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) diff --git a/lua/app/ui/tips/formation_tips.lua b/lua/app/ui/tips/formation_tips.lua index c83a12d2..29b0afbb 100644 --- a/lua/app/ui/tips/formation_tips.lua +++ b/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 \ No newline at end of file