diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index a7ff9987..db87e79a 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -89,6 +89,7 @@ BIReport.ADS_CLICK_TYPE = { MALL_DAILY_RESET = "MallDailyReset", MALL_GOLD = "MallGold", MALL_TREASURE = "MallTreasure", + MAIL = "Mail", } BIReport.FIGHT_OPT_TYPE = { diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index 5a35d3ef..e6b10097 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -15,7 +15,7 @@ function DataManager:init() self:initManager("TutorialData", "app/userdata/tutorial/tutorial_data") self:initManager("MailData", "app/userdata/mail/mail_data") self:initManager("ActivityData", "app/userdata/activity/activity_data") - self:initManager("GodPigData", "app/userdata/activity/god_pig/god_pig_data") + self:initManager("GoldPigData", "app/userdata/activity/gold_pig/gold_pig_data") self:initManager("BountyData", "app/userdata/bounty/bounty_data") self:initManager("DailyTaskData", "app/userdata/task/daily_task_data") self:initManager("IdleData", "app/userdata/idle/idle_data") @@ -85,7 +85,7 @@ function DataManager:clear() self.FormationData:clear() self.ActivityData:clear() self.MailData:clear() - self.GodPigData:clear() + self.GoldPigData:clear() self.BountyData:clear() self.DailyTaskData:clear() self.IdleData:clear() @@ -118,7 +118,7 @@ function DataManager:initWithServerData(data) self.TutorialData:init(data.guide) self.MailData:init(data.mail_info) self.ActivityData:init() - self.GodPigData:init(data.pig) + self.GoldPigData:init(data.pig) self.BountyData:init(data.bounty) -- 任务要在BountyData之后初始化，依赖BountyData的数据 self.DailyTaskData:init(data.task_daily) diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua index 41fa75c8..8af4354b 100644 --- a/lua/app/common/event_manager.lua +++ b/lua/app/common/event_manager.lua @@ -25,6 +25,7 @@ EventManager.CUSTOM_EVENT = { LOGIN_REQ_SUCCESS = "LOGIN_REQ_SUCCESS", DAILY_TASK_ADD_PROGRESS = "DAILY_TASK_ADD_PROGRESS", BOSS_ENTER_ANI_OVER = "BOSS_ENTER_ANI_OVER", + TIME_TRIGGERED_NEW_EMAIL = "TIME_TRIGGERED_NEW_EMAIL" -- 邮件到时间请求是否有新邮件 -- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN", -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" } diff --git a/lua/app/common/time.lua b/lua/app/common/time.lua index 9a4f698c..e26e3e01 100644 --- a/lua/app/common/time.lua +++ b/lua/app/common/time.lua @@ -191,6 +191,13 @@ function Time:getDayofWeek(time) return day end +function Time:getDayofWeekUTC(time) + local curTime = time or self:getServerTime() + local day = tonumber(os.date("!%w", curTime)) + day = day == 0 and 7 or day + return day +end + -- 00:00:00 function Time:formatNumTime(time) if time <= 0 then 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 b678242c..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, 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/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index f296139e..5ae47a34 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -91,7 +91,7 @@ function ChapterManager:endFightFinish(result) ModuleManager.BattleManager:showBattleResultUI(newRewards, reqData.combatReport, mysteryBoxIdx) DataManager.ChapterData:fightChapter(reqData.chapter_id, result.max_chapter_id, result.max_wave, reqData.mystery_box_idx) -- 处理金猪 - -- DataManager.GodPigData:addGoldPigCount() + -- DataManager.GoldPigData:addGoldPigCount() local newMaxChapter = DataManager.ChapterData:getNewChapterId() if maxChapter ~= newMaxChapter then diff --git a/lua/app/module/gm/gm_const.lua b/lua/app/module/gm/gm_const.lua index 3c8935a2..8983f07b 100644 --- a/lua/app/module/gm/gm_const.lua +++ b/lua/app/module/gm/gm_const.lua @@ -66,6 +66,13 @@ Example: chapter 5 10 参数1 章节 参数2 波次]], Example: reset_bounty]], type = "reset_bounty" }, + { + title = "添加邮件", + desc = [[添加邮件 type:add_mail +arg1:邮件id +Example: add_mail 1]], + type = "add_mail" + }, } return GMConst \ No newline at end of file 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/module/login/login_manager.lua b/lua/app/module/login/login_manager.lua index 43bd4470..c5617065 100644 --- a/lua/app/module/login/login_manager.lua +++ b/lua/app/module/login/login_manager.lua @@ -148,7 +148,7 @@ function LoginManager:loginFinish(data) CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data) EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.LOGIN_REQ_SUCCESS) - -- ModuleManager.MailManager:getMailList(true) + ModuleManager.MailManager:getMailList(true) DataManager:setLoginSuccess(true) BIReport:postGameLoginFinish() diff --git a/lua/app/module/mail/mail_manager.lua b/lua/app/module/mail/mail_manager.lua index c327dacf..3e224a40 100644 --- a/lua/app/module/mail/mail_manager.lua +++ b/lua/app/module/mail/mail_manager.lua @@ -128,8 +128,8 @@ function MailManager:readMailFinish(result) end function MailManager:needUpdateMail() - DataManager.MailData:setNeedGetNewMail(true) - DataManager.MailData:setDirty() + -- 收到推送后不一定是有新邮件，要去拉一下 + self:getMailList(true) end return MailManager \ No newline at end of file diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index d1ee7297..5651f12b 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -23,7 +23,7 @@ MainCityConst.LEFT_SIDE_BARS = { } MainCityConst.RIGHT_SIDE_BARS = { - "app/ui/main_city/cell/side_bar_god_pig_cell", + "app/ui/main_city/cell/side_bar_gold_pig_cell", } return MainCityConst \ No newline at end of file diff --git a/lua/app/ui/activity/gold_pig/gold_pig_ui.lua b/lua/app/ui/activity/gold_pig/gold_pig_ui.lua index eb2555e8..ccce423f 100644 --- a/lua/app/ui/activity/gold_pig/gold_pig_ui.lua +++ b/lua/app/ui/activity/gold_pig/gold_pig_ui.lua @@ -5,14 +5,35 @@ function GoldPigUI:isFullScreen() end function GoldPigUI:getPrefabPath() - return "assets/prefabs/ui/activity/god_pig/gold_pig_ui.prefab" + return "assets/prefabs/ui/activity/gold_pig/gold_pig_ui.prefab" end function GoldPigUI:onLoadRootComplete() local uiMap = self.root:genAllChildren() - uiMap["gold_pig_ui.gift_bg.buy_btn"]:addClickListener(function() + uiMap["gold_pig_ui.bg.close_btn"]:addClickListener(function() self:closeUI() end) + + uiMap["gold_pig_ui.bg.title_tx"]:setText("临时文本:超值金猪") + uiMap["gold_pig_ui.bg.desc_tx"]:setText("临时文本:挑战关卡并收集钻石，你就可以获得一笔划算的交易。") + uiMap["gold_pig_ui.bg.value_bg.tx"]:setText("临时文本:300%") + local currGem = DataManager.GoldPigData:getGoldPigGemCount() + local maxGem = DataManager.GoldPigData:getGoldPigGemMaxCount() + local nowGemTx = uiMap["gold_pig_ui.bg.slider.now_gem_bg.gem_tx"] + nowGemTx:setText(GFunc.intToString(currGem)) + local nowGemImg = uiMap["gold_pig_ui.bg.slider.now_gem_bg.gem_img"] + GFunc.centerImgAndTx(nowGemImg, nowGemTx, 0, -4) + + local maxGemTx = uiMap["gold_pig_ui.bg.slider.max_gem_bg.gem_tx"] + maxGemTx:setText(GFunc.intToString(maxGem)) + local maxGemImg = uiMap["gold_pig_ui.bg.slider.max_gem_bg.gem_img"] + GFunc.centerImgAndTx(maxGemImg, maxGemTx, 0, -4) + + uiMap["gold_pig_ui.bg.slider"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = currGem / maxGem + uiMap["gold_pig_ui.bg.buy_btn"]:addClickListener(function() + end) + local rechargeId = DataManager.GoldPigData:getRechargeId() + uiMap["gold_pig_ui.bg.buy_btn.text"]:setText(GFunc.getFormatPrice(rechargeId)) end return GoldPigUI \ 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/ui/bounty/bounty_buy_ui.lua b/lua/app/ui/bounty/bounty_buy_ui.lua index 2f7ea196..de8b1fbc 100644 --- a/lua/app/ui/bounty/bounty_buy_ui.lua +++ b/lua/app/ui/bounty/bounty_buy_ui.lua @@ -81,7 +81,7 @@ function BountyBuyUI:initBtns() local buyProBountyAddLevels = DataManager.BountyData:getBuyProBountyAddLevelCount() if level > maxLevel - buyProBountyAddLevels then local params = { - content = "购买此通行证会超过通行证等级上限，会造成损失，是否购买？", + content = I18N:getGlobalText(I18N.GlobalConst.BOUNTY_DESC_4), boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, okFunc = function() self:closeUI() diff --git a/lua/app/ui/common/message_box.lua b/lua/app/ui/common/message_box.lua index e565acfa..d2025dca 100644 --- a/lua/app/ui/common/message_box.lua +++ b/lua/app/ui/common/message_box.lua @@ -70,7 +70,7 @@ function MessageBox:showMessageBox(params) uiMap["message_box.title_bg_img.title_text"]:setText(titleTx) uiMap["message_box.title_bg_img.bg.content_tx"]:setText(content) - uiMap["message_box.title_bg_img.btn.cancel_btn.text"]:setText(cancelText or I18N:getGlobalText(I18N.GlobalConst.CANCEL_1)) + uiMap["message_box.title_bg_img.btn.cancel_btn.text"]:setText(cancelText or I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL)) if boxType == GConst.MESSAGE_BOX_TYPE.MB_OK then uiMap["message_box.title_bg_img.btn.cancel_btn"]:setVisible(false) diff --git a/lua/app/ui/main_city/cell/side_bar_god_pig_cell.lua b/lua/app/ui/main_city/cell/side_bar_god_pig_cell.lua deleted file mode 100644 index 7c4c7db0..00000000 --- a/lua/app/ui/main_city/cell/side_bar_god_pig_cell.lua +++ /dev/null @@ -1,16 +0,0 @@ -local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" -local SideBarGodPigCell = class("SideBarGodPigCell", SideBarBaseCellComp) - -function SideBarGodPigCell:getIsOpen() - return false -end - -function SideBarGodPigCell:getIconRes() - return "main_btn_pig" -end - -function SideBarGodPigCell:onClick() - ModuleManager.ActivityManager:showGoldPigUI() -end - -return SideBarGodPigCell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_god_pig_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_god_pig_cell.lua.meta deleted file mode 100644 index bf6d354e..00000000 --- a/lua/app/ui/main_city/cell/side_bar_god_pig_cell.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: b67c66ef72d69404bba1a01a2e3c400a -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/main_city/cell/side_bar_gold_pig_cell.lua b/lua/app/ui/main_city/cell/side_bar_gold_pig_cell.lua new file mode 100644 index 00000000..14196ed2 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_gold_pig_cell.lua @@ -0,0 +1,16 @@ +local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" +local SideBarGoldPigCell = class("SideBarGoldPigCell", SideBarBaseCellComp) + +function SideBarGoldPigCell:getIsOpen() + return true +end + +function SideBarGoldPigCell:getIconRes() + return "main_btn_pig" +end + +function SideBarGoldPigCell:onClick() + ModuleManager.ActivityManager:showGoldPigUI() +end + +return SideBarGoldPigCell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_gold_pig_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_gold_pig_cell.lua.meta new file mode 100644 index 00000000..e9ff715d --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_gold_pig_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 93980678bfb82024380ec443e5da7099 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 7b86908b..fa418b15 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -110,6 +110,13 @@ function MainCityUI:_display() end function MainCityUI:_addListeners() + self:addEventListener(EventManager.CUSTOM_EVENT.TIME_TRIGGERED_NEW_EMAIL, function() + local time = math.random(10000, 30000) / 20000 + ModuleManager.MailManager:performWithDelayGlobal(function() + ModuleManager.MailManager:getTriggeredTimeMail() + end, time) + end) + DataManager.MailData:checkNewMail() end function MainCityUI:_bind() diff --git a/lua/app/userdata/activity/god_pig/god_pig_data.lua.meta b/lua/app/userdata/activity/god_pig/god_pig_data.lua.meta deleted file mode 100644 index 1e4d53b3..00000000 --- a/lua/app/userdata/activity/god_pig/god_pig_data.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 4997d640a2606ed4288d0d6d708d7cea -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/activity/god_pig.meta b/lua/app/userdata/activity/gold_pig.meta similarity index 77% rename from lua/app/userdata/activity/god_pig.meta rename to lua/app/userdata/activity/gold_pig.meta index 1e367929..e45fb533 100644 --- a/lua/app/userdata/activity/god_pig.meta +++ b/lua/app/userdata/activity/gold_pig.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 97616c4602b36c14eb280f12d16bdd56 +guid: 1f9faf25e847f994892adf3d644b9969 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/lua/app/userdata/activity/god_pig/god_pig_data.lua b/lua/app/userdata/activity/gold_pig/gold_pig_data.lua similarity index 71% rename from lua/app/userdata/activity/god_pig/god_pig_data.lua rename to lua/app/userdata/activity/gold_pig/gold_pig_data.lua index c527573a..79f47291 100644 --- a/lua/app/userdata/activity/god_pig/god_pig_data.lua +++ b/lua/app/userdata/activity/gold_pig/gold_pig_data.lua @@ -1,6 +1,6 @@ -local GodPigData = class("GodPigData", BaseData) +local GoldPigData = class("GoldPigData", BaseData) -function GodPigData:init(data) +function GoldPigData:init(data) data = data or GConst.EMPTY_TABLE self.data.id = data.id or 0 if self.data.id == 0 then @@ -12,11 +12,11 @@ function GodPigData:init(data) self.data.isOpen = false end -function GodPigData:getIsOpen() +function GoldPigData:getIsOpen() return self.data.isOpen end -function GodPigData:addGoldPigCount() +function GoldPigData:addGoldPigCount() if not self.data.isOpen then self:tryActiveGoldPig() return @@ -34,47 +34,67 @@ function GodPigData:addGoldPigCount() end end -function GodPigData:getFirstLevelId() +function GoldPigData:getGoldPigGemCount() + return self.data.count +end + +function GoldPigData:getGoldPigGemMaxCount() + local info = self:getCurrLevelInfo() + if info == nil then + return 1 + end + return info.max_diamond +end + +function GoldPigData:getRechargeId() + local info = self:getCurrLevelInfo() + if info == nil then + return 0 + end + return info.recharge_id +end + +function GoldPigData:getFirstLevelId() if self.firstLevelId == nil then self.firstLevelId = ConfigManager:getConfig("const")["act_gold_pig_first_id"].value end return self.firstLevelId end -function GodPigData:getTimeOverCD() +function GoldPigData:getTimeOverCD() if self.timeOverCD == nil then self.timeOverCD = ConfigManager:getConfig("const")["act_gold_pig_cd"].value * 3600 end return self.timeOverCD end -function GodPigData:getBoughtCD() +function GoldPigData:getBoughtCD() if self.boughtCD == nil then self.boughtCD = ConfigManager:getConfig("const")["act_gold_pig_buy_cd"].value * 3600 end return self.boughtCD end -function GodPigData:getCfg() +function GoldPigData:getCfg() if self.cfg == nil then - self.cfg = ConfigManager:getConfig("act_god_pig") + self.cfg = ConfigManager:getConfig("act_gold_pig") end return self.cfg end -function GodPigData:getDuration() +function GoldPigData:getDuration() if self.duration == nil then self.duration = ConfigManager:getConfig("const")["act_gold_pig_full_cd"].value * 3600 end return self.duration end -function GodPigData:getCurrLevelInfo() +function GoldPigData:getCurrLevelInfo() local cfg = self:getCfg() return cfg[self.data.id] end -function GodPigData:tryActiveGoldPig() +function GoldPigData:tryActiveGoldPig() if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.GOLD_PIG, true) then return end @@ -89,7 +109,7 @@ function GodPigData:tryActiveGoldPig() end -- 时间到了,消失并降档 -function GodPigData:onTimeOver() +function GoldPigData:onTimeOver() if not self.data.isOpen then return end @@ -105,7 +125,7 @@ function GodPigData:onTimeOver() end -- 购买后，消失并升档位 -function GodPigData:onBought(id) +function GoldPigData:onBought(id) if not self.data.isOpen then return end @@ -118,4 +138,4 @@ function GodPigData:onBought(id) self.data.cd = self:getBoughtCD() end -return GodPigData \ No newline at end of file +return GoldPigData \ No newline at end of file diff --git a/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.meta b/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.meta new file mode 100644 index 00000000..3a12c2ee --- /dev/null +++ b/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f25fb374307a0744fbe9ea15052f86c5 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} 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() diff --git a/lua/app/userdata/bounty/bounty_data.lua b/lua/app/userdata/bounty/bounty_data.lua index 6f4ce654..5b4dfbfd 100644 --- a/lua/app/userdata/bounty/bounty_data.lua +++ b/lua/app/userdata/bounty/bounty_data.lua @@ -173,10 +173,6 @@ function BountyData:getMaxLevel() return #self.bountyLevelCfg end -function BountyData:getBountyLevelCfg() - return self.bountyLevelCfg -end - function BountyData:getAllProRewards() if self.proRewards and #self.proRewards > 0 then return self.proRewards diff --git a/lua/app/userdata/mail/mail_data.lua b/lua/app/userdata/mail/mail_data.lua index ec91a9d2..dd4b6f54 100644 --- a/lua/app/userdata/mail/mail_data.lua +++ b/lua/app/userdata/mail/mail_data.lua @@ -9,6 +9,7 @@ local TIME_TYPE = { } function MailData:ctor() self.mails = {} + self.checkNewMailTimsList = {} self.needGetNewMail = false self.data.isDirty = false self.data.redPoint = false @@ -20,6 +21,8 @@ function MailData:clear() self.data.redPoint = false self.lastMailId = nil self.mailIsOpen = false + DataManager:unregisterDataCd("MailData") + DataManager:unregisterCrossDayFunc("MailData") end function MailData:init(data) @@ -30,48 +33,98 @@ function MailData:init(data) self:updateRedPointCd() DataManager:registerDataCd("MailData") + DataManager:registerCrossDayFunc("MailData", function() + self:updateRedPointCd() + end) end function MailData:updateRedPointCd() - self.needUpdateRedPointInfo = {} + for i = 1, #self.checkNewMailTimsList do + table.remove(self.checkNewMailTimsList) + end local cfg = ConfigManager:getConfig("mail") for i,v in ipairs(cfg) do if v.time_type == TIME_TYPE.DAY then - for ii = 1, 7 do - self.needUpdateRedPointInfo[ii] = self.needUpdateRedPointInfo[ii] or {} - if #v.time_send == 3 then - local time = v.time_send[1] * 3600 + v.time_send[2] * 60 + v.time_send[3] - if not table.containValue(self.needUpdateRedPointInfo[ii], time) then - table.insert(self.needUpdateRedPointInfo[ii], time) + if #v.time_send == 3 then + local time = v.time_send[1] * 3600 + v.time_send[2] * 60 + v.time_send[3] + 1 + local currTime = Time:getServerTime() % 86400 + if time >= currTime then + local find = false + for k, v in ipairs(self.checkNewMailTimsList) do + if v == time then + find = true + break + end + end + if not find then + table.insert(self.checkNewMailTimsList, time) end end end elseif v.time_type == TIME_TYPE.WEEK then - if #v.time_send == 4 then + if #v.time_send == 4 then -- 周几，时，分，秒 local day = v.time_send[1] - self.needUpdateRedPointInfo[day] = self.needUpdateRedPointInfo[day] or {} - local time = v.time_send[2] * 3600 + v.time_send[3] * 60 + v.time_send[4] - if not table.containValue(self.needUpdateRedPointInfo[day], time) then - table.insert(self.needUpdateRedPointInfo[day], time) + if day == Time:getDayofWeekUTC() then + local time = v.time_send[2] * 3600 + v.time_send[3] * 60 + v.time_send[4] + 1 + local currTime = Time:getServerTime() % 86400 + if time >= currTime then + local find = false + for k, v in ipairs(self.checkNewMailTimsList) do + if v == time then + find = true + break + end + end + if not find then + table.insert(self.checkNewMailTimsList, time) + end + end end end elseif v.time_type == TIME_TYPE.MONTH then - --TODO 暂时没有 无数据格式 + if #v.time_send == 4 then -- 几号，时，分，秒 + local offsetSeconds = math.floor(Time:getClientTimeZone() * 3600) + local time = Time:getServerTime() + local utcNow = os.date('!*t', time) + local targetTime = math.floor(os.time({day = v.time_send[1], month = utcNow.month, year = utcNow.year, hour = v.time_send[2], min = v.time_send[3], sec = v.time_send[4]})) + offsetSeconds + if targetTime >= time then -- 还没到目标时间 + local diff = targetTime - time + local todayRemainTime = time % 86400 -- 到今天24点还剩余的秒数 + if diff <= todayRemainTime then -- 今天内就能达到目标时间 + local targetRemainTime = targetTime % 86400 + local find = false + for k, v in ipairs(self.checkNewMailTimsList) do + if v == targetRemainTime then + find = true + break + end + end + if not find then + table.insert(self.checkNewMailTimsList, targetRemainTime) + end + end + end + end + end + end +end + +function MailData:checkNewMail() + if #self.checkNewMailTimsList <= 0 then + return + end + local nowTime = Time:getServerTime() % 86400 + for i = #self.checkNewMailTimsList, 1, -1 do + if self.checkNewMailTimsList[i] <= nowTime then + table.remove(self.checkNewMailTimsList, i) + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.TIME_TRIGGERED_NEW_EMAIL) + break end end end function MailData:updateCd() - local nowTime = Time:getServerTime() - local today = Time:getDayofWeek() - local times = self.needUpdateRedPointInfo[today] or {} - local curTime = nowTime % 86400 - for i, v in ipairs(times) do - if v == curTime then - EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.TIME_TRIGGERED_NEW_EMAIL) - break - end - end + self:checkNewMail() end function MailData:addMails(mails)