From 84e1e14d7956077b0925752a2f097263d0f31892 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 4 Aug 2023 10:53:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E6=9D=90=E6=96=99=E5=89=AF?= =?UTF-8?q?=E6=9C=AC=E6=89=AB=E8=8D=A1=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/arena_rank.lua | 72 +++++++++++++++--------------- lua/app/config/skill.lua | 3 -- lua/app/config/skill_rogue.lua | 12 +++++ lua/app/config/strings/cn/item.lua | 4 +- lua/app/config/strings/en/item.lua | 9 ++-- lua/app/config/strings/es/item.lua | 9 ++-- lua/app/config/strings/id/item.lua | 9 ++-- lua/app/config/strings/ja/item.lua | 9 ++-- lua/app/config/strings/ko/item.lua | 9 ++-- lua/app/config/strings/pt/item.lua | 9 ++-- lua/app/config/strings/th/item.lua | 9 ++-- lua/app/config/strings/vi/item.lua | 9 ++-- lua/app/config/strings/zh/item.lua | 9 ++-- lua/app/ui/dungeon/item_get_ui.lua | 3 -- 14 files changed, 104 insertions(+), 71 deletions(-) diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index 87b1a066..ce390927 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -1047,8 +1047,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1221,8 +1221,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1395,8 +1395,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=2, ["num_for_nothing"]="VA==" } @@ -1569,8 +1569,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -1743,8 +1743,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=4, ["num_for_nothing"]="Ug==" } @@ -1917,8 +1917,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=5, ["num_for_nothing"]="Uw==" } @@ -3103,8 +3103,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3277,8 +3277,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3451,8 +3451,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=2, ["num_for_nothing"]="VA==" } @@ -3625,8 +3625,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -3799,8 +3799,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=4, ["num_for_nothing"]="Ug==" } @@ -3973,8 +3973,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=5, ["num_for_nothing"]="Uw==" } @@ -5145,8 +5145,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -5317,8 +5317,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -5489,8 +5489,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=2, ["num_for_nothing"]="VA==" } @@ -5661,8 +5661,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -5833,8 +5833,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=4, ["num_for_nothing"]="Ug==" } @@ -6005,8 +6005,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=5, ["num_for_nothing"]="Uw==" } diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 0d3f2a6f..2b719dd7 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -5661,9 +5661,6 @@ local skill = { ["fx_self_mirror"]=400066 }, [5200120]={ - ["buff_id"]={ - "shield" - }, ["energy"]=10, ["link"]=1, ["position"]=5, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index e6b302c4..5448cfd7 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -1832,6 +1832,9 @@ local skill_rogue = { ["icon"]="143" }, [2400102]={ + ["buff_id"]={ + "stun" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -1849,6 +1852,9 @@ local skill_rogue = { ["icon"]="144" }, [2400103]={ + ["buff_id"]={ + "stun" + }, ["unlock"]=2400102, ["cover_unlock"]=2400102, ["limit_times"]=1, @@ -1985,6 +1991,9 @@ local skill_rogue = { ["icon"]="205" }, [2400204]={ + ["buff_id"]={ + "weaken" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2022,6 +2031,9 @@ local skill_rogue = { ["icon"]="207" }, [2400206]={ + ["buff_id"]={ + "weaken" + }, ["unlock"]=2400204, ["cover_unlock"]=2400206, ["limit_times"]=1, diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index 4d4469d9..1fea07dd 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -172,8 +172,8 @@ local item = { ["desc"]="开启后可获得以下材料" }, [44]={ - ["name"]="勇气洋葱头2", - ["desc"]="S1竞技战令头像，愿你像洋葱头勇往直前！" + ["name"]="刀妹锋芒", + ["desc"]="S2竞技战令头像，刀起刀落胜利就来了。" }, [45]={ ["name"]="S2赛季白银头像框", diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index 78c36733..255e8b2e 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -172,13 +172,16 @@ local item = { ["desc"]="Open to obtain following materials" }, [44]={ - + ["name"]="Blade Maid's Edge", + ["desc"]="S2 Arena Battle Pass Avatar. Victory comes as blades dance." }, [45]={ - + ["name"]="S2 Silver Avatar Frame", + ["desc"]="S2 Silver Arena Avatar Frame. Proof of your strength." }, [46]={ - + ["name"]="S2 Gold Avatar Frame", + ["desc"]="S2 Gold Arena Avatar Frame, shining with heroic radiance." }, [47]={ diff --git a/lua/app/config/strings/es/item.lua b/lua/app/config/strings/es/item.lua index a68aaf5d..e7060593 100644 --- a/lua/app/config/strings/es/item.lua +++ b/lua/app/config/strings/es/item.lua @@ -172,13 +172,16 @@ local item = { ["desc"]="Abre para obtener los siguientes materiales" }, [44]={ - + ["name"]="Filo de Chica con Daga", + ["desc"]="Avatar de Pase de Batalla de Arena S2. La victoria llega entre cuchilladas." }, [45]={ - + ["name"]="Marco de avatar de plata Temporada S2", + ["desc"]="Marco de avatar de plata de Arena S2, prueba de fuerza." }, [46]={ - + ["name"]="Marco de avatar de oro Temporada S2", + ["desc"]="Marco de avatar de oro de Arena S1, gloria del héroe." }, [47]={ diff --git a/lua/app/config/strings/id/item.lua b/lua/app/config/strings/id/item.lua index e00a26fc..c6f47c76 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -172,13 +172,16 @@ local item = { ["desc"]="Buka untuk mendapatkan material berikut:" }, [44]={ - + ["name"]="Tombak Gadis Pedang", + ["desc"]="Avatar Battle Pass Arena S2. Kemenangan datang saat pedang diayunkan." }, [45]={ - + ["name"]="Bingkai Avatar Silver Musim S2", + ["desc"]="Bingkai Avatar Silver Arena S2. Bukti Kekuatan." }, [46]={ - + ["name"]="Bingkai Avatar Emas Musim S2", + ["desc"]="Bingkai Avatar Emas Arena S2.Pahlawan mulia." }, [47]={ diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index 5ab34438..1d380036 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -172,13 +172,16 @@ local item = { ["desc"]="開けると、以下の材料を獲得できる" }, [44]={ - + ["name"]="ブレードメイドの活躍", + ["desc"]="S2闘技場戦令アイコン。いつの間にか勝利が訪れる。" }, [45]={ - + ["name"]="S2シーズンシルバーフレーム", + ["desc"]="S2闘技場シルバーフレーム。実力の証。" }, [46]={ - + ["name"]="S2シーズンゴールドフレーム", + ["desc"]="S2闘技場ゴールドフレーム。ヒーローの輝き。" }, [47]={ diff --git a/lua/app/config/strings/ko/item.lua b/lua/app/config/strings/ko/item.lua index 3990267a..137837ef 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -172,13 +172,16 @@ local item = { ["desc"]="오픈 후 다음의 재료를 획득할 수 있습니다." }, [44]={ - + ["name"]="블레이드 엣지", + ["desc"]="S2 아레나 배틀 패스 아이콘, 휘날리는 칼 속에서 승리를 거머쥡니다." }, [45]={ - + ["name"]="S2 시즌 실버 아이콘 프레임", + ["desc"]="S2 아레나 실버 아이콘 프레임, 강인함의 증명입니다." }, [46]={ - + ["name"]="S2 시즌 골드 아이콘 프레임", + ["desc"]="S2 아레나 골드 아이콘 프레임, 영웅의 눈부신 업적입니다." }, [47]={ diff --git a/lua/app/config/strings/pt/item.lua b/lua/app/config/strings/pt/item.lua index 6af1901e..9f826efe 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -172,13 +172,16 @@ local item = { ["desc"]="Concede os seguintes materiais." }, [44]={ - + ["name"]="Gume da Senhorita dos Gumes", + ["desc"]="Avatar da Ordem de Batalha da S2, a vitória vem com um movimento da lâmina." }, [45]={ - + ["name"]="Moldura de Avatar de Prata da S2", + ["desc"]="Moldura de avatar de prata da Arena S2, uma testemunha da força." }, [46]={ - + ["name"]="Moldura de Avatar de Ouro da S2", + ["desc"]="Moldura de avatar de ouro da Arena S2, o brilho de um herói." }, [47]={ diff --git a/lua/app/config/strings/th/item.lua b/lua/app/config/strings/th/item.lua index b2eb2878..2293f510 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -172,13 +172,16 @@ local item = { ["desc"]="หลังเปิดจะได้รับวัสดุต่อไปนี้" }, [44]={ - + ["name"]="พลังแห่งสาวดาบ", + ["desc"]="อวตารของป้ายรบอารีน่า S2 ชัยชนะจะมาถึงเมื่อดาบขึ้นและดาบตก" }, [45]={ - + ["name"]="กรอบรูปเงินซีซั่น S2", + ["desc"]="กรอบรูปเงินของอารีน่า S2 พิสูจน์ของพลังงาน" }, [46]={ - + ["name"]="กรอบรูปทองซีซั่น S2", + ["desc"]="กรอบรูปทองของอารีน่า S2 ความรุ่งโรจน์ของฮีโร่" }, [47]={ diff --git a/lua/app/config/strings/vi/item.lua b/lua/app/config/strings/vi/item.lua index 9f056fbd..f31b4794 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -172,13 +172,16 @@ local item = { ["desc"]="Mở được nhận vật liệu sau" }, [44]={ - + ["name"]="Tài Năng Irelia", + ["desc"]="Avatar Chiến Lệnh S2, vung đao chiến thắng." }, [45]={ - + ["name"]="Khung Avatar Bạc S2", + ["desc"]="Khung Avatar Bạc Đấu Trường S2, biểu tượng sức mạnh." }, [46]={ - + ["name"]="Khung Avatar Vàng S2", + ["desc"]="Khung Avatar Vàng Đấu Trường S2, anh hùng tỏa sáng." }, [47]={ diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index d5c2a6ef..448b9a99 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -172,13 +172,16 @@ local item = { ["desc"]="開啟後可獲得以下材料" }, [44]={ - + ["name"]="刀妹鋒芒", + ["desc"]="S2競技戰令頭像，刀起刀落勝利就來了。" }, [45]={ - + ["name"]="S2賽季白銀頭像框", + ["desc"]="S2競技場白銀頭像框，力量的證明。" }, [46]={ - + ["name"]="S2賽季黃金頭像框", + ["desc"]="S2競技場黃金頭像框，英雄的光輝。" }, [47]={ diff --git a/lua/app/ui/dungeon/item_get_ui.lua b/lua/app/ui/dungeon/item_get_ui.lua index 160a817d..81de430b 100644 --- a/lua/app/ui/dungeon/item_get_ui.lua +++ b/lua/app/ui/dungeon/item_get_ui.lua @@ -82,9 +82,6 @@ function ItemGetUI:onRefresh() table.insert(lock, id) end end - table.sort(farm, function(a, b) return a > b end) - table.sort(unlock, function(a, b) return a > b end) - table.sort(lock, function(a, b) return a > b end) unlock = table.addArray(farm, unlock) self.wayList = table.addArray(unlock, lock)