From 041d222d5392368da29ac4348e44d12ec9e68fd1 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 2 Aug 2023 18:30:43 +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/act_chapter_store.lua | 52 +- lua/app/config/act_gift.lua | 40 +- lua/app/config/act_growup_gift_new.lua | 24 +- lua/app/config/chapter_board.lua | 152 ++--- .../config/chapter_board_daily_challenge.lua | 532 +++++++++--------- lua/app/config/item.lua | 81 ++- lua/app/config/monster_chapter.lua | 100 ++-- lua/app/config/strings/cn/item.lua | 6 +- lua/app/config/strings/de/item.lua | 5 +- lua/app/config/strings/en/item.lua | 5 +- lua/app/config/strings/es/item.lua | 5 +- lua/app/config/strings/fr/item.lua | 5 +- lua/app/config/strings/id/item.lua | 5 +- lua/app/config/strings/ja/item.lua | 5 +- lua/app/config/strings/ko/item.lua | 5 +- lua/app/config/strings/pt/item.lua | 5 +- lua/app/config/strings/ru/item.lua | 5 +- lua/app/config/strings/th/item.lua | 5 +- lua/app/config/strings/vi/item.lua | 5 +- lua/app/config/strings/zh/item.lua | 5 +- lua/app/config/summon.lua | 510 +++++++++++++---- lua/app/config/tutorial.lua | 25 +- 22 files changed, 997 insertions(+), 585 deletions(-) diff --git a/lua/app/config/act_chapter_store.lua b/lua/app/config/act_chapter_store.lua index 05f2fbd7..e9aefd97 100644 --- a/lua/app/config/act_chapter_store.lua +++ b/lua/app/config/act_chapter_store.lua @@ -141,8 +141,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -181,8 +181,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -221,8 +221,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -261,8 +261,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -301,8 +301,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=6, ["num_for_nothing"]="UA==" } @@ -341,8 +341,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=6, ["num_for_nothing"]="UA==" } @@ -381,8 +381,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=8, ["num_for_nothing"]="Xg==" } @@ -421,8 +421,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=8, ["num_for_nothing"]="Xg==" } @@ -461,8 +461,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=8, ["num_for_nothing"]="Xg==" } @@ -501,8 +501,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=20, ["num_for_nothing"]="VAg=" } @@ -541,8 +541,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=20, ["num_for_nothing"]="VAg=" } @@ -581,8 +581,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=20, ["num_for_nothing"]="VAg=" } @@ -621,8 +621,8 @@ local act_chapter_store = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=20, ["num_for_nothing"]="VAg=" } diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index 367126eb..60349080 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -206,8 +206,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -244,8 +244,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=5, ["num_for_nothing"]="Uw==" } @@ -282,8 +282,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=8, ["num_for_nothing"]="Xg==" } @@ -320,8 +320,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=5, ["num_for_nothing"]="Uw==" } @@ -358,8 +358,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=18, ["num_for_nothing"]="VwA=" } @@ -396,8 +396,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=24, ["num_for_nothing"]="VAw=" } @@ -577,8 +577,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=6, ["num_for_nothing"]="UA==" } @@ -619,8 +619,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=6, ["num_for_nothing"]="UA==" } @@ -661,8 +661,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=6, ["num_for_nothing"]="UA==" } @@ -703,8 +703,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=6, ["num_for_nothing"]="UA==" } diff --git a/lua/app/config/act_growup_gift_new.lua b/lua/app/config/act_growup_gift_new.lua index 23b3397d..219e832e 100644 --- a/lua/app/config/act_growup_gift_new.lua +++ b/lua/app/config/act_growup_gift_new.lua @@ -23,8 +23,8 @@ local act_growup_gift_new = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=8, ["num_for_nothing"]="Xg==" } @@ -57,8 +57,8 @@ local act_growup_gift_new = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=12, ["num_for_nothing"]="Vwo=" } @@ -91,8 +91,8 @@ local act_growup_gift_new = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=24, ["num_for_nothing"]="VAw=" } @@ -125,8 +125,8 @@ local act_growup_gift_new = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=36, ["num_for_nothing"]="VQ4=" } @@ -159,8 +159,8 @@ local act_growup_gift_new = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=96, ["num_for_nothing"]="Xw4=" } @@ -193,8 +193,8 @@ local act_growup_gift_new = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=138, ["num_for_nothing"]="VwtU" } diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 40f383f6..ae11b825 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -9749,11 +9749,11 @@ local chapter_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { @@ -9773,11 +9773,11 @@ local chapter_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { @@ -9947,11 +9947,11 @@ local chapter_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { @@ -9971,11 +9971,11 @@ local chapter_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { @@ -10023,7 +10023,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -10039,7 +10039,7 @@ local chapter_board = { 4 }, { - 3, + 2, 0 }, { @@ -10079,7 +10079,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -10087,7 +10087,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -10095,7 +10095,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -10111,7 +10111,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -10119,7 +10119,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -10195,7 +10195,7 @@ local chapter_board = { 0 }, { - 1, + 2, 0 }, { @@ -10211,7 +10211,7 @@ local chapter_board = { 3 }, { - 1, + 2, 0 }, { @@ -10231,7 +10231,7 @@ local chapter_board = { 5 }, { - 5, + 0, 5 }, { @@ -10255,7 +10255,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -10263,7 +10263,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -10283,15 +10283,15 @@ local chapter_board = { 1 }, { - 3, + 0, 0 }, { - 3, + 2, 0 }, { - 3, + 0, 0 }, { @@ -10311,7 +10311,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -10319,7 +10319,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -10339,15 +10339,15 @@ local chapter_board = { 3 }, { - 3, + 0, 0 }, { - 3, + 2, 0 }, { - 3, + 0, 0 }, { @@ -10363,11 +10363,11 @@ local chapter_board = { 0 }, { - 1, + 3, 0 }, { - 3, + 2, 0 }, { @@ -10375,11 +10375,11 @@ local chapter_board = { 2 }, { - 3, + 2, 0 }, { - 1, + 3, 0 }, { @@ -10391,11 +10391,11 @@ local chapter_board = { [38]={ ["board"]={ { - 1, + 7, 0 }, { - 1, + 2, 0 }, { @@ -10408,18 +10408,18 @@ local chapter_board = { }, { 0, - 4 + 2 }, { - 1, + 2, 0 }, { - 1, + 7, 0 }, { - 1, + 7, 0 }, { @@ -10443,11 +10443,11 @@ local chapter_board = { 3 }, { - 1, + 7, 0 }, { - 1, + 7, 0 }, { @@ -10464,18 +10464,18 @@ local chapter_board = { }, { 0, - 5 + 1 }, { 2, 0 }, { - 1, + 7, 0 }, { - 1, + 7, 0 }, { @@ -10499,11 +10499,11 @@ local chapter_board = { 2 }, { - 1, + 7, 0 }, { - 1, + 7, 0 }, { @@ -10527,11 +10527,11 @@ local chapter_board = { 0 }, { - 1, + 7, 0 }, { - 1, + 7, 0 }, { @@ -10539,7 +10539,7 @@ local chapter_board = { 3 }, { - 3, + 2, 0 }, { @@ -10547,7 +10547,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -10555,15 +10555,15 @@ local chapter_board = { 5 }, { - 1, + 7, 0 }, { - 1, + 7, 0 }, { - 1, + 2, 0 }, { @@ -10579,21 +10579,21 @@ local chapter_board = { 0 }, { - 1, + 2, 0 }, { - 1, + 7, 0 } }, ["mystery_box_board"]={ { - 1, + 7, 0 }, { - 1, + 2, 0 }, { @@ -10606,18 +10606,18 @@ local chapter_board = { }, { 0, - 4 + 2 }, { - 1, + 2, 0 }, { - 1, + 7, 0 }, { - 1, + 7, 0 }, { @@ -10641,11 +10641,11 @@ local chapter_board = { 3 }, { - 1, + 7, 0 }, { - 1, + 7, 0 }, { @@ -10662,18 +10662,18 @@ local chapter_board = { }, { 0, - 5 + 1 }, { 2, 0 }, { - 1, + 7, 0 }, { - 1, + 7, 0 }, { @@ -10697,11 +10697,11 @@ local chapter_board = { 2 }, { - 1, + 7, 0 }, { - 1, + 7, 0 }, { @@ -10725,11 +10725,11 @@ local chapter_board = { 0 }, { - 1, + 7, 0 }, { - 1, + 7, 0 }, { @@ -10737,7 +10737,7 @@ local chapter_board = { 3 }, { - 3, + 2, 0 }, { @@ -10745,7 +10745,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -10753,15 +10753,15 @@ local chapter_board = { 5 }, { - 1, + 7, 0 }, { - 1, + 7, 0 }, { - 1, + 2, 0 }, { @@ -10777,11 +10777,11 @@ local chapter_board = { 0 }, { - 1, + 2, 0 }, { - 1, + 7, 0 } } diff --git a/lua/app/config/chapter_board_daily_challenge.lua b/lua/app/config/chapter_board_daily_challenge.lua index 2bbc37e7..b6666eb8 100644 --- a/lua/app/config/chapter_board_daily_challenge.lua +++ b/lua/app/config/chapter_board_daily_challenge.lua @@ -2407,39 +2407,7 @@ local chapter_board_daily_challenge = { }, { 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 4 + 5 }, { 0, @@ -2451,60 +2419,8 @@ local chapter_board_daily_challenge = { }, { 0, - 3 - }, - { - 1, - 0 - }, - { - 23, - 2 - }, - { - 23, - 2 - }, - { - 27, 1 }, - { - 27, - 2 - }, - { - 27, - 3 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 23, - 2 - }, - { - 23, - 2 - }, - { - 27, - 4 - }, - { - 26, - 0 - }, - { - 27, - 4 - }, { 0, 5 @@ -2513,13 +2429,97 @@ local chapter_board_daily_challenge = { 1, 0 }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 5 + }, + { + 27, + 1 + }, + { + 27, + 2 + }, + { + 27, + 1 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 27, + 4 + }, { 14, 0 }, { - 23, - 3 + 27, + 4 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 }, { 27, @@ -2547,32 +2547,12 @@ local chapter_board_daily_challenge = { }, { 23, - 3 + 4 }, { 23, 5 }, - { - 23, - 5 - }, - { - 23, - 1 - }, - { - 23, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 23, 3 @@ -2581,17 +2561,37 @@ local chapter_board_daily_challenge = { 23, 5 }, + { + 23, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 23, + 4 + }, { 23, 5 }, { 23, - 1 + 3 }, { 23, - 1 + 5 + }, + { + 23, + 4 }, { 1, @@ -2619,7 +2619,7 @@ local chapter_board_daily_challenge = { }, { 0, - 3 + 1 }, { 1, @@ -2651,7 +2651,7 @@ local chapter_board_daily_challenge = { }, { 0, - 3 + 1 }, { 1, @@ -2675,7 +2675,7 @@ local chapter_board_daily_challenge = { }, { 27, - 3 + 1 }, { 0, @@ -2703,7 +2703,7 @@ local chapter_board_daily_challenge = { }, { 27, - 4 + 5 }, { 25, @@ -2731,7 +2731,7 @@ local chapter_board_daily_challenge = { }, { 27, - 5 + 4 }, { 0, @@ -2751,7 +2751,7 @@ local chapter_board_daily_challenge = { }, { 23, - 2 + 4 }, { 23, @@ -2763,7 +2763,7 @@ local chapter_board_daily_challenge = { }, { 23, - 5 + 1 }, { 1, @@ -2779,7 +2779,7 @@ local chapter_board_daily_challenge = { }, { 23, - 1 + 4 }, { 14, @@ -2787,7 +2787,7 @@ local chapter_board_daily_challenge = { }, { 23, - 3 + 4 }, { 1, @@ -2866,16 +2866,16 @@ local chapter_board_daily_challenge = { 5 }, { - 23, + 0, 3 }, { - 23, + 0, 2 }, { - 23, - 1 + 0, + 3 }, { 0, @@ -2890,24 +2890,24 @@ local chapter_board_daily_challenge = { 0 }, { - 0, - 5 - }, - { - 23, - 4 - }, - { - 26, + 25, 0 }, { - 23, - 2 + 25, + 0 }, { - 0, - 5 + 25, + 0 + }, + { + 25, + 0 + }, + { + 25, + 0 }, { 1, @@ -2919,15 +2919,7 @@ local chapter_board_daily_challenge = { }, { 23, - 4 - }, - { - 23, - 5 - }, - { - 23, - 4 + 3 }, { 23, @@ -2935,51 +2927,59 @@ local chapter_board_daily_challenge = { }, { 23, - 2 + 3 + }, + { + 23, + 3 + }, + { + 23, + 3 + }, + { + 23, + 3 }, { 23, 1 }, + { + 26, + 0 + }, { 23, - 2 + 1 }, { 26, 0 }, + { + 23, + 1 + }, + { + 26, + 0 + }, + { + 23, + 1 + }, { 23, 4 }, { - 26, - 0 + 23, + 4 }, { 23, - 2 - }, - { - 26, - 0 - }, - { - 23, - 2 - }, - { - 23, - 1 - }, - { - 23, - 2 - }, - { - 23, - 3 + 4 }, { 14, @@ -2987,7 +2987,7 @@ local chapter_board_daily_challenge = { }, { 23, - 1 + 4 }, { 23, @@ -2995,16 +2995,12 @@ local chapter_board_daily_challenge = { }, { 23, - 3 + 4 } } }, [16]={ ["board_daily_challenge"]={ - { - 1, - 0 - }, { 1, 0 @@ -3013,33 +3009,9 @@ local chapter_board_daily_challenge = { 0, 3 }, - { - 24, - 0 - }, - { - 24, - 0 - }, { 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 + 5 }, { 0, @@ -3069,6 +3041,30 @@ local chapter_board_daily_challenge = { 0, 4 }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, { 0, 4 @@ -3079,14 +3075,18 @@ local chapter_board_daily_challenge = { }, { 0, - 5 + 4 }, { 0, - 5 + 1 }, { - 23, + 1, + 0 + }, + { + 0, 1 }, { @@ -3094,7 +3094,7 @@ local chapter_board_daily_challenge = { 0 }, { - 23, + 0, 3 }, { @@ -3102,15 +3102,15 @@ local chapter_board_daily_challenge = { 4 }, { - 23, - 5 + 0, + 1 }, { 24, 0 }, { - 23, + 0, 3 }, { @@ -3194,8 +3194,8 @@ local chapter_board_daily_challenge = { 0 }, { - 23, - 3 + 1, + 0 } } }, @@ -3223,7 +3223,7 @@ local chapter_board_daily_challenge = { }, { 0, - 4 + 1 }, { 1, @@ -3279,7 +3279,7 @@ local chapter_board_daily_challenge = { }, { 0, - 5 + 2 }, { 32, @@ -3303,11 +3303,11 @@ local chapter_board_daily_challenge = { }, { 4, - 4 + 2 }, { 4, - 5 + 1 }, { 1, @@ -3395,7 +3395,7 @@ local chapter_board_daily_challenge = { }, { 1, - 0 + 1 } } }, @@ -4122,15 +4122,15 @@ local chapter_board_daily_challenge = { 2 }, { - 1, + 31, 0 }, { - 1, + 31, 0 }, { - 1, + 31, 0 }, { @@ -4146,23 +4146,23 @@ local chapter_board_daily_challenge = { 1 }, { - 1, + 31, 0 }, { - 1, + 31, 0 }, { - 1, + 31, 0 }, { - 1, + 31, 0 }, { - 1, + 31, 0 }, { @@ -4170,31 +4170,31 @@ local chapter_board_daily_challenge = { 3 }, { - 1, + 31, 0 }, { - 1, + 31, 0 }, { - 1, + 31, 0 }, { - 1, + 31, 0 }, { - 1, + 31, 0 }, { - 1, + 31, 0 }, { - 1, + 31, 0 } } @@ -4317,6 +4317,34 @@ local chapter_board_daily_challenge = { 1, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 34, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 34, 1 @@ -4325,45 +4353,17 @@ local chapter_board_daily_challenge = { 34, 2 }, - { - 34, - 3 - }, - { - 34, - 4 - }, - { - 34, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 14, 0 }, { - 1, + 34, 0 }, { - 1, - 0 + 34, + 5 }, { 1, @@ -4499,7 +4499,7 @@ local chapter_board_daily_challenge = { }, { 0, - 2 + 3 }, { 32, @@ -4522,12 +4522,12 @@ local chapter_board_daily_challenge = { 0 }, { - 0, - 2 + 32, + 0 }, { - 0, - 2 + 32, + 0 }, { 32, diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index b7d696f3..ce0eaff4 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -267,8 +267,8 @@ local item = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -356,8 +356,8 @@ local item = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=2, ["num_for_nothing"]="VA==" }, @@ -395,7 +395,7 @@ local item = { }, { ["type"]=1, - ["id"]=6, + ["id"]=47, ["num"]=1, ["weight"]=60 } @@ -445,7 +445,7 @@ local item = { }, { ["type"]=1, - ["id"]=6, + ["id"]=47, ["num"]=1, ["weight"]=60 } @@ -1423,6 +1423,73 @@ local item = { ["qlt"]=5, ["icon"]="46" }, + [47]={ + ["type"]=11, + ["qlt"]=5, + ["icon"]="47", + ["hero_drop"]={ + { + ["type"]=1, + ["id"]=14001, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=24001, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=34001, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=44001, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=54001, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=14002, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=24002, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=34002, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=44002, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=54002, + ["num"]=1, + ["weight"]=100 + } + } + }, [1001]={ ["type"]=2, ["qlt"]=1, @@ -2188,6 +2255,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 204ff255..473c3cc6 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -2243,22 +2243,10 @@ local monster_chapter = { ["monster_exp"]=22000 }, [17101]={ - ["monster_base"]=10010, + ["monster_base"]=10038, ["hp"]=50510000, ["atk"]=2400000, ["atk_times"]=3, - ["hurt_skill"]={ - 20028, - 20029, - 20030 - }, - ["monster_exp"]=11000 - }, - [17201]={ - ["monster_base"]=10038, - ["hp"]=70380000, - ["atk"]=2530000, - ["atk_times"]=3, ["hurt_skill"]={ 20109, 20110, @@ -2266,46 +2254,55 @@ local monster_chapter = { }, ["monster_exp"]=11000 }, + [17201]={ + ["monster_base"]=10040, + ["hp"]=70380000, + ["atk"]=2530000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20115, + 20116, + 20117 + }, + ["monster_exp"]=11000 + }, [17301]={ - ["monster_base"]=10033, + ["monster_base"]=10010, ["hp"]=79490000, ["atk"]=2640000, ["atk_times"]=3, ["hurt_skill"]={ - 20094, - 20095, - 20096 + 20028, + 20029, + 20030 }, ["monster_exp"]=17000 }, [17401]={ - ["monster_base"]=10031, + ["monster_base"]=10039, ["hp"]=105710000, ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ - 20088, - 20089, - 20090 + 20112, + 20113, + 20114 }, ["monster_exp"]=19000 }, [17501]={ - ["monster_base"]=20005, + ["monster_base"]=20012, ["is_boss"]=1, ["hp"]=146830000, ["atk"]=2920000, ["atk_times"]=4, ["hurt_skill"]={ - 30013, - 30014, - 30015 + 30034, + 30035, + 30036 }, ["skill"]={ - 10024 - }, - ["passive_skill"]={ - 10012 + 10017 }, ["monster_exp"]=18000 }, @@ -2374,66 +2371,69 @@ local monster_chapter = { ["monster_exp"]=12000 }, [18101]={ - ["monster_base"]=10038, + ["monster_base"]=10013, ["hp"]=159800000, ["atk"]=3110000, ["atk_times"]=3, ["hurt_skill"]={ - 20109, - 20110, - 20111 + 20034, + 20035, + 20036 }, ["monster_exp"]=16000 }, [18201]={ - ["monster_base"]=10040, + ["monster_base"]=10016, ["hp"]=181060000, ["atk"]=3210000, ["atk_times"]=3, ["hurt_skill"]={ - 20115, - 20116, - 20117 + 20043, + 20044, + 20045 }, ["monster_exp"]=18000 }, [18301]={ - ["monster_base"]=10010, + ["monster_base"]=10015, ["hp"]=192100000, ["atk"]=3310000, ["atk_times"]=3, ["hurt_skill"]={ - 20028, - 20029, - 20030 + 20040, + 20041, + 20042 }, ["monster_exp"]=21000 }, [18401]={ - ["monster_base"]=10039, + ["monster_base"]=10017, ["hp"]=208100000, ["atk"]=3420000, ["atk_times"]=3, ["hurt_skill"]={ - 20112, - 20113, - 20114 + 20046, + 20047, + 20048 }, ["monster_exp"]=22000 }, [18501]={ - ["monster_base"]=20012, + ["monster_base"]=20007, ["is_boss"]=1, ["hp"]=377020000, ["atk"]=3290000, ["atk_times"]=4, ["hurt_skill"]={ - 30034, - 30035, - 30036 + 30019, + 30020, + 30021 }, ["skill"]={ - 10017 + 10060 + }, + ["passive_skill"]={ + 10061 }, ["monster_exp"]=24000 }, diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index eacb9a3f..4d4469d9 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -183,6 +183,10 @@ local item = { ["name"]="S2赛季黄金头像框", ["desc"]="S2竞技场黄金头像框，英雄的光辉。" }, + [47]={ + ["name"]="随机史诗英雄碎片", + ["desc"]="所有碎片只随机出现以下英雄中的一名。" + }, [1001]={ ["name"]="暗淡陨铁", ["desc"]="一块暗淡的陨铁，蕴含着神秘的能量。" @@ -405,6 +409,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } 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 83d2f4dd..a59119ca 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -136,6 +136,9 @@ local item = { }, [46]={ + }, + [47]={ + }, [1001]={ @@ -304,6 +307,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } 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 30527633..78c36733 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -179,6 +179,9 @@ local item = { }, [46]={ + }, + [47]={ + }, [1001]={ ["name"]="Dim Meteorite", @@ -402,6 +405,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } 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 45a71008..a68aaf5d 100644 --- a/lua/app/config/strings/es/item.lua +++ b/lua/app/config/strings/es/item.lua @@ -179,6 +179,9 @@ local item = { }, [46]={ + }, + [47]={ + }, [1001]={ ["name"]="Meteorito Opaco", @@ -402,6 +405,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } 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 83d2f4dd..a59119ca 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -136,6 +136,9 @@ local item = { }, [46]={ + }, + [47]={ + }, [1001]={ @@ -304,6 +307,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } 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 76f487bf..e00a26fc 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -179,6 +179,9 @@ local item = { }, [46]={ + }, + [47]={ + }, [1001]={ ["name"]="Chondrite", @@ -402,6 +405,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } 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 82fba14e..5ab34438 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -179,6 +179,9 @@ local item = { }, [46]={ + }, + [47]={ + }, [1001]={ ["name"]="薄暗い隕石", @@ -402,6 +405,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } 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 e51b7cd4..3990267a 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -179,6 +179,9 @@ local item = { }, [46]={ + }, + [47]={ + }, [1001]={ ["name"]="알렌데 운석", @@ -402,6 +405,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } 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 4278fd13..6af1901e 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -179,6 +179,9 @@ local item = { }, [46]={ + }, + [47]={ + }, [1001]={ ["name"]="Ferro Meteórico Opaco", @@ -402,6 +405,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } 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 83d2f4dd..a59119ca 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -136,6 +136,9 @@ local item = { }, [46]={ + }, + [47]={ + }, [1001]={ @@ -304,6 +307,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } 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 525998fe..b2eb2878 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -179,6 +179,9 @@ local item = { }, [46]={ + }, + [47]={ + }, [1001]={ ["name"]="อุกกาบาตทื่อ", @@ -402,6 +405,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } 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 37a3cb6e..9f056fbd 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -179,6 +179,9 @@ local item = { }, [46]={ + }, + [47]={ + }, [1001]={ ["name"]="Thiên Thạch Ảm Đạm", @@ -402,6 +405,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } 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 034d5292..d5c2a6ef 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -179,6 +179,9 @@ local item = { }, [46]={ + }, + [47]={ + }, [1001]={ ["name"]="暗淡隕鐵", @@ -402,6 +405,6 @@ local item = { } } local config = { -data=item,count=101 +data=item,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/summon.lua b/lua/app/config/summon.lua index f3328c99..67e310a6 100644 --- a/lua/app/config/summon.lua +++ b/lua/app/config/summon.lua @@ -33,8 +33,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=4, - ["num_for_nothing"]="Ug==" + ["num"]=16, + ["num_for_nothing"]="Vw4=" } }, ["box_lv_3"]={ @@ -51,8 +51,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=8, - ["num_for_nothing"]="Xg==" + ["num"]=20, + ["num_for_nothing"]="VAg=" } }, ["box_lv_4"]={ @@ -69,8 +69,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=12, - ["num_for_nothing"]="Vwo=" + ["num"]=24, + ["num_for_nothing"]="VAw=" } }, ["box_lv_5"]={ @@ -87,8 +87,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=16, - ["num_for_nothing"]="Vw4=" + ["num"]=28, + ["num_for_nothing"]="VAA=" } }, ["box_lv_6"]={ @@ -105,8 +105,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=32, + ["num_for_nothing"]="VQo=" } }, ["box_lv_7"]={ @@ -123,8 +123,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=24, - ["num_for_nothing"]="VAw=" + ["num"]=36, + ["num_for_nothing"]="VQ4=" } }, ["box_lv_8"]={ @@ -141,8 +141,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=28, - ["num_for_nothing"]="VAA=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["box_lv_9"]={ @@ -159,8 +159,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=32, - ["num_for_nothing"]="VQo=" + ["num"]=44, + ["num_for_nothing"]="Ugw=" } }, ["box_lv_10"]={ @@ -177,8 +177,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=36, - ["num_for_nothing"]="VQ4=" + ["num"]=48, + ["num_for_nothing"]="UgA=" } } }, @@ -227,51 +227,123 @@ local summon = { } }, ["box_lv_2"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=180, + ["num_for_nothing"]="VwBc" } }, ["box_lv_3"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=180, + ["num_for_nothing"]="VwBc" } }, ["box_lv_4"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=35, - ["num_for_nothing"]="VQ0=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=180, + ["num_for_nothing"]="VwBc" } }, ["box_lv_5"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=55, + ["num_for_nothing"]="Uw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=180, + ["num_for_nothing"]="VwBc" } }, ["box_lv_6"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -280,16 +352,32 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=65, - ["num_for_nothing"]="UA0=" + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=180, + ["num_for_nothing"]="VwBc" } }, ["box_lv_7"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=2, ["num_for_nothing"]="VA==" }, @@ -298,16 +386,32 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=85, + ["num_for_nothing"]="Xg0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=180, + ["num_for_nothing"]="VwBc" } }, ["box_lv_8"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=3, ["num_for_nothing"]="VQ==" }, @@ -316,16 +420,32 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=95, - ["num_for_nothing"]="Xw0=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=180, + ["num_for_nothing"]="VwBc" } }, ["box_lv_9"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=4, ["num_for_nothing"]="Ug==" }, @@ -334,16 +454,32 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=110, - ["num_for_nothing"]="Vwlc" + ["num"]=115, + ["num_for_nothing"]="VwlZ" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=180, + ["num_for_nothing"]="VwBc" } }, ["box_lv_10"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=5, ["num_for_nothing"]="Uw==" }, @@ -352,8 +488,16 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=125, - ["num_for_nothing"]="VwpZ" + ["num"]=130, + ["num_for_nothing"]="Vwtc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=180, + ["num_for_nothing"]="VwBc" } } }, @@ -387,8 +531,8 @@ local summon = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -413,26 +557,16 @@ local summon = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=5, - ["num_for_nothing"]="Uw==" - } - }, - ["box_lv_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=2, ["num_for_nothing"]="VA==" }, @@ -441,16 +575,32 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=35, - ["num_for_nothing"]="VQ0=" - } - }, - ["box_lv_4"]={ + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=480, + ["num_for_nothing"]="UgBc" + } + }, + ["box_lv_3"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=3, ["num_for_nothing"]="VQ==" }, @@ -459,16 +609,32 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=75, - ["num_for_nothing"]="UQ0=" - } - }, - ["box_lv_5"]={ + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=480, + ["num_for_nothing"]="UgBc" + } + }, + ["box_lv_4"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=4, ["num_for_nothing"]="Ug==" }, @@ -477,16 +643,32 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=115, - ["num_for_nothing"]="VwlZ" - } - }, - ["box_lv_6"]={ + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=480, + ["num_for_nothing"]="UgBc" + } + }, + ["box_lv_5"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", ["num"]=5, ["num_for_nothing"]="Uw==" }, @@ -495,80 +677,186 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=155, - ["num_for_nothing"]="Vw1Z" + ["num"]=120, + ["num_for_nothing"]="Vwpc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=480, + ["num_for_nothing"]="UgBc" + } + }, + ["box_lv_6"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=6, + ["num_for_nothing"]="UA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=160, + ["num_for_nothing"]="Vw5c" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=480, + ["num_for_nothing"]="UgBc" } }, ["box_lv_7"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=7, - ["num_for_nothing"]="UQ==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=195, - ["num_for_nothing"]="VwFZ" + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=480, + ["num_for_nothing"]="UgBc" } }, ["box_lv_8"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=9, - ["num_for_nothing"]="Xw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=235, - ["num_for_nothing"]="VAtZ" + ["num"]=240, + ["num_for_nothing"]="VAxc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=480, + ["num_for_nothing"]="UgBc" } }, ["box_lv_9"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=11, - ["num_for_nothing"]="Vwk=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=12, + ["num_for_nothing"]="Vwo=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=275, - ["num_for_nothing"]="VA9Z" + ["num"]=280, + ["num_for_nothing"]="VABc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=480, + ["num_for_nothing"]="UgBc" } }, ["box_lv_10"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=13, - ["num_for_nothing"]="Vws=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=14, + ["num_for_nothing"]="Vww=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=315, - ["num_for_nothing"]="VQlZ" + ["num"]=320, + ["num_for_nothing"]="VQpc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=480, + ["num_for_nothing"]="UgBc" } } } diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index 350de8d7..d05e0d87 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -619,6 +619,7 @@ 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, @@ -639,6 +640,7 @@ 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, @@ -650,6 +652,7 @@ 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, @@ -663,7 +666,8 @@ local tutorial = { ["txt_offset"]={ 0, 200 - } + }, + ["func_id"]="dungeon_weapon_open" }, [80040]={ ["next_id"]=80050, @@ -674,6 +678,7 @@ local tutorial = { 200 }, ["target_name"]="hero_detail_ui(Clone)/common/btn_close", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -684,6 +689,7 @@ 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, @@ -703,6 +709,7 @@ 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, @@ -717,7 +724,8 @@ local tutorial = { }, [80070]={ ["type"]=2, - ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/scroll_cell_2/btn_start", + ["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", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -728,6 +736,7 @@ 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, @@ -748,6 +757,7 @@ 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, @@ -759,6 +769,7 @@ 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, @@ -772,7 +783,8 @@ local tutorial = { ["txt_offset"]={ 0, 200 - } + }, + ["func_id"]="dungeon_armor_open" }, [90040]={ ["next_id"]=90050, @@ -783,6 +795,7 @@ local tutorial = { 200 }, ["target_name"]="hero_detail_ui(Clone)/common/btn_close", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -793,6 +806,7 @@ 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, @@ -812,6 +826,7 @@ 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, @@ -827,7 +842,8 @@ local tutorial = { [90070]={ ["next_id"]=90080, ["type"]=2, - ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/scroll_cell_3/btn_start", + ["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", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -837,6 +853,7 @@ 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,