diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index d3d00ced..e8d56b30 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -13,6 +13,7 @@ function DataManager:init() self:initManager("BattleData", "app/userdata/battle/battle_data") self:initManager("FormationData", "app/userdata/formation/formation_data") self:initManager("TutorialData", "app/userdata/tutorial/tutorial_data") + self:initManager("ActivityData", "app/userdata/activity/activity_data") -- self:initManager("IdleData", "app/userdata/idle/idle_data") -- self:initManager("SevenDayData", "app/userdata/activity/seven_day/seven_day_data") end @@ -73,6 +74,7 @@ function DataManager:clear() self.HeroData:clear() self.BagData:clear() self.FormationData:clear() + self.ActivityData:clear() -- self.IdleData:clear() -- self.SevenDayData:clear() @@ -94,6 +96,7 @@ function DataManager:initWithServerData(data) self.BagData:init(data.BagData) self.FormationData:init(data.FormationData) self.TutorialData:init(data.TutorialData) + self.ActivityData:init() -- self.IdleData:clear(data.IdleData) -- self.SevenDayData:init(data.SevenDayData) diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index d79bbc47..45e233dc 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -20,6 +20,8 @@ local MODULE_PATHS = { -- SevenDayManager = "app/module/activity/seven_day/seven_day_manager", -- 设置 GameSettingManager = "app/module/game_setting/game_setting_manager", + -- 活动 + ActivityManager = "app/module/activity/activity_manager", } -- 这里的key对应func_open里的id diff --git a/lua/app/module/activity/activity_manager.lua b/lua/app/module/activity/activity_manager.lua new file mode 100644 index 00000000..bc18ddd2 --- /dev/null +++ b/lua/app/module/activity/activity_manager.lua @@ -0,0 +1,7 @@ +local ActivityManager = class("ActivityManager", BaseModule) + +function ActivityManager:showGoldPigUI() + UIManager:showUI("app/ui/activity/gold_pig/gold_pig_ui") +end + +return ActivityManager \ No newline at end of file diff --git a/lua/app/module/activity/activity_manager.lua.meta b/lua/app/module/activity/activity_manager.lua.meta new file mode 100644 index 00000000..965dfccf --- /dev/null +++ b/lua/app/module/activity/activity_manager.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 24eec9f9e879747448ec4e54674c2561 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index 36d6d673..8d58d98b 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -24,6 +24,7 @@ MainCityConst.LEFT_SIDE_BARS = { MainCityConst.RIGHT_SIDE_BARS = { "app/ui/main_city/cell/side_bar_mail_cell", + "app/ui/main_city/cell/side_bar_god_pig_cell", } return MainCityConst \ No newline at end of file diff --git a/lua/app/ui/activity/gold_pig.meta b/lua/app/ui/activity/gold_pig.meta new file mode 100644 index 00000000..05aace21 --- /dev/null +++ b/lua/app/ui/activity/gold_pig.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a58e68efa3d74624fbe79c249e00960b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/activity/gold_pig/gold_pig_ui.lua b/lua/app/ui/activity/gold_pig/gold_pig_ui.lua new file mode 100644 index 00000000..eb2555e8 --- /dev/null +++ b/lua/app/ui/activity/gold_pig/gold_pig_ui.lua @@ -0,0 +1,18 @@ +local GoldPigUI = class("GoldPigUI", BaseUI) + +function GoldPigUI:isFullScreen() + return false +end + +function GoldPigUI:getPrefabPath() + return "assets/prefabs/ui/activity/god_pig/gold_pig_ui.prefab" +end + +function GoldPigUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + uiMap["gold_pig_ui.gift_bg.buy_btn"]:addClickListener(function() + self:closeUI() + end) +end + +return GoldPigUI \ No newline at end of file diff --git a/lua/app/ui/activity/gold_pig/gold_pig_ui.lua.meta b/lua/app/ui/activity/gold_pig/gold_pig_ui.lua.meta new file mode 100644 index 00000000..c8b5a180 --- /dev/null +++ b/lua/app/ui/activity/gold_pig/gold_pig_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a300b20a79863224baf9dfd4e9a4635a +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_god_pig_cell.lua b/lua/app/ui/main_city/cell/side_bar_god_pig_cell.lua new file mode 100644 index 00000000..4ceb4b8d --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_god_pig_cell.lua @@ -0,0 +1,16 @@ +local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" +local SideBarGodPigCell = class("SideBarGodPigCell", SideBarBaseCellComp) + +function SideBarGodPigCell:getIsOpen() + return true +end + +function SideBarGodPigCell:getIconRes() + return "main_btn_godpig" +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 new file mode 100644 index 00000000..bf6d354e --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_god_pig_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b67c66ef72d69404bba1a01a2e3c400a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/activity/activity_data.lua b/lua/app/userdata/activity/activity_data.lua new file mode 100644 index 00000000..12aeaef6 --- /dev/null +++ b/lua/app/userdata/activity/activity_data.lua @@ -0,0 +1,6 @@ +local ActivityData = class("ActivityData", BaseData) + +function ActivityData:init(data) +end + +return ActivityData \ No newline at end of file diff --git a/lua/app/userdata/activity/activity_data.lua.meta b/lua/app/userdata/activity/activity_data.lua.meta new file mode 100644 index 00000000..a03fc8c8 --- /dev/null +++ b/lua/app/userdata/activity/activity_data.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5c44b0ee4c64da646b83ec7b59222640 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}