From e0882c61c6355568b453090389c9a5aa46ba5c4e Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 31 Jul 2023 16:27:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/arena_board.lua | 4262 ++++++++++++++++- lua/app/config/arena_bounty_level.lua | 4 +- lua/app/config/arena_rank.lua | 156 +- lua/app/config/avatar.lua | 7 +- lua/app/config/avatar_frame.lua | 12 +- lua/app/config/item.lua | 17 +- .../localization_global_const.lua | 1 + lua/app/config/skill.lua | 6 +- lua/app/config/strings/cn/avatar.lua | 5 +- lua/app/config/strings/cn/avatar_frame.lua | 8 +- lua/app/config/strings/cn/global.lua | 1 + lua/app/config/strings/cn/item.lua | 14 +- lua/app/config/strings/de/avatar.lua | 5 +- lua/app/config/strings/de/avatar_frame.lua | 8 +- lua/app/config/strings/de/item.lua | 11 +- lua/app/config/strings/en/avatar.lua | 5 +- lua/app/config/strings/en/avatar_frame.lua | 8 +- lua/app/config/strings/en/item.lua | 11 +- lua/app/config/strings/es/avatar.lua | 5 +- lua/app/config/strings/es/avatar_frame.lua | 8 +- lua/app/config/strings/es/item.lua | 11 +- lua/app/config/strings/fr/avatar.lua | 5 +- lua/app/config/strings/fr/avatar_frame.lua | 8 +- lua/app/config/strings/fr/item.lua | 11 +- lua/app/config/strings/id/avatar.lua | 5 +- lua/app/config/strings/id/avatar_frame.lua | 8 +- lua/app/config/strings/id/item.lua | 11 +- lua/app/config/strings/ja/avatar.lua | 5 +- lua/app/config/strings/ja/avatar_frame.lua | 8 +- lua/app/config/strings/ja/item.lua | 11 +- lua/app/config/strings/ko/avatar.lua | 5 +- lua/app/config/strings/ko/avatar_frame.lua | 8 +- lua/app/config/strings/ko/item.lua | 11 +- lua/app/config/strings/pt/avatar.lua | 5 +- lua/app/config/strings/pt/avatar_frame.lua | 8 +- lua/app/config/strings/pt/item.lua | 11 +- lua/app/config/strings/ru/avatar.lua | 5 +- lua/app/config/strings/ru/avatar_frame.lua | 8 +- lua/app/config/strings/ru/item.lua | 11 +- lua/app/config/strings/th/avatar.lua | 5 +- lua/app/config/strings/th/avatar_frame.lua | 8 +- lua/app/config/strings/th/item.lua | 11 +- lua/app/config/strings/vi/avatar.lua | 5 +- lua/app/config/strings/vi/avatar_frame.lua | 8 +- lua/app/config/strings/vi/item.lua | 11 +- lua/app/config/strings/zh/avatar.lua | 5 +- lua/app/config/strings/zh/avatar_frame.lua | 8 +- lua/app/config/strings/zh/item.lua | 11 +- lua/app/config/tutorial.lua | 25 +- 49 files changed, 4659 insertions(+), 147 deletions(-) diff --git a/lua/app/config/arena_board.lua b/lua/app/config/arena_board.lua index 819bb7bc..5c4b8208 100644 --- a/lua/app/config/arena_board.lua +++ b/lua/app/config/arena_board.lua @@ -17038,9 +17038,4269 @@ local arena_board = { 0 } } + }, + [61]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [62]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [63]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [64]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [65]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + } + } + }, + [66]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [67]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [68]={ + ["board"]={ + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + } + } + }, + [69]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [70]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + } + } + }, + [71]={ + ["board"]={ + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + } + } + }, + [72]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 35 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [73]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [74]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [75]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } } } local config = { -data=arena_board,count=60 +data=arena_board,count=75 } return config \ No newline at end of file diff --git a/lua/app/config/arena_bounty_level.lua b/lua/app/config/arena_bounty_level.lua index b96e1fee..8f17d73b 100644 --- a/lua/app/config/arena_bounty_level.lua +++ b/lua/app/config/arena_bounty_level.lua @@ -1633,8 +1633,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=23, - ["id_for_nothing"]="VAs=", + ["id"]=44, + ["id_for_nothing"]="Ugw=", ["num"]=1, ["num_for_nothing"]="Vw==" } diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index fbc203a0..87b1a066 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -2186,11 +2186,11 @@ local arena_rank = { } }, ["rand_board"]={ - 1, - 2, - 3, - 4, - 5 + 61, + 62, + 63, + 64, + 65 }, ["effect"]={ { @@ -2352,11 +2352,11 @@ local arena_rank = { } }, ["rand_board"]={ - 6, - 7, - 8, - 9, - 10 + 61, + 62, + 63, + 64, + 65 }, ["effect"]={ { @@ -2518,11 +2518,11 @@ local arena_rank = { } }, ["rand_board"]={ - 11, - 12, - 13, - 14, - 15 + 61, + 62, + 63, + 64, + 65 }, ["effect"]={ { @@ -2557,8 +2557,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=24, - ["id_for_nothing"]="VAw=", + ["id"]=45, + ["id_for_nothing"]="Ug0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2692,11 +2692,11 @@ local arena_rank = { } }, ["rand_board"]={ - 16, - 17, - 18, - 19, - 20 + 66, + 67, + 68, + 69, + 70 }, ["effect"]={ { @@ -2731,8 +2731,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=24, - ["id_for_nothing"]="VAw=", + ["id"]=45, + ["id_for_nothing"]="Ug0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2866,11 +2866,11 @@ local arena_rank = { } }, ["rand_board"]={ - 21, - 22, - 23, - 24, - 25 + 66, + 67, + 68, + 69, + 70 }, ["effect"]={ { @@ -2905,8 +2905,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=24, - ["id_for_nothing"]="VAw=", + ["id"]=45, + ["id_for_nothing"]="Ug0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3040,11 +3040,11 @@ local arena_rank = { } }, ["rand_board"]={ - 26, - 27, - 28, - 29, - 30 + 66, + 67, + 68, + 69, + 70 }, ["effect"]={ { @@ -3079,8 +3079,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=24, - ["id_for_nothing"]="VAw=", + ["id"]=45, + ["id_for_nothing"]="Ug0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3214,11 +3214,11 @@ local arena_rank = { } }, ["rand_board"]={ - 31, - 32, - 33, - 34, - 35 + 66, + 67, + 68, + 69, + 70 }, ["effect"]={ { @@ -3253,8 +3253,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=25, - ["id_for_nothing"]="VA0=", + ["id"]=46, + ["id_for_nothing"]="Ug4=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3388,11 +3388,11 @@ local arena_rank = { } }, ["rand_board"]={ - 36, - 37, - 38, - 39, - 40 + 71, + 72, + 73, + 74, + 75 }, ["effect"]={ { @@ -3427,8 +3427,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=25, - ["id_for_nothing"]="VA0=", + ["id"]=46, + ["id_for_nothing"]="Ug4=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3562,11 +3562,11 @@ local arena_rank = { } }, ["rand_board"]={ - 41, - 42, - 43, - 44, - 45 + 71, + 72, + 73, + 74, + 75 }, ["effect"]={ { @@ -3601,8 +3601,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=25, - ["id_for_nothing"]="VA0=", + ["id"]=46, + ["id_for_nothing"]="Ug4=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3736,11 +3736,11 @@ local arena_rank = { } }, ["rand_board"]={ - 46, - 47, - 48, - 49, - 50 + 71, + 72, + 73, + 74, + 75 }, ["effect"]={ { @@ -3775,8 +3775,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=25, - ["id_for_nothing"]="VA0=", + ["id"]=46, + ["id_for_nothing"]="Ug4=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3910,11 +3910,11 @@ local arena_rank = { } }, ["rand_board"]={ - 51, - 52, - 53, - 54, - 55 + 71, + 72, + 73, + 74, + 75 }, ["effect"]={ { @@ -3949,8 +3949,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=25, - ["id_for_nothing"]="VA0=", + ["id"]=46, + ["id_for_nothing"]="Ug4=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -4084,11 +4084,11 @@ local arena_rank = { } }, ["rand_board"]={ - 56, - 57, - 58, - 59, - 60 + 71, + 72, + 73, + 74, + 75 }, ["effect"]={ { diff --git a/lua/app/config/avatar.lua b/lua/app/config/avatar.lua index cc73659d..204745ac 100644 --- a/lua/app/config/avatar.lua +++ b/lua/app/config/avatar.lua @@ -3,6 +3,11 @@ local avatar = { ["iconId"]="avatar_1", ["item"]=23 }, + [24]={ + ["iconId"]="avatar_2", + ["item"]=44, + ["unlock_show"]=true + }, [1001]={ ["iconId"]="1", ["hero"]=12001 @@ -108,6 +113,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/avatar_frame.lua b/lua/app/config/avatar_frame.lua index a45443e0..818a2917 100644 --- a/lua/app/config/avatar_frame.lua +++ b/lua/app/config/avatar_frame.lua @@ -10,9 +10,19 @@ local avatar_frame = { [25]={ ["iconId"]="avatar_frame_3", ["item"]=25 + }, + [26]={ + ["iconId"]="avatar_frame_2", + ["item"]=45, + ["unlock_show"]=true + }, + [27]={ + ["iconId"]="avatar_frame_3", + ["item"]=46, + ["unlock_show"]=true } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index c6e61cd6..b7d696f3 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -1408,6 +1408,21 @@ local item = { } } }, + [44]={ + ["type"]=9, + ["qlt"]=5, + ["icon"]="44" + }, + [45]={ + ["type"]=10, + ["qlt"]=4, + ["icon"]="45" + }, + [46]={ + ["type"]=10, + ["qlt"]=5, + ["icon"]="46" + }, [1001]={ ["type"]=2, ["qlt"]=1, @@ -2173,6 +2188,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } 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 866badf4..7bb71e74 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -423,6 +423,7 @@ local LocalizationGlobalConst = DUNGEON_ARMOR_DESC_17 = "DUNGEON_ARMOR_DESC_17", NAVER_SETTING_DESC = "NAVER_SETTING_DESC", EQUIP_DESC_26 = "EQUIP_DESC_26", + BATTLE_DESC_14 = "BATTLE_DESC_14", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 538dcbf0..2996c54b 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -10411,7 +10411,7 @@ local skill = { [10105]={ ["skill_type"]=9, ["skill_type_parameter"]={ - 15000 + 10000 }, ["effect_type"]=1, ["trigger"]=1, @@ -10763,7 +10763,7 @@ local skill = { [10116]={ ["skill_type"]=9, ["skill_type_parameter"]={ - 20000 + 10000 }, ["effect_type"]=1, ["trigger"]=1, @@ -11115,7 +11115,7 @@ local skill = { [10127]={ ["skill_type"]=9, ["skill_type_parameter"]={ - 25000 + 10000 }, ["effect_type"]=1, ["trigger"]=1, diff --git a/lua/app/config/strings/cn/avatar.lua b/lua/app/config/strings/cn/avatar.lua index 230c4f5d..84839025 100644 --- a/lua/app/config/strings/cn/avatar.lua +++ b/lua/app/config/strings/cn/avatar.lua @@ -2,6 +2,9 @@ local avatar = { [23]={ ["desc"]="S1竞技战令头像，愿你像洋葱头勇往直前！" }, + [24]={ + ["desc"]="S2竞技战令头像，愿你像洋葱头勇往直前！" + }, [1001]={ ["desc"]="激活舞女后获得。" }, @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/avatar_frame.lua b/lua/app/config/strings/cn/avatar_frame.lua index e73ac8dd..3a5ddc02 100644 --- a/lua/app/config/strings/cn/avatar_frame.lua +++ b/lua/app/config/strings/cn/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ ["desc"]="S1竞技场黄金头像，实力的证明。" + }, + [26]={ + ["desc"]="S2赛季白银头像框" + }, + [27]={ + ["desc"]="S2赛季黄金头像框" } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } 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 243be950..ac728e4e 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -423,6 +423,7 @@ local localization_global = ["DUNGEON_ARMOR_DESC_17"] = "本关今日剩余次数：{0}", ["NAVER_SETTING_DESC"] = "Naver", ["EQUIP_DESC_26"] = "4件防具 +{0}:", + ["BATTLE_DESC_14"] = "有还未完成的战斗，是否继续？", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index 613374dc..eacb9a3f 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -171,6 +171,18 @@ local item = { ["name"]="6阶防具材料包", ["desc"]="开启后可获得以下材料" }, + [44]={ + ["name"]="勇气洋葱头2", + ["desc"]="S1竞技战令头像，愿你像洋葱头勇往直前！" + }, + [45]={ + ["name"]="S2赛季白银头像框", + ["desc"]="S2竞技场白银头像框，力量的证明。" + }, + [46]={ + ["name"]="S2赛季黄金头像框", + ["desc"]="S2竞技场黄金头像框，英雄的光辉。" + }, [1001]={ ["name"]="暗淡陨铁", ["desc"]="一块暗淡的陨铁，蕴含着神秘的能量。" @@ -393,6 +405,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/avatar.lua b/lua/app/config/strings/de/avatar.lua index 192d69b3..e43f949e 100644 --- a/lua/app/config/strings/de/avatar.lua +++ b/lua/app/config/strings/de/avatar.lua @@ -1,6 +1,9 @@ local avatar = { [23]={ + }, + [24]={ + }, [1001]={ @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/avatar_frame.lua b/lua/app/config/strings/de/avatar_frame.lua index d3496ad5..924596db 100644 --- a/lua/app/config/strings/de/avatar_frame.lua +++ b/lua/app/config/strings/de/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ + }, + [26]={ + + }, + [27]={ + } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/item.lua b/lua/app/config/strings/de/item.lua index df363a4b..83d2f4dd 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -127,6 +127,15 @@ local item = { }, [43]={ + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + }, [1001]={ @@ -295,6 +304,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/avatar.lua b/lua/app/config/strings/en/avatar.lua index 553fe14e..285f05c1 100644 --- a/lua/app/config/strings/en/avatar.lua +++ b/lua/app/config/strings/en/avatar.lua @@ -1,6 +1,9 @@ local avatar = { [23]={ ["desc"]="S1 Arena Battle Pass Avatar. May you forge ahead like a brave Onion Head!" + }, + [24]={ + }, [1001]={ ["desc"]="Obtained after activating Dancer." @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/avatar_frame.lua b/lua/app/config/strings/en/avatar_frame.lua index 92c27c22..db78378c 100644 --- a/lua/app/config/strings/en/avatar_frame.lua +++ b/lua/app/config/strings/en/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ ["desc"]="S1 Gold Arena Avatar Frame. Proof of your prowess." + }, + [26]={ + + }, + [27]={ + } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index f75b5f73..30527633 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -170,6 +170,15 @@ local item = { [43]={ ["name"]="Tier 6 Armor Material Pack", ["desc"]="Open to obtain following materials" + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + }, [1001]={ ["name"]="Dim Meteorite", @@ -393,6 +402,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/avatar.lua b/lua/app/config/strings/es/avatar.lua index c4f1c33a..004667cd 100644 --- a/lua/app/config/strings/es/avatar.lua +++ b/lua/app/config/strings/es/avatar.lua @@ -1,6 +1,9 @@ local avatar = { [23]={ ["desc"]="Avatar de Pase de Batalla de Arena S1. Que sigue adelante con valentía como Cebolla!" + }, + [24]={ + }, [1001]={ ["desc"]="Se obtiene tras activar Bailarina." @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/avatar_frame.lua b/lua/app/config/strings/es/avatar_frame.lua index 99901eb6..0c842351 100644 --- a/lua/app/config/strings/es/avatar_frame.lua +++ b/lua/app/config/strings/es/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ ["desc"]="Marco de avatar de oro Temporada S1, prueba de fuerza." + }, + [26]={ + + }, + [27]={ + } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/item.lua b/lua/app/config/strings/es/item.lua index f1c0a24a..45a71008 100644 --- a/lua/app/config/strings/es/item.lua +++ b/lua/app/config/strings/es/item.lua @@ -170,6 +170,15 @@ local item = { [43]={ ["name"]="Paquete de Material para Armadura Clase 6", ["desc"]="Abre para obtener los siguientes materiales" + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + }, [1001]={ ["name"]="Meteorito Opaco", @@ -393,6 +402,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/avatar.lua b/lua/app/config/strings/fr/avatar.lua index 192d69b3..e43f949e 100644 --- a/lua/app/config/strings/fr/avatar.lua +++ b/lua/app/config/strings/fr/avatar.lua @@ -1,6 +1,9 @@ local avatar = { [23]={ + }, + [24]={ + }, [1001]={ @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/avatar_frame.lua b/lua/app/config/strings/fr/avatar_frame.lua index d3496ad5..924596db 100644 --- a/lua/app/config/strings/fr/avatar_frame.lua +++ b/lua/app/config/strings/fr/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ + }, + [26]={ + + }, + [27]={ + } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/item.lua b/lua/app/config/strings/fr/item.lua index df363a4b..83d2f4dd 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -127,6 +127,15 @@ local item = { }, [43]={ + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + }, [1001]={ @@ -295,6 +304,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/avatar.lua b/lua/app/config/strings/id/avatar.lua index d6b3df3b..4a7f6824 100644 --- a/lua/app/config/strings/id/avatar.lua +++ b/lua/app/config/strings/id/avatar.lua @@ -1,6 +1,9 @@ local avatar = { [23]={ ["desc"]="Avatar battle kompetitif S1. Semoga sukses!" + }, + [24]={ + }, [1001]={ ["desc"]="Dapat setelah lolos Dancer" @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/avatar_frame.lua b/lua/app/config/strings/id/avatar_frame.lua index 52ad26be..b16be72b 100644 --- a/lua/app/config/strings/id/avatar_frame.lua +++ b/lua/app/config/strings/id/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ ["desc"]="Bingkai Avatar Emas S1. Bukti kekuatan!" + }, + [26]={ + + }, + [27]={ + } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/item.lua b/lua/app/config/strings/id/item.lua index 53492d39..76f487bf 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -170,6 +170,15 @@ local item = { [43]={ ["name"]="Paket Material Armor Tier 6", ["desc"]="Buka untuk mendapatkan material berikut:" + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + }, [1001]={ ["name"]="Chondrite", @@ -393,6 +402,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/avatar.lua b/lua/app/config/strings/ja/avatar.lua index c918e8e7..9bfd80f3 100644 --- a/lua/app/config/strings/ja/avatar.lua +++ b/lua/app/config/strings/ja/avatar.lua @@ -1,6 +1,9 @@ local avatar = { [23]={ ["desc"]="S1闘技場戦令アイコン。タマネギのように前に進みますように！" + }, + [24]={ + }, [1001]={ ["desc"]="ダンサーをアクティブ化後獲得できる。" @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/avatar_frame.lua b/lua/app/config/strings/ja/avatar_frame.lua index 231c9cec..667bc5a8 100644 --- a/lua/app/config/strings/ja/avatar_frame.lua +++ b/lua/app/config/strings/ja/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ ["desc"]="S1闘技場ゴールドフレーム。実力の証。" + }, + [26]={ + + }, + [27]={ + } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index 8d76c3a3..82fba14e 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -170,6 +170,15 @@ local item = { [43]={ ["name"]="6階防具材料パック", ["desc"]="開けると、以下の材料を獲得できる" + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + }, [1001]={ ["name"]="薄暗い隕石", @@ -393,6 +402,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/avatar.lua b/lua/app/config/strings/ko/avatar.lua index dbef4ba1..0fe17b3e 100644 --- a/lua/app/config/strings/ko/avatar.lua +++ b/lua/app/config/strings/ko/avatar.lua @@ -1,6 +1,9 @@ local avatar = { [23]={ ["desc"]="S1 아레나 배틀 패스 아이콘, 양파 헤드처럼 씩씩하게 나아가시길 바랍니다!" + }, + [24]={ + }, [1001]={ ["desc"]="무희을(를) 활성화한 후, 획득할 수 있습니다." @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/avatar_frame.lua b/lua/app/config/strings/ko/avatar_frame.lua index 2529d319..e9778a28 100644 --- a/lua/app/config/strings/ko/avatar_frame.lua +++ b/lua/app/config/strings/ko/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ ["desc"]="S1 아레나 골드 아이콘 프레임, 검증받은 실력입니다." + }, + [26]={ + + }, + [27]={ + } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/item.lua b/lua/app/config/strings/ko/item.lua index fdf97876..e51b7cd4 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -170,6 +170,15 @@ local item = { [43]={ ["name"]="6티어 방어구 재료 패키지", ["desc"]="오픈 후 다음의 재료를 획득할 수 있습니다." + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + }, [1001]={ ["name"]="알렌데 운석", @@ -393,6 +402,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/avatar.lua b/lua/app/config/strings/pt/avatar.lua index b968a642..05104c94 100644 --- a/lua/app/config/strings/pt/avatar.lua +++ b/lua/app/config/strings/pt/avatar.lua @@ -1,6 +1,9 @@ local avatar = { [23]={ ["desc"]="Avatar da Ordem de Batalha da S1. Que você tenha a coragem como a Cabeça de Cebola!" + }, + [24]={ + }, [1001]={ ["desc"]="Ativar Dançarina para obter." @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/avatar_frame.lua b/lua/app/config/strings/pt/avatar_frame.lua index 5f9fd56b..c7b20baf 100644 --- a/lua/app/config/strings/pt/avatar_frame.lua +++ b/lua/app/config/strings/pt/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ ["desc"]="Moldura de avatar de ouro da Arena S1, uma testemunha do poder." + }, + [26]={ + + }, + [27]={ + } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/item.lua b/lua/app/config/strings/pt/item.lua index d2683ee1..4278fd13 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -170,6 +170,15 @@ local item = { [43]={ ["name"]="Pacote de Materiais de Armadura do Ranque 6", ["desc"]="Concede os seguintes materiais." + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + }, [1001]={ ["name"]="Ferro Meteórico Opaco", @@ -393,6 +402,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/avatar.lua b/lua/app/config/strings/ru/avatar.lua index 192d69b3..e43f949e 100644 --- a/lua/app/config/strings/ru/avatar.lua +++ b/lua/app/config/strings/ru/avatar.lua @@ -1,6 +1,9 @@ local avatar = { [23]={ + }, + [24]={ + }, [1001]={ @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/avatar_frame.lua b/lua/app/config/strings/ru/avatar_frame.lua index d3496ad5..924596db 100644 --- a/lua/app/config/strings/ru/avatar_frame.lua +++ b/lua/app/config/strings/ru/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ + }, + [26]={ + + }, + [27]={ + } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/item.lua b/lua/app/config/strings/ru/item.lua index df363a4b..83d2f4dd 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -127,6 +127,15 @@ local item = { }, [43]={ + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + }, [1001]={ @@ -295,6 +304,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/avatar.lua b/lua/app/config/strings/th/avatar.lua index ff0a66da..713f1c29 100644 --- a/lua/app/config/strings/th/avatar.lua +++ b/lua/app/config/strings/th/avatar.lua @@ -1,6 +1,9 @@ local avatar = { [23]={ ["desc"]="อวาตาร์ป้ายรบของอารีน่า S1 ขอให้คุณก้าวไปข้างหน้าอย่างกล้าหาญเหมือนหัวหอม!" + }, + [24]={ + }, [1001]={ ["desc"]="หลังจากการเปิดใช้งานสาวเต้นจะได้รับ" @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/avatar_frame.lua b/lua/app/config/strings/th/avatar_frame.lua index 6d502e0c..58eecffc 100644 --- a/lua/app/config/strings/th/avatar_frame.lua +++ b/lua/app/config/strings/th/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ ["desc"]="กรอบรูปทองของอารีน่า S1 พิสูจน์ความแข็งแกร่ง" + }, + [26]={ + + }, + [27]={ + } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/item.lua b/lua/app/config/strings/th/item.lua index 61c41deb..525998fe 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -170,6 +170,15 @@ local item = { [43]={ ["name"]="แพ็ควัสดุเกราะขั้นที่ 6", ["desc"]="หลังเปิดจะได้รับวัสดุต่อไปนี้" + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + }, [1001]={ ["name"]="อุกกาบาตทื่อ", @@ -393,6 +402,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/avatar.lua b/lua/app/config/strings/vi/avatar.lua index 9819a128..2cd7928d 100644 --- a/lua/app/config/strings/vi/avatar.lua +++ b/lua/app/config/strings/vi/avatar.lua @@ -1,6 +1,9 @@ local avatar = { [23]={ ["desc"]="Avatar Chiến Lệnh S1, như một Onion gan dạ xông lên!" + }, + [24]={ + }, [1001]={ ["desc"]="Kích hoạt Vũ Cơ nhận được." @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/avatar_frame.lua b/lua/app/config/strings/vi/avatar_frame.lua index c98bbf6d..647b250e 100644 --- a/lua/app/config/strings/vi/avatar_frame.lua +++ b/lua/app/config/strings/vi/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ ["desc"]="Khung Avatar Vàng Đấu Trường S1, biểu tượng thực lực." + }, + [26]={ + + }, + [27]={ + } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/item.lua b/lua/app/config/strings/vi/item.lua index e6a01a83..37a3cb6e 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -170,6 +170,15 @@ local item = { [43]={ ["name"]="Quà VL Phòng Cụ Bậc 6", ["desc"]="Mở được nhận vật liệu sau" + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + }, [1001]={ ["name"]="Thiên Thạch Ảm Đạm", @@ -393,6 +402,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/avatar.lua b/lua/app/config/strings/zh/avatar.lua index 21f63044..87480fbd 100644 --- a/lua/app/config/strings/zh/avatar.lua +++ b/lua/app/config/strings/zh/avatar.lua @@ -1,6 +1,9 @@ local avatar = { [23]={ ["desc"]="S1競技戰令頭像，願你像洋蔥頭勇往直前！" + }, + [24]={ + }, [1001]={ ["desc"]="啟動舞孃後獲得。" @@ -79,6 +82,6 @@ local avatar = { } } local config = { -data=avatar,count=26 +data=avatar,count=27 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/avatar_frame.lua b/lua/app/config/strings/zh/avatar_frame.lua index ffb89880..038aa2d5 100644 --- a/lua/app/config/strings/zh/avatar_frame.lua +++ b/lua/app/config/strings/zh/avatar_frame.lua @@ -7,9 +7,15 @@ local avatar_frame = { }, [25]={ ["desc"]="S1競技場黃金頭像框，實力的證明。" + }, + [26]={ + + }, + [27]={ + } } local config = { -data=avatar_frame,count=3 +data=avatar_frame,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index 82aedcd3..034d5292 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -170,6 +170,15 @@ local item = { [43]={ ["name"]="6階防具材料包", ["desc"]="開啟後可獲得以下材料" + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + }, [1001]={ ["name"]="暗淡隕鐵", @@ -393,6 +402,6 @@ local item = { } } local config = { -data=item,count=98 +data=item,count=101 } return config \ No newline at end of file diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index d05e0d87..350de8d7 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -619,7 +619,6 @@ local tutorial = { ["next_id"]=80010, ["type"]=2, ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", - ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -640,7 +639,6 @@ local tutorial = { ["delay"]=0.5, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/formation/hero_3", - ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -652,7 +650,6 @@ local tutorial = { ["next_id"]=80030, ["type"]=2, ["target_name"]="hero_detail_ui(Clone)/common/btns/btn_weapon", - ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -666,8 +663,7 @@ local tutorial = { ["txt_offset"]={ 0, 200 - }, - ["func_id"]="dungeon_weapon_open" + } }, [80040]={ ["next_id"]=80050, @@ -678,7 +674,6 @@ local tutorial = { 200 }, ["target_name"]="hero_detail_ui(Clone)/common/btn_close", - ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -689,7 +684,6 @@ local tutorial = { ["next_id"]=80060, ["type"]=2, ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1", - ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -709,7 +703,6 @@ local tutorial = { ["next_id"]=80070, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right/dungeon", - ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -724,8 +717,7 @@ local tutorial = { }, [80070]={ ["type"]=2, - ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/dungeon_weapon_open/btn_start", - ["func_id"]="dungeon_weapon_open", + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/scroll_cell_2/btn_start", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -736,7 +728,6 @@ local tutorial = { ["next_id"]=90010, ["type"]=2, ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", - ["func_id"]="dungeon_armor_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -757,7 +748,6 @@ local tutorial = { ["delay"]=0.5, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/formation/hero_3", - ["func_id"]="dungeon_armor_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -769,7 +759,6 @@ local tutorial = { ["next_id"]=90030, ["type"]=2, ["target_name"]="hero_detail_ui(Clone)/common/btns/btn_armor", - ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -783,8 +772,7 @@ local tutorial = { ["txt_offset"]={ 0, 200 - }, - ["func_id"]="dungeon_armor_open" + } }, [90040]={ ["next_id"]=90050, @@ -795,7 +783,6 @@ local tutorial = { 200 }, ["target_name"]="hero_detail_ui(Clone)/common/btn_close", - ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -806,7 +793,6 @@ local tutorial = { ["next_id"]=90060, ["type"]=2, ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1", - ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -826,7 +812,6 @@ local tutorial = { ["next_id"]=90070, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right/dungeon", - ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -842,8 +827,7 @@ local tutorial = { [90070]={ ["next_id"]=90080, ["type"]=2, - ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/dungeon_armor_open/btn_start", - ["func_id"]="dungeon_armor_open", + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/scroll_cell_3/btn_start", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -853,7 +837,6 @@ local tutorial = { [90080]={ ["type"]=2, ["target_name"]="dungeon_armor_main_ui(Clone)/scrollrect/viewport/content/scroll_cell_1/touch_node", - ["func_id"]="dungeon_armor_open", ["arrow_direction"]=4, ["arrow_offset"]={ 20,