diff --git a/lua/app/config/bounty_time.lua b/lua/app/config/bounty_time.lua index c254d8db..ddd8b9a3 100644 --- a/lua/app/config/bounty_time.lua +++ b/lua/app/config/bounty_time.lua @@ -13,9 +13,14 @@ local bounty_time = { ["season"]=3, ["start_time"]="2023-9-1 00:00:00", ["end_time"]="2023-10-1 00:00:00" + }, + [4]={ + ["season"]=4, + ["start_time"]="2023-10-1 00:00:00", + ["end_time"]="2023-11-1 00:00:00" } } local config = { -data=bounty_time,count=3 +data=bounty_time,count=4 } return config \ No newline at end of file diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 7e1715fc..384b6f5d 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -429,7 +429,6 @@ local LocalizationGlobalConst = SKIN_LIST = "SKIN_LIST", BTN_LOCKED = "BTN_LOCKED", SKIN_GOT_1 = "SKIN_GOT_1", - SKIN_GOT_2 = "SKIN_GOT_2", SKIN_GOT_TIPS = "SKIN_GOT_TIPS", GOTO_COIN_STORE_DESC = "GOTO_COIN_STORE_DESC", HERO_DESC_12 = "HERO_DESC_12", @@ -516,12 +515,10 @@ local LocalizationGlobalConst = DUNGEON_RUNE_TITLE = "DUNGEON_RUNE_TITLE", DUNGEON_RUNE_DESC = "DUNGEON_RUNE_DESC", DUNGEON_RUNE_HELP = "DUNGEON_RUNE_HELP", - DUNGEON_RUNE_MIN = "DUNGEON_RUNE_MIN", DUNGEON_RUNE_QUEST_1 = "DUNGEON_RUNE_QUEST_1", DUNGEON_RUNE_QUEST_2 = "DUNGEON_RUNE_QUEST_2", DUNGEON_RUNE_QUEST_3 = "DUNGEON_RUNE_QUEST_3", DUNGEON_RUNE_QUEST_4 = "DUNGEON_RUNE_QUEST_4", - DUNGEON_RUNE_TIP_1 = "DUNGEON_RUNE_TIP_1", DUNGEON_RUNE_TIP_2 = "DUNGEON_RUNE_TIP_2", DUNGEON_RUNE_TIP_3 = "DUNGEON_RUNE_TIP_3", DUNGEON_RUNE_TIP_4 = "DUNGEON_RUNE_TIP_4", diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 81f7e26e..370b19e0 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -24259,7 +24259,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000011 + 1000002 }, ["name_act"]="attack01", ["fx_self"]=200202 @@ -24289,7 +24289,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000012 + 1000004 }, ["name_act"]="attack02", ["fx_self"]=200203 @@ -24319,7 +24319,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000013 + 2200111 }, ["name_act"]="attack03", ["fx_self"]=200204 @@ -24346,9 +24346,8 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 10018 - }, + ["sound"]=30177, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=200205, ["bullet_time"]={ @@ -24379,9 +24378,8 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 10018 - }, + ["sound"]=30178, + ["sound_delay"]=0.0, ["name_act"]="skill02", ["fx_self"]=200206, ["bullet_time"]={ @@ -24573,7 +24571,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000011 + 1400411 }, ["name_act"]="attack01", ["fx_self"]=200219 @@ -24597,7 +24595,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000012 + 1400411 }, ["name_act"]="attack02", ["fx_self"]=200220 @@ -24621,7 +24619,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000013 + 1400410 }, ["name_act"]="attack03", ["fx_self"]=200221 @@ -24661,9 +24659,8 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 10018 - }, + ["sound"]=30190, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["bullet_time"]={ 933, @@ -24690,7 +24687,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000011 + 10001 }, ["name_act"]="attack01", ["fx_self"]=200222 @@ -24714,7 +24711,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000012 + 10002 }, ["name_act"]="attack02", ["fx_self"]=200223 @@ -24738,7 +24735,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000013 + 10003 }, ["name_act"]="attack03", ["fx_self"]=200224 @@ -24762,7 +24759,19 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="corrupt", + ["num"]=7500, + ["ratio"]=10000, + ["round"]=2 + }, + { + ["type"]="hurt", + ["num"]=5000, ["ratio"]=10000, ["round"]=0 }, @@ -24773,20 +24782,24 @@ local skill = { ["round"]=2 }, { - ["type"]="corrupt", - ["num"]=7500, + ["type"]="hurt", + ["num"]=10000, ["ratio"]=10000, - ["round"]=2 + ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 2, + 4, + 5 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 10018 - }, + ["sound"]=30195, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=200225, ["bullet_time"]={ @@ -24966,7 +24979,7 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=40000, + ["num"]=20000, ["ratio"]=10000, ["round"]=0 }, @@ -24982,13 +24995,12 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 10018 - }, + ["sound"]=30205, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=200226, ["bullet_time"]={ - 400, + 1266, 3000, 400 } @@ -24999,7 +25011,7 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=40000, + ["num"]=20000, ["ratio"]=10000, ["round"]=0 }, @@ -25015,13 +25027,12 @@ local skill = { ["cd_start"]=1, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 10018 - }, + ["sound"]=30206, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=200227, ["bullet_time"]={ - 400, + 1266, 3000, 400 } @@ -25032,7 +25043,7 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=40000, + ["num"]=20000, ["ratio"]=10000, ["round"]=0 }, @@ -25048,13 +25059,12 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 10018 - }, + ["sound"]=30207, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=200228, ["bullet_time"]={ - 400, + 1266, 3000, 400 } @@ -25078,7 +25088,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000011 + 2300111 }, ["name_act"]="attack01", ["fx_self"]=200207 @@ -25102,7 +25112,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000012 + 2300112 }, ["name_act"]="attack02", ["fx_self"]=200208 @@ -25126,7 +25136,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000013 + 2300113 }, ["name_act"]="attack03", ["fx_self"]=200209 @@ -25160,13 +25170,12 @@ local skill = { 2, 0 }, - ["cd"]=3, + ["cd"]=6, ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 10018 - }, + ["sound"]=30212, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=200210, ["bullet_time"]={ @@ -25191,13 +25200,12 @@ local skill = { 2, 0 }, - ["cd"]=3, - ["cd_start"]=1, + ["cd"]=6, + ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 10018 - }, + ["sound"]=30213, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=200211, ["bullet_time"]={ @@ -25222,15 +25230,14 @@ local skill = { 2, 0 }, - ["cd"]=3, - ["cd_start"]=2, + ["cd"]=6, + ["cd_start"]=4, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 10018 - }, + ["sound"]=30214, + ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=200212, + ["fx_self"]=200213, ["bullet_time"]={ 933, 3000, @@ -25256,7 +25263,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000011 + 5200111 }, ["name_act"]="attack01", ["fx_self"]=200214 @@ -25280,7 +25287,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000012 + 5200112 }, ["name_act"]="attack02", ["fx_self"]=200215 @@ -25304,7 +25311,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000013 + 3300111 }, ["name_act"]="attack03", ["fx_self"]=200216 @@ -25348,9 +25355,8 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 10018 - }, + ["sound"]=30219, + ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=200217, ["bullet_time"]={ @@ -25383,9 +25389,8 @@ local skill = { ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 10018 - }, + ["sound"]=30220, + ["sound_delay"]=0.0, ["name_act"]="skill02", ["fx_self"]=200218, ["bullet_time"]={ diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index a53d6975..7ea5b421 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -429,7 +429,6 @@ local localization_global = ["SKIN_LIST"] = "皮肤列表", ["BTN_LOCKED"] = "角色待解锁", ["SKIN_GOT_1"] = "通过活动获取", - ["SKIN_GOT_2"] = "通过战令获取", ["SKIN_GOT_TIPS"] = "解锁皮肤可领取", ["GOTO_COIN_STORE_DESC"] = "是否前往商城购买金币", ["HERO_DESC_12"] = "竞技场{0}解锁", @@ -516,12 +515,10 @@ local localization_global = ["DUNGEON_RUNE_TITLE"] = "符文之塔", ["DUNGEON_RUNE_DESC"] = "挑战神秘之塔，收集符文精粹。", ["DUNGEON_RUNE_HELP"] = "1. 每天将重置10枚【金羽毛】和10枚【银羽毛】。\n2.挑战未通关层将需要消耗1枚【金羽毛】，通关后可获得1次通关奖励。\n3. 每10层为首领层，首领层通关后可消耗【银羽毛】扫荡获得【符文精粹】。", - ["DUNGEON_RUNE_MIN"] = "历史通关最小回合数：{0}", ["DUNGEON_RUNE_QUEST_1"] = "{0}回合内完成目标", ["DUNGEON_RUNE_QUEST_2"] = "消除{0}个{1}", ["DUNGEON_RUNE_QUEST_3"] = "消除{0}个此障碍物", ["DUNGEON_RUNE_QUEST_4"] = "击杀{0}个小怪", - ["DUNGEON_RUNE_TIP_1"] = "塔中密室循环结算后，可在此领取奖励。", ["DUNGEON_RUNE_TIP_2"] = "还不能放弃……", ["DUNGEON_RUNE_TIP_3"] = "回合数用完，观看广告获得额外回合！", ["DUNGEON_RUNE_TIP_4"] = "血量回复至50%", @@ -594,7 +591,7 @@ local localization_global = ["ACT_PVP_DESC_10"] = "免费刷新", ["ACT_PVP_DESC_11"] = "下轮待选英雄", ["ACT_PVP_DESC_12"] = "选择", - ["ACT_PVP_DESC_13"] = "是否消耗{0}钻石刷新", + ["ACT_PVP_DESC_13"] = "是否消耗{0}钻石刷新?", ["ACT_PVP_DESC_14"] = "累计胜场", ["ACT_PVP_DESC_15"] = "酒馆积分", ["ACT_PVP_DESC_16"] = "欢迎入股酒馆基金，在酒馆挑战对手，累计积分可领取奖励分红哟~", diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index c3eefd64..5ca8c4a5 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -217,7 +217,7 @@ local item = { }, [56]={ ["name"]="圆月", - ["desc"]="圆月庆典用的任务积分。" + ["desc"]="圆月庆典的小月亮。" }, [57]={ ["name"]="圆月庆典头像框。", diff --git a/lua/app/config/strings/en/equip.lua b/lua/app/config/strings/en/equip.lua index 198d143f..698deac9 100644 --- a/lua/app/config/strings/en/equip.lua +++ b/lua/app/config/strings/en/equip.lua @@ -405,7 +405,7 @@ local equip = { ["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards" }, [4400401]={ - ["name"]="Phantom Coffin,Violet Flame Casket,Nether Casket,Souleater Casket,Shadow Casket,Mysterious Casket " + ["name"]="Phantom Coffin,Violet Flame Casket,Nether Casket,Souleater Casket,Shadow Casket,Mysterious Casket" }, [4400402]={ ["name"]="Rugged Steel Helm,Fine Steel Visor,Obsidian Noble Crown,Gallant Coronet,Dragonhorn Circlet,Eternal Glory Crown" diff --git a/lua/app/config/strings/ja/global.lua b/lua/app/config/strings/ja/global.lua index e938100a..810e304a 100644 --- a/lua/app/config/strings/ja/global.lua +++ b/lua/app/config/strings/ja/global.lua @@ -514,7 +514,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_34"] = "撤退後は、現在の波次決済に従って戦いますが、撤退しますか？", ["DUNGEON_RUNE_TITLE"] = "ルーンの塔", ["DUNGEON_RUNE_DESC"] = "神秘の塔に挑戦し、ルーンエッセンスを集めよう。", - ["DUNGEON_RUNE_HELP"] = "", + ["DUNGEON_RUNE_HELP"] = "1.毎日【黄金の羽】10枚と【白銀の羽】10枚がリセットされます。\n2.未クリアのフロアを挑戦するには、【黄金の羽】を1枚消費します。クリア後にクリア報酬を1回獲得できます。\n3. 10階ごとにボスフロアとなります。ボスフロアをクリアすると、【白銀の羽】を消費して掃討で【ルーンエッセンス】を獲得できます。", ["DUNGEON_RUNE_QUEST_1"] = "{0}ターン以内に目標を達成する", ["DUNGEON_RUNE_QUEST_2"] = "{1}を{0}個消す", ["DUNGEON_RUNE_QUEST_3"] = "この障害物を{0}個消す", @@ -583,23 +583,23 @@ local localization_global = ["ACT_PVP_DESC_11"] = "次のラウンドで選ばれるヒーロー", ["ACT_PVP_DESC_14"] = "累計勝利数", ["ACT_PVP_DESC_15"] = "酒場ポイント", - ["ACT_PVP_DESC_16"] = "", + ["ACT_PVP_DESC_16"] = "酒場ファンドへようこそ。酒場で対戦相手に挑戦し、ポイントを貯めてボーナスを受け取りましょう~", ["ACT_PVP_DESC_17"] = "累計勝利数", - ["ACT_PVP_DESC_18"] = "", + ["ACT_PVP_DESC_18"] = "1.イベント期間中、酒場での勝利回数はすべてランキングのために累積され、記録されます。\n2.イベント期間は合計7日間で、8日目にランキング報酬を獲得できます。\n3.報酬は期限内に受け取る必要があり、期限を過ぎると受取できません。", ["ACT_PVP_DESC_19"] = "勝：{0}", ["ACT_PVP_DESC_20"] = "敗：{0}", - ["ACT_PVP_DESC_21"] = "", - ["ACT_PVP_DESC_22"] = "", - ["ACT_PVP_DESC_23"] = "", + ["ACT_PVP_DESC_21"] = "1.1日1回無料で酒場に入ることができ、入るとランダムにヒーローを5体選択し、チームを編成する必要があります。すべてのヒーローは酒場から提供され、所有ヒーローのステータスは引き継がれませんが、所有しているスキンを使用することができます。", + ["ACT_PVP_DESC_22"] = "2.チームを編成した後、今回と同じ勝利回数の相手とマッチングします。勝利するたびにヒーローが1回レベルアップします。すべての品質のヒーローはLv6からスタートします。", + ["ACT_PVP_DESC_23"] = "3.10勝または2敗すると酒場から退場し、再入場が必要となります。その日の勝利回数に応じて追加報酬を獲得できます。", ["ACT_PVP_TALK_DESC_1"] = "こんにちは~今日はいかが？", ["ACT_PVP_TALK_DESC_2"] = "強者は、毎日累計勝利報酬を獲得できる！", ["ACT_PVP_TALK_DESC_3"] = "面白そう！始めよう！", ["ACT_PVP_TALK_DESC_4"] = "私はいつでも準備ができている。彼らを倒す準備はもうできた？", ["ACT_PVP_TALK_DESC_5"] = "座って、リラックスして、私に任せてください。", ["ACT_PVP_TALK_DESC_6"] = "すごいね！10勝なんてしばらくうちの酒場にはなかった！", - ["ACT_PVP_TALK_DESC_7"] = "", + ["ACT_PVP_TALK_DESC_7"] = "今日すごい方に出会ったね！10連勝の方、また来てね！", ["ACT_PVP_TALK_DESC_8"] = "負けた？ドンマイ~また来てね！", - ["ACT_PVP_TALK_DESC_9"] = "", + ["ACT_PVP_TALK_DESC_9"] = "失敗しても大丈夫！次この夢魔が出ると絶対に勝つよ。", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/vi/task_type.lua b/lua/app/config/strings/vi/task_type.lua index 389274e3..5615d762 100644 --- a/lua/app/config/strings/vi/task_type.lua +++ b/lua/app/config/strings/vi/task_type.lua @@ -117,13 +117,13 @@ local task_type = { ["desc"]="Tăng cấp Phòng Cụ {0} lần" }, [40]={ - ["desc"]="購買任意禮包{0}次" + ["desc"]="Mua quà bất kỳ {0} lần" }, [41]={ - ["desc"]="獲得{0}個符文精粹" + ["desc"]="Nhận {0} Tinh Túy Phù Văn" }, [42]={ - ["desc"]="符文洗鍊{0}次" + ["desc"]="Tẩy luyện Phù Văn {0} lần" } } local config = { diff --git a/lua/app/config/strings/zh/task_type.lua b/lua/app/config/strings/zh/task_type.lua index d0c42815..8ab17ec2 100644 --- a/lua/app/config/strings/zh/task_type.lua +++ b/lua/app/config/strings/zh/task_type.lua @@ -117,13 +117,13 @@ local task_type = { ["desc"]="防具升級{0}次" }, [40]={ - ["desc"]="Mua quà bất kỳ {0} lần" + ["desc"]="購買任意禮包{0}次" }, [41]={ - ["desc"]="Nhận {0} Tinh Túy Phù Văn" + ["desc"]="獲得{0}個符文精粹" }, [42]={ - ["desc"]="Tẩy luyện Phù Văn {0} lần" + ["desc"]="符文洗鍊{0}次" } } local config = { diff --git a/lua/app/config/task_type.lua b/lua/app/config/task_type.lua index 29aff9f1..4ec14af5 100644 --- a/lua/app/config/task_type.lua +++ b/lua/app/config/task_type.lua @@ -117,13 +117,13 @@ local task_type = { ["icon"]="23" }, [40]={ - ["icon"]="23" + ["icon"]="25" }, [41]={ - ["icon"]="23" + ["icon"]="24" }, [42]={ - ["icon"]="23" + ["icon"]="26" } } local config = {