diff --git a/lua/app/config/card.lua b/lua/app/config/card.lua deleted file mode 100644 index 119519bd..00000000 --- a/lua/app/config/card.lua +++ /dev/null @@ -1,346 +0,0 @@ -local card = { - [1]={ - ["position"]=3, - ["qlt"]=2, - ["hp_1"]=100, - ["hp_2"]=110, - ["hp_3"]=120, - ["hp_4"]=130, - ["hp_5"]=140, - ["hp_6"]=150, - ["hp_7"]=160, - ["hp_8"]=170, - ["hp_9"]=180, - ["hp_10"]=190, - ["hp_11"]=200, - ["hp_12"]=210, - ["hp_13"]=220, - ["hp_14"]=230, - ["hp_15"]=240, - ["atk_1"]=100, - ["atk_2"]=110, - ["atk_3"]=120, - ["atk_4"]=130, - ["atk_5"]=140, - ["atk_6"]=150, - ["atk_7"]=160, - ["atk_8"]=170, - ["atk_9"]=180, - ["atk_10"]=190, - ["atk_11"]=200, - ["atk_12"]=210, - ["atk_13"]=220, - ["atk_14"]=230, - ["atk_15"]=240 - }, - [2]={ - ["position"]=2, - ["qlt"]=2, - ["hp_1"]=100, - ["hp_2"]=110, - ["hp_3"]=120, - ["hp_4"]=130, - ["hp_5"]=140, - ["hp_6"]=150, - ["hp_7"]=160, - ["hp_8"]=170, - ["hp_9"]=180, - ["hp_10"]=190, - ["hp_11"]=200, - ["hp_12"]=210, - ["hp_13"]=220, - ["hp_14"]=230, - ["hp_15"]=240, - ["atk_1"]=100, - ["atk_2"]=110, - ["atk_3"]=120, - ["atk_4"]=130, - ["atk_5"]=140, - ["atk_6"]=150, - ["atk_7"]=160, - ["atk_8"]=170, - ["atk_9"]=180, - ["atk_10"]=190, - ["atk_11"]=200, - ["atk_12"]=210, - ["atk_13"]=220, - ["atk_14"]=230, - ["atk_15"]=240 - }, - [3]={ - ["position"]=4, - ["qlt"]=2, - ["hp_1"]=100, - ["hp_2"]=110, - ["hp_3"]=120, - ["hp_4"]=130, - ["hp_5"]=140, - ["hp_6"]=150, - ["hp_7"]=160, - ["hp_8"]=170, - ["hp_9"]=180, - ["hp_10"]=190, - ["hp_11"]=200, - ["hp_12"]=210, - ["hp_13"]=220, - ["hp_14"]=230, - ["hp_15"]=240, - ["atk_1"]=100, - ["atk_2"]=110, - ["atk_3"]=120, - ["atk_4"]=130, - ["atk_5"]=140, - ["atk_6"]=150, - ["atk_7"]=160, - ["atk_8"]=170, - ["atk_9"]=180, - ["atk_10"]=190, - ["atk_11"]=200, - ["atk_12"]=210, - ["atk_13"]=220, - ["atk_14"]=230, - ["atk_15"]=240 - }, - [4]={ - ["position"]=5, - ["qlt"]=2, - ["hp_1"]=100, - ["hp_2"]=110, - ["hp_3"]=120, - ["hp_4"]=130, - ["hp_5"]=140, - ["hp_6"]=150, - ["hp_7"]=160, - ["hp_8"]=170, - ["hp_9"]=180, - ["hp_10"]=190, - ["hp_11"]=200, - ["hp_12"]=210, - ["hp_13"]=220, - ["hp_14"]=230, - ["hp_15"]=240, - ["atk_1"]=100, - ["atk_2"]=110, - ["atk_3"]=120, - ["atk_4"]=130, - ["atk_5"]=140, - ["atk_6"]=150, - ["atk_7"]=160, - ["atk_8"]=170, - ["atk_9"]=180, - ["atk_10"]=190, - ["atk_11"]=200, - ["atk_12"]=210, - ["atk_13"]=220, - ["atk_14"]=230, - ["atk_15"]=240 - }, - [5]={ - ["position"]=1, - ["qlt"]=2, - ["hp_1"]=100, - ["hp_2"]=110, - ["hp_3"]=120, - ["hp_4"]=130, - ["hp_5"]=140, - ["hp_6"]=150, - ["hp_7"]=160, - ["hp_8"]=170, - ["hp_9"]=180, - ["hp_10"]=190, - ["hp_11"]=200, - ["hp_12"]=210, - ["hp_13"]=220, - ["hp_14"]=230, - ["hp_15"]=240, - ["atk_1"]=100, - ["atk_2"]=110, - ["atk_3"]=120, - ["atk_4"]=130, - ["atk_5"]=140, - ["atk_6"]=150, - ["atk_7"]=160, - ["atk_8"]=170, - ["atk_9"]=180, - ["atk_10"]=190, - ["atk_11"]=200, - ["atk_12"]=210, - ["atk_13"]=220, - ["atk_14"]=230, - ["atk_15"]=240 - }, - [6]={ - ["position"]=3, - ["qlt"]=3, - ["hp_1"]=150, - ["hp_2"]=165, - ["hp_3"]=180, - ["hp_4"]=195, - ["hp_5"]=210, - ["hp_6"]=225, - ["hp_7"]=240, - ["hp_8"]=255, - ["hp_9"]=270, - ["hp_10"]=285, - ["hp_11"]=300, - ["hp_12"]=315, - ["hp_13"]=330, - ["hp_14"]=345, - ["hp_15"]=360, - ["atk_1"]=150, - ["atk_2"]=165, - ["atk_3"]=180, - ["atk_4"]=195, - ["atk_5"]=210, - ["atk_6"]=225, - ["atk_7"]=240, - ["atk_8"]=255, - ["atk_9"]=270, - ["atk_10"]=285, - ["atk_11"]=300, - ["atk_12"]=315, - ["atk_13"]=330, - ["atk_14"]=345, - ["atk_15"]=360 - }, - [7]={ - ["position"]=2, - ["qlt"]=3, - ["hp_1"]=150, - ["hp_2"]=165, - ["hp_3"]=180, - ["hp_4"]=195, - ["hp_5"]=210, - ["hp_6"]=225, - ["hp_7"]=240, - ["hp_8"]=255, - ["hp_9"]=270, - ["hp_10"]=285, - ["hp_11"]=300, - ["hp_12"]=315, - ["hp_13"]=330, - ["hp_14"]=345, - ["hp_15"]=360, - ["atk_1"]=150, - ["atk_2"]=165, - ["atk_3"]=180, - ["atk_4"]=195, - ["atk_5"]=210, - ["atk_6"]=225, - ["atk_7"]=240, - ["atk_8"]=255, - ["atk_9"]=270, - ["atk_10"]=285, - ["atk_11"]=300, - ["atk_12"]=315, - ["atk_13"]=330, - ["atk_14"]=345, - ["atk_15"]=360 - }, - [8]={ - ["position"]=4, - ["qlt"]=3, - ["hp_1"]=150, - ["hp_2"]=165, - ["hp_3"]=180, - ["hp_4"]=195, - ["hp_5"]=210, - ["hp_6"]=225, - ["hp_7"]=240, - ["hp_8"]=255, - ["hp_9"]=270, - ["hp_10"]=285, - ["hp_11"]=300, - ["hp_12"]=315, - ["hp_13"]=330, - ["hp_14"]=345, - ["hp_15"]=360, - ["atk_1"]=150, - ["atk_2"]=165, - ["atk_3"]=180, - ["atk_4"]=195, - ["atk_5"]=210, - ["atk_6"]=225, - ["atk_7"]=240, - ["atk_8"]=255, - ["atk_9"]=270, - ["atk_10"]=285, - ["atk_11"]=300, - ["atk_12"]=315, - ["atk_13"]=330, - ["atk_14"]=345, - ["atk_15"]=360 - }, - [9]={ - ["position"]=5, - ["qlt"]=3, - ["hp_1"]=150, - ["hp_2"]=165, - ["hp_3"]=180, - ["hp_4"]=195, - ["hp_5"]=210, - ["hp_6"]=225, - ["hp_7"]=240, - ["hp_8"]=255, - ["hp_9"]=270, - ["hp_10"]=285, - ["hp_11"]=300, - ["hp_12"]=315, - ["hp_13"]=330, - ["hp_14"]=345, - ["hp_15"]=360, - ["atk_1"]=150, - ["atk_2"]=165, - ["atk_3"]=180, - ["atk_4"]=195, - ["atk_5"]=210, - ["atk_6"]=225, - ["atk_7"]=240, - ["atk_8"]=255, - ["atk_9"]=270, - ["atk_10"]=285, - ["atk_11"]=300, - ["atk_12"]=315, - ["atk_13"]=330, - ["atk_14"]=345, - ["atk_15"]=360 - }, - [10]={ - ["position"]=1, - ["qlt"]=3, - ["hp_1"]=150, - ["hp_2"]=165, - ["hp_3"]=180, - ["hp_4"]=195, - ["hp_5"]=210, - ["hp_6"]=225, - ["hp_7"]=240, - ["hp_8"]=255, - ["hp_9"]=270, - ["hp_10"]=285, - ["hp_11"]=300, - ["hp_12"]=315, - ["hp_13"]=330, - ["hp_14"]=345, - ["hp_15"]=360, - ["atk_1"]=150, - ["atk_2"]=165, - ["atk_3"]=180, - ["atk_4"]=195, - ["atk_5"]=210, - ["atk_6"]=225, - ["atk_7"]=240, - ["atk_8"]=255, - ["atk_9"]=270, - ["atk_10"]=285, - ["atk_11"]=300, - ["atk_12"]=315, - ["atk_13"]=330, - ["atk_14"]=345, - ["atk_15"]=360 - } -} -local config = { -data=card,count=10 -} -return config \ No newline at end of file diff --git a/lua/app/config/card_level.lua b/lua/app/config/card_level.lua deleted file mode 100644 index 7daef713..00000000 --- a/lua/app/config/card_level.lua +++ /dev/null @@ -1,195 +0,0 @@ -local card_level = { - [1]={ - ["cost_2"]={ - 3, - 0 - }, - ["unlock_skill"]=1 - }, - [2]={ - ["cost_2"]={ - 5, - 100 - } - }, - [3]={ - ["cost_2"]={ - 10, - 250 - }, - ["cost_3"]={ - 3, - 0 - } - }, - [4]={ - ["cost_2"]={ - 25, - 500 - }, - ["cost_3"]={ - 5, - 500 - }, - ["unlock_skill"]=2 - }, - [5]={ - ["cost_2"]={ - 50, - 1000 - }, - ["cost_3"]={ - 10, - 500 - }, - ["cost_4"]={ - 3, - 500 - } - }, - [6]={ - ["cost_2"]={ - 100, - 1000 - }, - ["cost_3"]={ - 25, - 500 - }, - ["cost_4"]={ - 5, - 500 - } - }, - [7]={ - ["cost_2"]={ - 200, - 10000 - }, - ["cost_3"]={ - 50, - 10000 - }, - ["cost_4"]={ - 10, - 500 - } - }, - [8]={ - ["cost_2"]={ - 500, - 10000 - }, - ["cost_3"]={ - 100, - 10000 - }, - ["cost_4"]={ - 20, - 10000 - }, - ["unlock_skill"]=3 - }, - [9]={ - ["cost_2"]={ - 1000, - 10000 - }, - ["cost_3"]={ - 200, - 10000 - }, - ["cost_4"]={ - 40, - 10000 - } - }, - [10]={ - ["cost_2"]={ - 1500, - 10000 - }, - ["cost_3"]={ - 400, - 10000 - }, - ["cost_4"]={ - 80, - 10000 - } - }, - [11]={ - ["cost_2"]={ - 2000, - 10000 - }, - ["cost_3"]={ - 1000, - 10000 - }, - ["cost_4"]={ - 160, - 10000 - } - }, - [12]={ - ["cost_2"]={ - 2500, - 10000 - }, - ["cost_3"]={ - 1500, - 10000 - }, - ["cost_4"]={ - 320, - 10000 - } - }, - [13]={ - ["cost_2"]={ - 3000, - 10000 - }, - ["cost_3"]={ - 2000, - 10000 - }, - ["cost_4"]={ - 640, - 10000 - } - }, - [14]={ - ["cost_2"]={ - 4000, - 10000 - }, - ["cost_3"]={ - 3000, - 10000 - }, - ["cost_4"]={ - 1000, - 10000 - } - }, - [15]={ - ["cost_2"]={ - 5000, - 10000 - }, - ["cost_3"]={ - 4000, - 10000 - }, - ["cost_4"]={ - 1500, - 10000 - } - } -} -local config = { -data=card_level,count=15 -} -return config \ No newline at end of file diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 6630b74b..7f1a1e00 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -3159,7 +3159,8 @@ local chapter_board = { 0 }, { - 1 + 1, + 0 }, { 5, @@ -3358,7 +3359,8 @@ local chapter_board = { 0 }, { - 1 + 1, + 0 }, { 1, @@ -8183,6 +8185,7 @@ local chapter_board = { 0 }, { + 0, 0 }, { @@ -8190,6 +8193,7 @@ local chapter_board = { 0 }, { + 0, 0 }, { @@ -8379,6 +8383,7 @@ local chapter_board = { 0 }, { + 0, 0 }, { @@ -8386,6 +8391,7 @@ local chapter_board = { 0 }, { + 0, 0 }, { diff --git a/lua/app/config/mail.lua b/lua/app/config/mail.lua index d23b0bbb..e4dd0071 100644 --- a/lua/app/config/mail.lua +++ b/lua/app/config/mail.lua @@ -44,7 +44,7 @@ local mail = { ["time_type"]=2, ["time_send"]={ 5, - 12, + 0, 0, 0 }, @@ -65,7 +65,7 @@ local mail = { ["time_type"]=2, ["time_send"]={ 6, - 12, + 0, 0, 0 }, @@ -86,7 +86,7 @@ local mail = { ["time_type"]=2, ["time_send"]={ 7, - 12, + 0, 0, 0 }, diff --git a/lua/app/config/skill_box.lua b/lua/app/config/skill_box.lua deleted file mode 100644 index c10a93a6..00000000 --- a/lua/app/config/skill_box.lua +++ /dev/null @@ -1,7 +0,0 @@ -local skill_box = { - -} -local config = { -data=skill_box,count=0 -} -return config \ No newline at end of file diff --git a/lua/app/config/skill_card.lua b/lua/app/config/skill_card.lua deleted file mode 100644 index d2b73f58..00000000 --- a/lua/app/config/skill_card.lua +++ /dev/null @@ -1,69 +0,0 @@ -local skill_card = { - [10]={ - ["method"]=2 - }, - [11]={ - ["method"]=2 - }, - [20]={ - ["method"]=2 - }, - [21]={ - ["method"]=2 - }, - [22]={ - ["method"]=2 - }, - [30]={ - ["method"]=2 - }, - [40]={ - ["method"]=2 - }, - [41]={ - ["method"]=2 - }, - [50]={ - ["method"]=2 - }, - [51]={ - ["method"]=2 - }, - [60]={ - ["method"]=2 - }, - [61]={ - ["method"]=2 - }, - [70]={ - ["method"]=1 - }, - [71]={ - ["method"]=1 - }, - [80]={ - ["method"]=2 - }, - [81]={ - ["method"]=2 - }, - [90]={ - ["method"]=2 - }, - [91]={ - ["method"]=2 - }, - [100]={ - ["method"]=2 - }, - [101]={ - - }, - [102]={ - ["method"]=2 - } -} -local config = { -data=skill_card,count=21 -} -return config \ No newline at end of file diff --git a/lua/app/config/skill_monster.lua b/lua/app/config/skill_monster.lua deleted file mode 100644 index 20da8eba..00000000 --- a/lua/app/config/skill_monster.lua +++ /dev/null @@ -1,32 +0,0 @@ -local skill_monster = { - [100001]={ - ["cd"]=3, - ["cd_start"]=3 - }, - [100002]={ - ["cd"]=4, - ["cd_start"]=4 - }, - [100003]={ - - }, - [100004]={ - - }, - [100005]={ - - }, - [100006]={ - - }, - [100007]={ - - }, - [100008]={ - - } -} -local config = { -data=skill_monster,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/skill_monster.lua.meta b/lua/app/config/skill_monster.lua.meta deleted file mode 100644 index 898d8675..00000000 --- a/lua/app/config/skill_monster.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 5bb9a5e5ecdd2844bb315067b877a3a5 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/stage.lua b/lua/app/config/stage.lua deleted file mode 100644 index 3559426e..00000000 --- a/lua/app/config/stage.lua +++ /dev/null @@ -1,835 +0,0 @@ -local stage = { - [1]={ - ["board"]={ - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - } - }, - ["control_element"]={ - 3, - 2, - 3, - 3, - 4, - 5, - 5 - } - }, - [2]={ - ["board"]={ - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - } - }, - ["control_element"]={ - 1, - 1, - 3, - 5, - 1, - 4, - 3, - 1, - 1 - } - }, - [3]={ - ["board"]={ - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - } - }, - ["control_element"]={ - 3, - 1, - 5, - 3 - } - }, - [4]={ - ["board"]={ - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - } - }, - ["control_element"]={ - 0 - } - } -} -local config = { -data=stage,count=4 -} -return config \ No newline at end of file diff --git a/lua/app/config/stage.lua.meta b/lua/app/config/stage.lua.meta deleted file mode 100644 index 5c20b6ed..00000000 --- a/lua/app/config/stage.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: c74f4c0846956944c8e8c94b47d5ee1a -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/cn/monster_base.lua b/lua/app/config/strings/cn/monster_base.lua new file mode 100644 index 00000000..357eabd3 --- /dev/null +++ b/lua/app/config/strings/cn/monster_base.lua @@ -0,0 +1,174 @@ +local monster_base = { + [10001]={ + ["name"]="哥布林匕首(蓝)" + }, + [10002]={ + ["name"]="哥布林斧头(红)" + }, + [10003]={ + ["name"]="哥布林匕首(紫)" + }, + [10004]={ + ["name"]="哥布林棍棒(绿)" + }, + [10005]={ + ["name"]="哥布林法师(蓝)" + }, + [10006]={ + ["name"]="哥布林法师(绿)" + }, + [10007]={ + ["name"]="哥布林法师(紫)" + }, + [10008]={ + ["name"]="哥布林法师(红)" + }, + [10009]={ + ["name"]="盾刀骷髅兵" + }, + [10010]={ + ["name"]="骷髅枪兵" + }, + [10011]={ + ["name"]="地灵枪兵" + }, + [10012]={ + ["name"]="兽人大刀兵(绿)" + }, + [10013]={ + ["name"]="兽人大刀兵(蓝)" + }, + [10014]={ + ["name"]="兽人大刀兵(红)" + }, + [10015]={ + ["name"]="兽人大刀兵(黄)" + }, + [10016]={ + ["name"]="兽人盾骨兵(绿)" + }, + [10017]={ + ["name"]="兽人盾骨兵(红)" + }, + [10018]={ + ["name"]="兽人盾骨兵(黄)" + }, + [10019]={ + ["name"]="兽人盾骨兵(蓝)" + }, + [10028]={ + ["name"]="双斧男(白紫)" + }, + [10029]={ + ["name"]="双斧男(黑红)" + }, + [10030]={ + ["name"]="剑士(白黄)" + }, + [10031]={ + ["name"]="剑士(褐蓝)" + }, + [10032]={ + ["name"]="女魔法师(蓝)" + }, + [10033]={ + ["name"]="女魔法师(红)" + }, + [10039]={ + ["name"]="盾刀骷髅兵(有帽子)" + }, + [20001]={ + ["name"]="弓箭神射手(黄)" + }, + [20002]={ + ["name"]="丛林弓箭神射手(绿)" + }, + [20003]={ + ["name"]="巨龙" + }, + [20004]={ + ["name"]="邪恶法师" + }, + [20005]={ + ["name"]="石像巨人守卫" + }, + [20006]={ + ["name"]="巨绿龟" + }, + [20007]={ + ["name"]="独眼巨人(蓝)" + }, + [20008]={ + ["name"]="石头人" + }, + [20009]={ + ["name"]="大树精" + }, + [20010]={ + ["name"]="火灵" + }, + [20011]={ + ["name"]="地精首领" + }, + [20012]={ + ["name"]="骷髅王" + }, + [20013]={ + ["name"]="小丑" + }, + [20014]={ + ["name"]="兽人首领(绿)" + }, + [20015]={ + ["name"]="兽人首领(红)" + }, + [20016]={ + ["name"]="独眼萌娃" + }, + [20017]={ + ["name"]="骷髅恶魔法师(紫衣)" + }, + [20018]={ + ["name"]="骷髅恶魔法师(红衣)" + }, + [30001]={ + ["name"]="洋葱骑士" + }, + [30002]={ + ["name"]="黑妹" + }, + [30003]={ + ["name"]="冰雪女巫" + }, + [30004]={ + ["name"]="忍者" + }, + [30005]={ + ["name"]="舞女" + }, + [30006]={ + ["name"]="小鹿" + }, + [30007]={ + ["name"]="巨剑" + }, + [30008]={ + ["name"]="4把兵刃" + }, + [30009]={ + ["name"]="黑武僧" + }, + [30010]={ + ["name"]="野人" + }, + [30011]={ + ["name"]="二锤" + }, + [30014]={ + ["name"]="克劳德" + } +} +local config = { +data=monster_base,count=56 +} +return config \ No newline at end of file diff --git a/lua/app/config/skill_box.lua.meta b/lua/app/config/strings/cn/monster_base.lua.meta similarity index 86% rename from lua/app/config/skill_box.lua.meta rename to lua/app/config/strings/cn/monster_base.lua.meta index c2486a83..b171aef2 100644 --- a/lua/app/config/skill_box.lua.meta +++ b/lua/app/config/strings/cn/monster_base.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b0e5e92c84e063f43b56758577128e37 +guid: 1acdb82f8ad291148b7d088b9ef4ebfe ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/cn/skill_hero.lua b/lua/app/config/strings/cn/skill_hero.lua deleted file mode 100644 index 6dbafd48..00000000 --- a/lua/app/config/strings/cn/skill_hero.lua +++ /dev/null @@ -1,30 +0,0 @@ -local skill_hero = { - [10]={ - ["desc"]="长枪突刺:将上下2格元素进行消除" - }, - [20]={ - ["desc"]="拔刀斩:使用一次拔刀斩终结技,造成大量伤害" - }, - [30]={ - ["desc"]="元素链接:随机额外消除2个元素" - }, - [40]={ - ["desc"]="魔法罩:生成一个魔法罩持续1回合,可承受最大生命值10%伤害" - }, - [50]={ - ["desc"]="舞步消散:将左右2格元素进行消除" - }, - [60]={ - ["desc"]="快速治愈:立即恢复20%生命值" - }, - [70]={ - ["desc"]="巨剑连斩:每一次攻击的伤害将增加50%" - }, - [80]={ - ["desc"]="霜冻剑舞:额外造成1次伤害并给敌人1回合冰霜效果" - } -} -local config = { -data=skill_hero,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill_hero.lua.meta b/lua/app/config/strings/cn/skill_hero.lua.meta deleted file mode 100644 index d14575f9..00000000 --- a/lua/app/config/strings/cn/skill_hero.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 656b3309081fb064eaac3b429fc88702 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/de/monster_base.lua b/lua/app/config/strings/de/monster_base.lua new file mode 100644 index 00000000..cecafbb6 --- /dev/null +++ b/lua/app/config/strings/de/monster_base.lua @@ -0,0 +1,174 @@ +local monster_base = { + [10001]={ + + }, + [10002]={ + + }, + [10003]={ + + }, + [10004]={ + + }, + [10005]={ + + }, + [10006]={ + + }, + [10007]={ + + }, + [10008]={ + + }, + [10009]={ + + }, + [10010]={ + + }, + [10011]={ + + }, + [10012]={ + + }, + [10013]={ + + }, + [10014]={ + + }, + [10015]={ + + }, + [10016]={ + + }, + [10017]={ + + }, + [10018]={ + + }, + [10019]={ + + }, + [10028]={ + + }, + [10029]={ + + }, + [10030]={ + + }, + [10031]={ + + }, + [10032]={ + + }, + [10033]={ + + }, + [10039]={ + + }, + [20001]={ + + }, + [20002]={ + + }, + [20003]={ + + }, + [20004]={ + + }, + [20005]={ + + }, + [20006]={ + + }, + [20007]={ + + }, + [20008]={ + + }, + [20009]={ + + }, + [20010]={ + + }, + [20011]={ + + }, + [20012]={ + + }, + [20013]={ + + }, + [20014]={ + + }, + [20015]={ + + }, + [20016]={ + + }, + [20017]={ + + }, + [20018]={ + + }, + [30001]={ + + }, + [30002]={ + + }, + [30003]={ + + }, + [30004]={ + + }, + [30005]={ + + }, + [30006]={ + + }, + [30007]={ + + }, + [30008]={ + + }, + [30009]={ + + }, + [30010]={ + + }, + [30011]={ + + }, + [30014]={ + + } +} +local config = { +data=monster_base,count=56 +} +return config \ No newline at end of file diff --git a/lua/app/config/card.lua.meta b/lua/app/config/strings/de/monster_base.lua.meta similarity index 86% rename from lua/app/config/card.lua.meta rename to lua/app/config/strings/de/monster_base.lua.meta index f42d8a77..adeac285 100644 --- a/lua/app/config/card.lua.meta +++ b/lua/app/config/strings/de/monster_base.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4febc8242a9cb274e81ae7468efedb1e +guid: a660e064323ce254e9905dc1699ac952 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/de/skill_hero.lua b/lua/app/config/strings/de/skill_hero.lua deleted file mode 100644 index 86b9761a..00000000 --- a/lua/app/config/strings/de/skill_hero.lua +++ /dev/null @@ -1,30 +0,0 @@ -local skill_hero = { - [10]={ - - }, - [20]={ - - }, - [30]={ - - }, - [40]={ - - }, - [50]={ - - }, - [60]={ - - }, - [70]={ - - }, - [80]={ - - } -} -local config = { -data=skill_hero,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skill_hero.lua.meta b/lua/app/config/strings/de/skill_hero.lua.meta deleted file mode 100644 index 3c364ca7..00000000 --- a/lua/app/config/strings/de/skill_hero.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 52043ed0a49b656479a6ec642f790696 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/en/monster_base.lua b/lua/app/config/strings/en/monster_base.lua new file mode 100644 index 00000000..cecafbb6 --- /dev/null +++ b/lua/app/config/strings/en/monster_base.lua @@ -0,0 +1,174 @@ +local monster_base = { + [10001]={ + + }, + [10002]={ + + }, + [10003]={ + + }, + [10004]={ + + }, + [10005]={ + + }, + [10006]={ + + }, + [10007]={ + + }, + [10008]={ + + }, + [10009]={ + + }, + [10010]={ + + }, + [10011]={ + + }, + [10012]={ + + }, + [10013]={ + + }, + [10014]={ + + }, + [10015]={ + + }, + [10016]={ + + }, + [10017]={ + + }, + [10018]={ + + }, + [10019]={ + + }, + [10028]={ + + }, + [10029]={ + + }, + [10030]={ + + }, + [10031]={ + + }, + [10032]={ + + }, + [10033]={ + + }, + [10039]={ + + }, + [20001]={ + + }, + [20002]={ + + }, + [20003]={ + + }, + [20004]={ + + }, + [20005]={ + + }, + [20006]={ + + }, + [20007]={ + + }, + [20008]={ + + }, + [20009]={ + + }, + [20010]={ + + }, + [20011]={ + + }, + [20012]={ + + }, + [20013]={ + + }, + [20014]={ + + }, + [20015]={ + + }, + [20016]={ + + }, + [20017]={ + + }, + [20018]={ + + }, + [30001]={ + + }, + [30002]={ + + }, + [30003]={ + + }, + [30004]={ + + }, + [30005]={ + + }, + [30006]={ + + }, + [30007]={ + + }, + [30008]={ + + }, + [30009]={ + + }, + [30010]={ + + }, + [30011]={ + + }, + [30014]={ + + } +} +local config = { +data=monster_base,count=56 +} +return config \ No newline at end of file diff --git a/lua/app/config/skill_card.lua.meta b/lua/app/config/strings/en/monster_base.lua.meta similarity index 86% rename from lua/app/config/skill_card.lua.meta rename to lua/app/config/strings/en/monster_base.lua.meta index b6037a80..ee380efa 100644 --- a/lua/app/config/skill_card.lua.meta +++ b/lua/app/config/strings/en/monster_base.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: af9637d329b3bfa4cb0824f4e5a51bae +guid: 11b572c9f450a2748bbbf32bbf7d3201 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/en/skill_hero.lua b/lua/app/config/strings/en/skill_hero.lua deleted file mode 100644 index 86b9761a..00000000 --- a/lua/app/config/strings/en/skill_hero.lua +++ /dev/null @@ -1,30 +0,0 @@ -local skill_hero = { - [10]={ - - }, - [20]={ - - }, - [30]={ - - }, - [40]={ - - }, - [50]={ - - }, - [60]={ - - }, - [70]={ - - }, - [80]={ - - } -} -local config = { -data=skill_hero,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skill_hero.lua.meta b/lua/app/config/strings/en/skill_hero.lua.meta deleted file mode 100644 index 7dd06be1..00000000 --- a/lua/app/config/strings/en/skill_hero.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 9ed23fb723c84bc4cbe22954d6b17a5a -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/monster_base.lua b/lua/app/config/strings/fr/monster_base.lua new file mode 100644 index 00000000..cecafbb6 --- /dev/null +++ b/lua/app/config/strings/fr/monster_base.lua @@ -0,0 +1,174 @@ +local monster_base = { + [10001]={ + + }, + [10002]={ + + }, + [10003]={ + + }, + [10004]={ + + }, + [10005]={ + + }, + [10006]={ + + }, + [10007]={ + + }, + [10008]={ + + }, + [10009]={ + + }, + [10010]={ + + }, + [10011]={ + + }, + [10012]={ + + }, + [10013]={ + + }, + [10014]={ + + }, + [10015]={ + + }, + [10016]={ + + }, + [10017]={ + + }, + [10018]={ + + }, + [10019]={ + + }, + [10028]={ + + }, + [10029]={ + + }, + [10030]={ + + }, + [10031]={ + + }, + [10032]={ + + }, + [10033]={ + + }, + [10039]={ + + }, + [20001]={ + + }, + [20002]={ + + }, + [20003]={ + + }, + [20004]={ + + }, + [20005]={ + + }, + [20006]={ + + }, + [20007]={ + + }, + [20008]={ + + }, + [20009]={ + + }, + [20010]={ + + }, + [20011]={ + + }, + [20012]={ + + }, + [20013]={ + + }, + [20014]={ + + }, + [20015]={ + + }, + [20016]={ + + }, + [20017]={ + + }, + [20018]={ + + }, + [30001]={ + + }, + [30002]={ + + }, + [30003]={ + + }, + [30004]={ + + }, + [30005]={ + + }, + [30006]={ + + }, + [30007]={ + + }, + [30008]={ + + }, + [30009]={ + + }, + [30010]={ + + }, + [30011]={ + + }, + [30014]={ + + } +} +local config = { +data=monster_base,count=56 +} +return config \ No newline at end of file diff --git a/lua/app/config/card_level.lua.meta b/lua/app/config/strings/fr/monster_base.lua.meta similarity index 86% rename from lua/app/config/card_level.lua.meta rename to lua/app/config/strings/fr/monster_base.lua.meta index 3ae3275a..228ef99f 100644 --- a/lua/app/config/card_level.lua.meta +++ b/lua/app/config/strings/fr/monster_base.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 604c07ba13dc94b4aba9b27e3ee2474e +guid: 9565c26b9eaa74444943c89847a6bd34 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/fr/skill_hero.lua b/lua/app/config/strings/fr/skill_hero.lua deleted file mode 100644 index 86b9761a..00000000 --- a/lua/app/config/strings/fr/skill_hero.lua +++ /dev/null @@ -1,30 +0,0 @@ -local skill_hero = { - [10]={ - - }, - [20]={ - - }, - [30]={ - - }, - [40]={ - - }, - [50]={ - - }, - [60]={ - - }, - [70]={ - - }, - [80]={ - - } -} -local config = { -data=skill_hero,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skill_hero.lua.meta b/lua/app/config/strings/fr/skill_hero.lua.meta deleted file mode 100644 index 4b4c27b0..00000000 --- a/lua/app/config/strings/fr/skill_hero.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 47f8c514724c20d47a92c9a1512ebb6b -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/monster_base.lua b/lua/app/config/strings/id/monster_base.lua new file mode 100644 index 00000000..cecafbb6 --- /dev/null +++ b/lua/app/config/strings/id/monster_base.lua @@ -0,0 +1,174 @@ +local monster_base = { + [10001]={ + + }, + [10002]={ + + }, + [10003]={ + + }, + [10004]={ + + }, + [10005]={ + + }, + [10006]={ + + }, + [10007]={ + + }, + [10008]={ + + }, + [10009]={ + + }, + [10010]={ + + }, + [10011]={ + + }, + [10012]={ + + }, + [10013]={ + + }, + [10014]={ + + }, + [10015]={ + + }, + [10016]={ + + }, + [10017]={ + + }, + [10018]={ + + }, + [10019]={ + + }, + [10028]={ + + }, + [10029]={ + + }, + [10030]={ + + }, + [10031]={ + + }, + [10032]={ + + }, + [10033]={ + + }, + [10039]={ + + }, + [20001]={ + + }, + [20002]={ + + }, + [20003]={ + + }, + [20004]={ + + }, + [20005]={ + + }, + [20006]={ + + }, + [20007]={ + + }, + [20008]={ + + }, + [20009]={ + + }, + [20010]={ + + }, + [20011]={ + + }, + [20012]={ + + }, + [20013]={ + + }, + [20014]={ + + }, + [20015]={ + + }, + [20016]={ + + }, + [20017]={ + + }, + [20018]={ + + }, + [30001]={ + + }, + [30002]={ + + }, + [30003]={ + + }, + [30004]={ + + }, + [30005]={ + + }, + [30006]={ + + }, + [30007]={ + + }, + [30008]={ + + }, + [30009]={ + + }, + [30010]={ + + }, + [30011]={ + + }, + [30014]={ + + } +} +local config = { +data=monster_base,count=56 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/id/monster_base.lua.meta b/lua/app/config/strings/id/monster_base.lua.meta new file mode 100644 index 00000000..5b44b35f --- /dev/null +++ b/lua/app/config/strings/id/monster_base.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 03d2a69716ffacf47a7edcc002512f2e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/skill_hero.lua b/lua/app/config/strings/id/skill_hero.lua deleted file mode 100644 index 86b9761a..00000000 --- a/lua/app/config/strings/id/skill_hero.lua +++ /dev/null @@ -1,30 +0,0 @@ -local skill_hero = { - [10]={ - - }, - [20]={ - - }, - [30]={ - - }, - [40]={ - - }, - [50]={ - - }, - [60]={ - - }, - [70]={ - - }, - [80]={ - - } -} -local config = { -data=skill_hero,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skill_hero.lua.meta b/lua/app/config/strings/id/skill_hero.lua.meta deleted file mode 100644 index 0fae599d..00000000 --- a/lua/app/config/strings/id/skill_hero.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 5818c0136d578bf43b5ea61b3ee212a9 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ja/monster_base.lua b/lua/app/config/strings/ja/monster_base.lua new file mode 100644 index 00000000..cecafbb6 --- /dev/null +++ b/lua/app/config/strings/ja/monster_base.lua @@ -0,0 +1,174 @@ +local monster_base = { + [10001]={ + + }, + [10002]={ + + }, + [10003]={ + + }, + [10004]={ + + }, + [10005]={ + + }, + [10006]={ + + }, + [10007]={ + + }, + [10008]={ + + }, + [10009]={ + + }, + [10010]={ + + }, + [10011]={ + + }, + [10012]={ + + }, + [10013]={ + + }, + [10014]={ + + }, + [10015]={ + + }, + [10016]={ + + }, + [10017]={ + + }, + [10018]={ + + }, + [10019]={ + + }, + [10028]={ + + }, + [10029]={ + + }, + [10030]={ + + }, + [10031]={ + + }, + [10032]={ + + }, + [10033]={ + + }, + [10039]={ + + }, + [20001]={ + + }, + [20002]={ + + }, + [20003]={ + + }, + [20004]={ + + }, + [20005]={ + + }, + [20006]={ + + }, + [20007]={ + + }, + [20008]={ + + }, + [20009]={ + + }, + [20010]={ + + }, + [20011]={ + + }, + [20012]={ + + }, + [20013]={ + + }, + [20014]={ + + }, + [20015]={ + + }, + [20016]={ + + }, + [20017]={ + + }, + [20018]={ + + }, + [30001]={ + + }, + [30002]={ + + }, + [30003]={ + + }, + [30004]={ + + }, + [30005]={ + + }, + [30006]={ + + }, + [30007]={ + + }, + [30008]={ + + }, + [30009]={ + + }, + [30010]={ + + }, + [30011]={ + + }, + [30014]={ + + } +} +local config = { +data=monster_base,count=56 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/monster_base.lua.meta b/lua/app/config/strings/ja/monster_base.lua.meta new file mode 100644 index 00000000..0163ec90 --- /dev/null +++ b/lua/app/config/strings/ja/monster_base.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7a3be533f776ec04e8393186468f3e8a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ja/skill_hero.lua b/lua/app/config/strings/ja/skill_hero.lua deleted file mode 100644 index 86b9761a..00000000 --- a/lua/app/config/strings/ja/skill_hero.lua +++ /dev/null @@ -1,30 +0,0 @@ -local skill_hero = { - [10]={ - - }, - [20]={ - - }, - [30]={ - - }, - [40]={ - - }, - [50]={ - - }, - [60]={ - - }, - [70]={ - - }, - [80]={ - - } -} -local config = { -data=skill_hero,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skill_hero.lua.meta b/lua/app/config/strings/ja/skill_hero.lua.meta deleted file mode 100644 index 063fae0b..00000000 --- a/lua/app/config/strings/ja/skill_hero.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: c3c8d0c6a926f0946acac0aad625138f -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/monster_base.lua b/lua/app/config/strings/ko/monster_base.lua new file mode 100644 index 00000000..cecafbb6 --- /dev/null +++ b/lua/app/config/strings/ko/monster_base.lua @@ -0,0 +1,174 @@ +local monster_base = { + [10001]={ + + }, + [10002]={ + + }, + [10003]={ + + }, + [10004]={ + + }, + [10005]={ + + }, + [10006]={ + + }, + [10007]={ + + }, + [10008]={ + + }, + [10009]={ + + }, + [10010]={ + + }, + [10011]={ + + }, + [10012]={ + + }, + [10013]={ + + }, + [10014]={ + + }, + [10015]={ + + }, + [10016]={ + + }, + [10017]={ + + }, + [10018]={ + + }, + [10019]={ + + }, + [10028]={ + + }, + [10029]={ + + }, + [10030]={ + + }, + [10031]={ + + }, + [10032]={ + + }, + [10033]={ + + }, + [10039]={ + + }, + [20001]={ + + }, + [20002]={ + + }, + [20003]={ + + }, + [20004]={ + + }, + [20005]={ + + }, + [20006]={ + + }, + [20007]={ + + }, + [20008]={ + + }, + [20009]={ + + }, + [20010]={ + + }, + [20011]={ + + }, + [20012]={ + + }, + [20013]={ + + }, + [20014]={ + + }, + [20015]={ + + }, + [20016]={ + + }, + [20017]={ + + }, + [20018]={ + + }, + [30001]={ + + }, + [30002]={ + + }, + [30003]={ + + }, + [30004]={ + + }, + [30005]={ + + }, + [30006]={ + + }, + [30007]={ + + }, + [30008]={ + + }, + [30009]={ + + }, + [30010]={ + + }, + [30011]={ + + }, + [30014]={ + + } +} +local config = { +data=monster_base,count=56 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/monster_base.lua.meta b/lua/app/config/strings/ko/monster_base.lua.meta new file mode 100644 index 00000000..5fbd8f11 --- /dev/null +++ b/lua/app/config/strings/ko/monster_base.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 68b92bfaa42e8a8498b40f85845bb586 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/skill_hero.lua b/lua/app/config/strings/ko/skill_hero.lua deleted file mode 100644 index 86b9761a..00000000 --- a/lua/app/config/strings/ko/skill_hero.lua +++ /dev/null @@ -1,30 +0,0 @@ -local skill_hero = { - [10]={ - - }, - [20]={ - - }, - [30]={ - - }, - [40]={ - - }, - [50]={ - - }, - [60]={ - - }, - [70]={ - - }, - [80]={ - - } -} -local config = { -data=skill_hero,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skill_hero.lua.meta b/lua/app/config/strings/ko/skill_hero.lua.meta deleted file mode 100644 index 5fbaf1d3..00000000 --- a/lua/app/config/strings/ko/skill_hero.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 47433e8e0f6b71a4f91e25cd4f6ace44 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/pt/monster_base.lua b/lua/app/config/strings/pt/monster_base.lua new file mode 100644 index 00000000..cecafbb6 --- /dev/null +++ b/lua/app/config/strings/pt/monster_base.lua @@ -0,0 +1,174 @@ +local monster_base = { + [10001]={ + + }, + [10002]={ + + }, + [10003]={ + + }, + [10004]={ + + }, + [10005]={ + + }, + [10006]={ + + }, + [10007]={ + + }, + [10008]={ + + }, + [10009]={ + + }, + [10010]={ + + }, + [10011]={ + + }, + [10012]={ + + }, + [10013]={ + + }, + [10014]={ + + }, + [10015]={ + + }, + [10016]={ + + }, + [10017]={ + + }, + [10018]={ + + }, + [10019]={ + + }, + [10028]={ + + }, + [10029]={ + + }, + [10030]={ + + }, + [10031]={ + + }, + [10032]={ + + }, + [10033]={ + + }, + [10039]={ + + }, + [20001]={ + + }, + [20002]={ + + }, + [20003]={ + + }, + [20004]={ + + }, + [20005]={ + + }, + [20006]={ + + }, + [20007]={ + + }, + [20008]={ + + }, + [20009]={ + + }, + [20010]={ + + }, + [20011]={ + + }, + [20012]={ + + }, + [20013]={ + + }, + [20014]={ + + }, + [20015]={ + + }, + [20016]={ + + }, + [20017]={ + + }, + [20018]={ + + }, + [30001]={ + + }, + [30002]={ + + }, + [30003]={ + + }, + [30004]={ + + }, + [30005]={ + + }, + [30006]={ + + }, + [30007]={ + + }, + [30008]={ + + }, + [30009]={ + + }, + [30010]={ + + }, + [30011]={ + + }, + [30014]={ + + } +} +local config = { +data=monster_base,count=56 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/monster_base.lua.meta b/lua/app/config/strings/pt/monster_base.lua.meta new file mode 100644 index 00000000..3a062ae8 --- /dev/null +++ b/lua/app/config/strings/pt/monster_base.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8940c9717e318fc468740dc62a502dfa +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/pt/skill_hero.lua b/lua/app/config/strings/pt/skill_hero.lua deleted file mode 100644 index 86b9761a..00000000 --- a/lua/app/config/strings/pt/skill_hero.lua +++ /dev/null @@ -1,30 +0,0 @@ -local skill_hero = { - [10]={ - - }, - [20]={ - - }, - [30]={ - - }, - [40]={ - - }, - [50]={ - - }, - [60]={ - - }, - [70]={ - - }, - [80]={ - - } -} -local config = { -data=skill_hero,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skill_hero.lua.meta b/lua/app/config/strings/pt/skill_hero.lua.meta deleted file mode 100644 index 0959464f..00000000 --- a/lua/app/config/strings/pt/skill_hero.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 58b913ed5a2648440987f275ed61b547 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ru/monster_base.lua b/lua/app/config/strings/ru/monster_base.lua new file mode 100644 index 00000000..cecafbb6 --- /dev/null +++ b/lua/app/config/strings/ru/monster_base.lua @@ -0,0 +1,174 @@ +local monster_base = { + [10001]={ + + }, + [10002]={ + + }, + [10003]={ + + }, + [10004]={ + + }, + [10005]={ + + }, + [10006]={ + + }, + [10007]={ + + }, + [10008]={ + + }, + [10009]={ + + }, + [10010]={ + + }, + [10011]={ + + }, + [10012]={ + + }, + [10013]={ + + }, + [10014]={ + + }, + [10015]={ + + }, + [10016]={ + + }, + [10017]={ + + }, + [10018]={ + + }, + [10019]={ + + }, + [10028]={ + + }, + [10029]={ + + }, + [10030]={ + + }, + [10031]={ + + }, + [10032]={ + + }, + [10033]={ + + }, + [10039]={ + + }, + [20001]={ + + }, + [20002]={ + + }, + [20003]={ + + }, + [20004]={ + + }, + [20005]={ + + }, + [20006]={ + + }, + [20007]={ + + }, + [20008]={ + + }, + [20009]={ + + }, + [20010]={ + + }, + [20011]={ + + }, + [20012]={ + + }, + [20013]={ + + }, + [20014]={ + + }, + [20015]={ + + }, + [20016]={ + + }, + [20017]={ + + }, + [20018]={ + + }, + [30001]={ + + }, + [30002]={ + + }, + [30003]={ + + }, + [30004]={ + + }, + [30005]={ + + }, + [30006]={ + + }, + [30007]={ + + }, + [30008]={ + + }, + [30009]={ + + }, + [30010]={ + + }, + [30011]={ + + }, + [30014]={ + + } +} +local config = { +data=monster_base,count=56 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/monster_base.lua.meta b/lua/app/config/strings/ru/monster_base.lua.meta new file mode 100644 index 00000000..5669a88e --- /dev/null +++ b/lua/app/config/strings/ru/monster_base.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: aa6277e5be670ed47ad30e23ca040c19 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ru/skill_hero.lua b/lua/app/config/strings/ru/skill_hero.lua deleted file mode 100644 index 86b9761a..00000000 --- a/lua/app/config/strings/ru/skill_hero.lua +++ /dev/null @@ -1,30 +0,0 @@ -local skill_hero = { - [10]={ - - }, - [20]={ - - }, - [30]={ - - }, - [40]={ - - }, - [50]={ - - }, - [60]={ - - }, - [70]={ - - }, - [80]={ - - } -} -local config = { -data=skill_hero,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skill_hero.lua.meta b/lua/app/config/strings/ru/skill_hero.lua.meta deleted file mode 100644 index 5d7a7c52..00000000 --- a/lua/app/config/strings/ru/skill_hero.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: c69db0ac47970c64f8d89ac40916afaf -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/th/monster_base.lua b/lua/app/config/strings/th/monster_base.lua new file mode 100644 index 00000000..cecafbb6 --- /dev/null +++ b/lua/app/config/strings/th/monster_base.lua @@ -0,0 +1,174 @@ +local monster_base = { + [10001]={ + + }, + [10002]={ + + }, + [10003]={ + + }, + [10004]={ + + }, + [10005]={ + + }, + [10006]={ + + }, + [10007]={ + + }, + [10008]={ + + }, + [10009]={ + + }, + [10010]={ + + }, + [10011]={ + + }, + [10012]={ + + }, + [10013]={ + + }, + [10014]={ + + }, + [10015]={ + + }, + [10016]={ + + }, + [10017]={ + + }, + [10018]={ + + }, + [10019]={ + + }, + [10028]={ + + }, + [10029]={ + + }, + [10030]={ + + }, + [10031]={ + + }, + [10032]={ + + }, + [10033]={ + + }, + [10039]={ + + }, + [20001]={ + + }, + [20002]={ + + }, + [20003]={ + + }, + [20004]={ + + }, + [20005]={ + + }, + [20006]={ + + }, + [20007]={ + + }, + [20008]={ + + }, + [20009]={ + + }, + [20010]={ + + }, + [20011]={ + + }, + [20012]={ + + }, + [20013]={ + + }, + [20014]={ + + }, + [20015]={ + + }, + [20016]={ + + }, + [20017]={ + + }, + [20018]={ + + }, + [30001]={ + + }, + [30002]={ + + }, + [30003]={ + + }, + [30004]={ + + }, + [30005]={ + + }, + [30006]={ + + }, + [30007]={ + + }, + [30008]={ + + }, + [30009]={ + + }, + [30010]={ + + }, + [30011]={ + + }, + [30014]={ + + } +} +local config = { +data=monster_base,count=56 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/th/monster_base.lua.meta b/lua/app/config/strings/th/monster_base.lua.meta new file mode 100644 index 00000000..02a97471 --- /dev/null +++ b/lua/app/config/strings/th/monster_base.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4a0c3aafe9aafed4cb1f0a8d2ae74931 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/th/skill_hero.lua b/lua/app/config/strings/th/skill_hero.lua deleted file mode 100644 index 86b9761a..00000000 --- a/lua/app/config/strings/th/skill_hero.lua +++ /dev/null @@ -1,30 +0,0 @@ -local skill_hero = { - [10]={ - - }, - [20]={ - - }, - [30]={ - - }, - [40]={ - - }, - [50]={ - - }, - [60]={ - - }, - [70]={ - - }, - [80]={ - - } -} -local config = { -data=skill_hero,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skill_hero.lua.meta b/lua/app/config/strings/th/skill_hero.lua.meta deleted file mode 100644 index 1803ff60..00000000 --- a/lua/app/config/strings/th/skill_hero.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: f487bcf921b9e484e8f04834d6272bc3 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/vi/monster_base.lua b/lua/app/config/strings/vi/monster_base.lua new file mode 100644 index 00000000..cecafbb6 --- /dev/null +++ b/lua/app/config/strings/vi/monster_base.lua @@ -0,0 +1,174 @@ +local monster_base = { + [10001]={ + + }, + [10002]={ + + }, + [10003]={ + + }, + [10004]={ + + }, + [10005]={ + + }, + [10006]={ + + }, + [10007]={ + + }, + [10008]={ + + }, + [10009]={ + + }, + [10010]={ + + }, + [10011]={ + + }, + [10012]={ + + }, + [10013]={ + + }, + [10014]={ + + }, + [10015]={ + + }, + [10016]={ + + }, + [10017]={ + + }, + [10018]={ + + }, + [10019]={ + + }, + [10028]={ + + }, + [10029]={ + + }, + [10030]={ + + }, + [10031]={ + + }, + [10032]={ + + }, + [10033]={ + + }, + [10039]={ + + }, + [20001]={ + + }, + [20002]={ + + }, + [20003]={ + + }, + [20004]={ + + }, + [20005]={ + + }, + [20006]={ + + }, + [20007]={ + + }, + [20008]={ + + }, + [20009]={ + + }, + [20010]={ + + }, + [20011]={ + + }, + [20012]={ + + }, + [20013]={ + + }, + [20014]={ + + }, + [20015]={ + + }, + [20016]={ + + }, + [20017]={ + + }, + [20018]={ + + }, + [30001]={ + + }, + [30002]={ + + }, + [30003]={ + + }, + [30004]={ + + }, + [30005]={ + + }, + [30006]={ + + }, + [30007]={ + + }, + [30008]={ + + }, + [30009]={ + + }, + [30010]={ + + }, + [30011]={ + + }, + [30014]={ + + } +} +local config = { +data=monster_base,count=56 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/monster_base.lua.meta b/lua/app/config/strings/vi/monster_base.lua.meta new file mode 100644 index 00000000..7c2160d1 --- /dev/null +++ b/lua/app/config/strings/vi/monster_base.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fc01b4f060ae6b8458518e7211a37280 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/vi/skill_hero.lua b/lua/app/config/strings/vi/skill_hero.lua deleted file mode 100644 index 86b9761a..00000000 --- a/lua/app/config/strings/vi/skill_hero.lua +++ /dev/null @@ -1,30 +0,0 @@ -local skill_hero = { - [10]={ - - }, - [20]={ - - }, - [30]={ - - }, - [40]={ - - }, - [50]={ - - }, - [60]={ - - }, - [70]={ - - }, - [80]={ - - } -} -local config = { -data=skill_hero,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skill_hero.lua.meta b/lua/app/config/strings/vi/skill_hero.lua.meta deleted file mode 100644 index 551d6edf..00000000 --- a/lua/app/config/strings/vi/skill_hero.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: e91da45666fe37b4aa1513858f184119 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/zh/monster_base.lua b/lua/app/config/strings/zh/monster_base.lua new file mode 100644 index 00000000..cecafbb6 --- /dev/null +++ b/lua/app/config/strings/zh/monster_base.lua @@ -0,0 +1,174 @@ +local monster_base = { + [10001]={ + + }, + [10002]={ + + }, + [10003]={ + + }, + [10004]={ + + }, + [10005]={ + + }, + [10006]={ + + }, + [10007]={ + + }, + [10008]={ + + }, + [10009]={ + + }, + [10010]={ + + }, + [10011]={ + + }, + [10012]={ + + }, + [10013]={ + + }, + [10014]={ + + }, + [10015]={ + + }, + [10016]={ + + }, + [10017]={ + + }, + [10018]={ + + }, + [10019]={ + + }, + [10028]={ + + }, + [10029]={ + + }, + [10030]={ + + }, + [10031]={ + + }, + [10032]={ + + }, + [10033]={ + + }, + [10039]={ + + }, + [20001]={ + + }, + [20002]={ + + }, + [20003]={ + + }, + [20004]={ + + }, + [20005]={ + + }, + [20006]={ + + }, + [20007]={ + + }, + [20008]={ + + }, + [20009]={ + + }, + [20010]={ + + }, + [20011]={ + + }, + [20012]={ + + }, + [20013]={ + + }, + [20014]={ + + }, + [20015]={ + + }, + [20016]={ + + }, + [20017]={ + + }, + [20018]={ + + }, + [30001]={ + + }, + [30002]={ + + }, + [30003]={ + + }, + [30004]={ + + }, + [30005]={ + + }, + [30006]={ + + }, + [30007]={ + + }, + [30008]={ + + }, + [30009]={ + + }, + [30010]={ + + }, + [30011]={ + + }, + [30014]={ + + } +} +local config = { +data=monster_base,count=56 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/monster_base.lua.meta b/lua/app/config/strings/zh/monster_base.lua.meta new file mode 100644 index 00000000..baf0265e --- /dev/null +++ b/lua/app/config/strings/zh/monster_base.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b258be2b1183e654f83b012b9e4f131a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/zh/skill_hero.lua b/lua/app/config/strings/zh/skill_hero.lua deleted file mode 100644 index 86b9761a..00000000 --- a/lua/app/config/strings/zh/skill_hero.lua +++ /dev/null @@ -1,30 +0,0 @@ -local skill_hero = { - [10]={ - - }, - [20]={ - - }, - [30]={ - - }, - [40]={ - - }, - [50]={ - - }, - [60]={ - - }, - [70]={ - - }, - [80]={ - - } -} -local config = { -data=skill_hero,count=8 -} -return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skill_hero.lua.meta b/lua/app/config/strings/zh/skill_hero.lua.meta deleted file mode 100644 index 72d6c4f7..00000000 --- a/lua/app/config/strings/zh/skill_hero.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: d928f2bb2c2b3db4e83ad5be7674af97 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/battle/controller/battle_controller_stage.lua b/lua/app/module/battle/controller/battle_controller_stage.lua index f6560b12..793bf1ef 100644 --- a/lua/app/module/battle/controller/battle_controller_stage.lua +++ b/lua/app/module/battle/controller/battle_controller_stage.lua @@ -50,7 +50,7 @@ function BattleControllerStage:_stageGenerateNextMonster() local config = ConfigManager:getConfig("chapter")[self.chapterId] local monsterId = config.monster[self.waveIndex + 1] if monsterId == nil then - return self:enterRoundEnd() + return self:enterNextWave() end local isBoss = self.defTeam:getIsBoss() local unitEntity = DataManager.BattleData:addMonster(monsterId, true) @@ -61,6 +61,7 @@ function BattleControllerStage:_stageGenerateNextMonster() monsterComp:initWithEntity(modelId, unitEntity, self) self.defTeam:addUnit(monsterComp, true) self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) + local bornTime = monsterComp:getAnimationDuration(GConst.BattleConst.SPINE_ANIMATION_NAME.BORN) if isBoss then -- 如果是boss就跑过去 local count = 0 local function onFinish() @@ -72,7 +73,16 @@ function BattleControllerStage:_stageGenerateNextMonster() end self.atkTeam:playRunAction() self.atkTeam:recoverHpOnWaveOver(onFinish) - monsterComp:playEnterBattlefield(true, onFinish) + + isBoss = self.defTeam:getIsBoss() + if isBoss then + local monsterInfo = ConfigManager:getConfig("monster")[monsterId] + self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() + monsterComp:playEnterBattlefield(true, onFinish) + end) + else + monsterComp:playEnterBattlefield(true, onFinish) + end else local count = 0 local function onFinish() @@ -82,7 +92,16 @@ function BattleControllerStage:_stageGenerateNextMonster() end end self.atkTeam:recoverHpOnWaveOver(onFinish) - monsterComp:playEnterBattlefield(false, onFinish) + + isBoss = self.defTeam:getIsBoss() + if isBoss then + local monsterInfo = ConfigManager:getConfig("monster")[monsterId] + self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() + monsterComp:playEnterBattlefield(false, onFinish) + end) + else + monsterComp:playEnterBattlefield(false, onFinish) + end end end) end diff --git a/lua/app/module/hero/hero_manager.lua b/lua/app/module/hero/hero_manager.lua index 93c32a14..55342a25 100644 --- a/lua/app/module/hero/hero_manager.lua +++ b/lua/app/module/hero/hero_manager.lua @@ -124,4 +124,11 @@ function HeroManager:getActiveRogueLvs() return self.activeRogueLvs end +function HeroManager:getMonsterName(monsterBaseId) + if not I18N:getConfig("monster_base") then + return + end + return I18N:getText("monster_base", monsterBaseId, "name") +end + return HeroManager \ No newline at end of file diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index b2f91998..59fb80b7 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -48,6 +48,7 @@ function BattleUI:_display() self.boardCacheBox = uiMap["battle_ui.bg_2.board_cache_node.skill_box"] self.boardCacheBox:setAnchoredPositionX(DEFAULT_X) self.battleRoot = uiMap["battle_ui.battle_root"] + self.maxLayerNode = uiMap["battle_ui.battle_root.battle_node.max_layer_show_node"] self:initBg() self:initSkill() self:initBuff() @@ -65,6 +66,7 @@ function BattleUI:_display() self:initGenerateSkillEffect() self:initSelectSkillNode() self:initCommonSkillDescTips() + self:initBossEnterAni() end function BattleUI:_addListeners() @@ -887,8 +889,9 @@ function BattleUI:eliminationAni(aniSequence, effectGridMap, callback) if info.breakSfxName then breakSfxNameIndexMap[info.breakSfxName] = (breakSfxNameIndexMap[info.breakSfxName] or 0) + 1 + local breakIndex = breakSfxNameIndexMap[info.breakSfxName] self.eliminationAniSeq:InsertCallback(time, function() - self:getSfxGridBreak(info.breakSfxName, breakSfxNameIndexMap[info.breakSfxName], function(obj) + self:getSfxGridBreak(info.breakSfxName, breakIndex, function(obj) local pos = ModuleManager.BattleManager:getPosInfo(info.posId) obj:setLocalScale(38, 38, 38) obj:setLocalPosition(pos.x, pos.y, 0) @@ -1981,6 +1984,53 @@ function BattleUI:showCommonSkillTips(skillId) end, 1.5) end +function BattleUI:initBossEnterAni() + local uiMap = self.root:genAllChildren() + self.bossEnterNode = uiMap["battle_ui.bg_2.boss_enter_node"] + self.bossEnterImg = uiMap["battle_ui.bg_2.boss_enter_node.img"] + self.bossName = uiMap["battle_ui.bg_2.boss_enter_node.boss_name"] + self.bossEnterNodeCanvasGroup = self.bossEnterNode:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP) + self.bossEnterNode:setVisible(false) +end + +function BattleUI:showBossEnterAni(bornTime, bossName, monsterComp, callback) + if not self.bossEnterNode then + if callback then + callback() + end + return + end + self.bossEnterNode:setVisible(true) + self.bossEnterImg:setVisible(false) + self.bossName:setText(GConst.EMPTY_STRING) + self.bossEnterNodeCanvasGroup.alpha = 0 + monsterComp:getBaseObject():setLocalPosition(DEFAULT_X, 0, 0) + if self.bossEnterAniSeq then + self.bossEnterAniSeq:Kill() + self.bossEnterAniSeq = nil + end + self.bossEnterAniSeq = self.root:createBindTweenSequence() + self.bossEnterAniSeq:Append(self.bossEnterNodeCanvasGroup:DOFade(1, 0.2)) + self.bossEnterAniSeq:AppendCallback(function() + self.bossEnterImg:setVisible(true) + monsterComp:initPosition() + monsterComp:getBaseObject():setParent(self.maxLayerNode, false) + if callback then + callback() + end + end) + self.bossEnterAniSeq:AppendInterval(bornTime) + self.bossEnterAniSeq:AppendCallback(function() + self.bossName:setText(bossName) + end) + self.bossEnterAniSeq:AppendInterval(0.5) + self.bossEnterAniSeq:Append(self.bossEnterNodeCanvasGroup:DOFade(0, 0.2)) + self.bossEnterAniSeq:AppendCallback(function() + monsterComp:getBaseObject():setParent(self:getBattleNode(), false) + self.bossEnterNode:setVisible(false) + end) +end + function BattleUI:clear() if self.alreadyClear then return @@ -2086,6 +2136,11 @@ function BattleUI:clear() self:unscheduleGlobal(self.autoCloseBuffSid) self.autoCloseBuffSid = nil end + + if self.bossEnterAniSeq then + self.bossEnterAniSeq:Kill() + self.bossEnterAniSeq = nil + end end return BattleUI \ No newline at end of file diff --git a/lua/app/userdata/battle/battle_data.lua b/lua/app/userdata/battle/battle_data.lua index c5ce9c2c..bf3af345 100644 --- a/lua/app/userdata/battle/battle_data.lua +++ b/lua/app/userdata/battle/battle_data.lua @@ -145,8 +145,8 @@ function BattleData:refreshBoard(board, blockIcon) local posId = ModuleManager.BattleManager:getPosId(r, c) local data = { posId = posId, - gridType = info[1], - elementType = info[2] + gridType = info[1] or BattleConst.GRID_TYPE.EMPTY, + elementType = info[2] or BattleConst.ELEMENT_TYPE.RED } if self.gridEntities[data.posId] then self.gridEntities[data.posId]:clear()