diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 5a46190fd2..55ab874e00 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName GlobalDefine * @Description 全局变量 * @Date 2019/5/9 13:56 diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index d1a24a483b..097d9aac1e 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1,4 +1,4 @@ -Language = { +Language = { [10001] = GetLanguageStrById("一"), [10002] = GetLanguageStrById("二"), [10003] = GetLanguageStrById("三"), diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 345ec36bc3..0cb5aed103 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1,4 +1,4 @@ --- Lua中的继承 +-- Lua中的继承 function Inherit(tbParent, tbChild) if not tbParent then local o = tbChild or {} diff --git a/Assets/ManagedResources/~Lua/Framework/Framework.lua b/Assets/ManagedResources/~Lua/Framework/Framework.lua index b7f574f7db..0b4d28959f 100644 --- a/Assets/ManagedResources/~Lua/Framework/Framework.lua +++ b/Assets/ManagedResources/~Lua/Framework/Framework.lua @@ -1,4 +1,4 @@ ---region *.lua +--region *.lua --Date --此文件由[BabeLua]插件自动生成 diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index 4fc3fdef17..7d21d53a88 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -1,6 +1,6 @@ ServerConfigManager = { } -local _ActiveCode = 26 -- 激活版本 +local _ActiveCode = 1 -- 激活版本 ServerConfigManager.SettingConfig = { ServerVersion = "ServerVersion", -- 用于切换正式服和提审服 diff --git a/Assets/ManagedResources/~Lua/Logic/Network.lua b/Assets/ManagedResources/~Lua/Logic/Network.lua index 9eb7b1910a..cbc55c6792 100644 --- a/Assets/ManagedResources/~Lua/Logic/Network.lua +++ b/Assets/ManagedResources/~Lua/Logic/Network.lua @@ -1,4 +1,4 @@ -require "Message/CommonProto_pb" +require "Message/CommonProto_pb" require "Message/MessageTypeProto_pb" require "Base/Queue" Network = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Achievement/AchievementPanel.lua b/Assets/ManagedResources/~Lua/Modules/Achievement/AchievementPanel.lua index fdcecd9ddc..fb3de0f671 100644 --- a/Assets/ManagedResources/~Lua/Modules/Achievement/AchievementPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Achievement/AchievementPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") AchievementPanel = Inherit(BasePanel) local this = AchievementPanel local redPointGrid = {}--红点 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index c0a325d848..ce24073685 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -1,4 +1,4 @@ -ActivityGiftManager = {}; +ActivityGiftManager = {}; local this = ActivityGiftManager local ActivityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig) local GlobalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua index 5b6427d025..521daf7de1 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua @@ -1,4 +1,4 @@ -AllActivityManager = {}; +AllActivityManager = {}; local this = AllActivityManager local ActivityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig) local GlobalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/CourtesyDressPanel.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/CourtesyDressPanel.lua index 5ddec51c19..bdd6982b2a 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/CourtesyDressPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/CourtesyDressPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CourtesyDressPanel = Inherit(BasePanel) local this = CourtesyDressPanel local chapterList = { Language[10001], Language[10002], Language[10003], Language[10004], Language[10005], Language[10006], Language[10007], Language[10008], Language[10009], Language[10010], Language[10011], Language[10012], Language[10013], Language[10014], Language[10015] } diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua index 54b34c71fa..50fc7cc2fe 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") OpenSeverWelfarePanel = Inherit(BasePanel) local this = OpenSeverWelfarePanel local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/View/SevenDayGift.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/View/SevenDayGift.lua index 066ce1aaf3..f7581e6357 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/View/SevenDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/View/SevenDayGift.lua @@ -1,4 +1,4 @@ -local SevenDayGift = quick_class("SevenDayGift") +local SevenDayGift = quick_class("SevenDayGift") local this = SevenDayGift local selectIndex = 0 local jumpNeedBtn = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/WarPowerSortPanel.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/WarPowerSortPanel.lua index c7769a9ab2..f7e5df2bcc 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/WarPowerSortPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/WarPowerSortPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WarPowerSortPanel = Inherit(BasePanel) local activityRewardGrid = {} local activityRewardGridItemView = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureAlianInvasionPanel.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureAlianInvasionPanel.lua index 9eae7e3d5b..6c6ccc5e60 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureAlianInvasionPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureAlianInvasionPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local AdventureAlianInvasionPanel = Inherit(BasePanel) local this = AdventureAlianInvasionPanel -- Tab管理器 diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureExploreRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureExploreRewardPanel.lua index 243f46c55e..9a76021b46 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureExploreRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureExploreRewardPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") AdventureExploreRewardPanel = Inherit(BasePanel) local this=AdventureExploreRewardPanel local baseDrop={} diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureGetRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureGetRewardPopup.lua index 14dcede27a..6edcaedd2f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureGetRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureGetRewardPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local AdventureGetRewardPopup = Inherit(BasePanel) local this = AdventureGetRewardPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureMainPanel.lua index b239e6806e..59c00d851e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Modules/Adventure/View/AdventureView") local AdventureMainPanel = Inherit(BasePanel) local this = AdventureMainPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua index 92d5ee0e9f..37c190c1f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua @@ -1,4 +1,4 @@ -AdventureManager = {} +AdventureManager = {} local this = AdventureManager local GameSetting = ConfigManager.GetConfig(ConfigName.GameSetting) -- local AdventureReward = ConfigManager.GetConfig(ConfigName.AdventureReward) diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureRewardDetailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureRewardDetailPopup.lua index 9f165d1517..0dd21067b1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureRewardDetailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureRewardDetailPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local AdventureRewardDetailPopup = Inherit(BasePanel) local this = AdventureRewardDetailPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureUpLevelPanel.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureUpLevelPanel.lua index 68b318b59e..c7e6df074a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureUpLevelPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureUpLevelPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") AdventureUpLevelPanel = Inherit(BasePanel) local this = AdventureUpLevelPanel local RewardGroup = ConfigManager.GetConfig(ConfigName.RewardGroup) diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua index c023612cc1..d3e145a3a1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua @@ -1,4 +1,4 @@ -AdventureView = {} +AdventureView = {} require("Base/BasePanel") local MonsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup) local MonsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Alien/AlienMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Alien/AlienMainPanel.lua index ac5816acc6..ab054febb7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Alien/AlienMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Alien/AlienMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local AlienMainPanel = Inherit(BasePanel) local this = AlienMainPanel --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Alien/AlienRankRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Alien/AlienRankRewardPopup.lua index 606562a42b..c0e99ba5be 100644 --- a/Assets/ManagedResources/~Lua/Modules/Alien/AlienRankRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Alien/AlienRankRewardPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local AlienRankRewardPopup = Inherit(BasePanel) local this = AlienRankRewardPopup --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaMainPanel.lua index c22d1b4d03..b5bcbd5e98 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ArenaMainPanel = Inherit(BasePanel) local this = ArenaMainPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua index 0565c1f77d..7df86d1aad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua @@ -1,4 +1,4 @@ -ArenaManager = {}; +ArenaManager = {}; local this = ArenaManager local ArenaReward = ConfigManager.GetConfig(ConfigName.ArenaReward) local ArenaSetting = ConfigManager.GetConfig(ConfigName.ArenaSetting) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua index f2315173a3..9aad999b93 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ArenaRecordPopup = Inherit(BasePanel) local this = ArenaRecordPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua index 67ae87bd5f..799eb77e75 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua @@ -1,4 +1,4 @@ - + require("Base/BasePanel") local ArenaResultPopup = Inherit(BasePanel) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua index b993f1fab4..3d43b2bf43 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ArenaTypePanel = Inherit(BasePanel) local this = ArenaTypePanel diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua index aacccbc613..67c66d2de3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua @@ -1,4 +1,4 @@ -local ArenaView = {} +local ArenaView = {} local this = ArenaView local rewardBoxBtn = {} local myRank diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/RankView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/RankView.lua index 0f1e31681e..3d78eda280 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/RankView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/RankView.lua @@ -1,4 +1,4 @@ -local RankView = {} +local RankView = {} local this = RankView -- 头像对象管理 diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/RewardView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/RewardView.lua index f7e0bd4265..acccdc47df 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/RewardView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/RewardView.lua @@ -1,4 +1,4 @@ -RewardView = {} +RewardView = {} local goList={} local viewList={} local DAILYREWARD=1 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMMyGuessHistoryPopup.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMMyGuessHistoryPopup.lua index 2ef1a65c2d..6ebd60302b 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMMyGuessHistoryPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMMyGuessHistoryPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ATMMyGuessHistoryPopup = Inherit(BasePanel) local this = ATMMyGuessHistoryPopup local _PlayerHeadList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMTeamRankPopup.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMTeamRankPopup.lua index 6a91d2fd6a..fe7495cdf0 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMTeamRankPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMTeamRankPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ATMTeamRankPopup = Inherit(BasePanel) local this = ATMTeamRankPopup local _PlayerHeadList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua index 179c81426f..21488fc29e 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ArenaTopMatchGuessTipViewPopup = Inherit(BasePanel) local this = ArenaTopMatchGuessTipViewPopup local betBattleInfo = nil diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index f4a7812115..e51defbe33 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -1,4 +1,4 @@ -ArenaTopMatchManager = {}; +ArenaTopMatchManager = {}; local this = ArenaTopMatchManager this.CurTabIndex = 0 this.curIsShowDoGuessPopup = false diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchPanel.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchPanel.lua index b9fbf9deb5..477f6b9aeb 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ArenaTopMatchPanel = Inherit(BasePanel) local this = ArenaTopMatchPanel diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/DoGuessPopup.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/DoGuessPopup.lua index 45f1e0eb3a..27f884c42d 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/DoGuessPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/DoGuessPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local DoGuessPopup = Inherit(BasePanel) local this = DoGuessPopup local GUESS_COIN = ArenaTopMatchManager.GetGuessCoinID() diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/GuessCoinDropPopup.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/GuessCoinDropPopup.lua index 675009bb07..fad7a9f814 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/GuessCoinDropPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/GuessCoinDropPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuessCoinDropPopup = Inherit(BasePanel) local this = GuessCoinDropPopup --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/RecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/RecordPopup.lua index 3bb7eb8bab..3821b4da92 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/RecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/RecordPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RecordPopup = Inherit(BasePanel) local this = RecordPopup local _PlayerHeadList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/TopMatchPlayBattleAinSelectPopup.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/TopMatchPlayBattleAinSelectPopup.lua index a3d443dab7..46910c87fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/TopMatchPlayBattleAinSelectPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/TopMatchPlayBattleAinSelectPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") TopMatchPlayBattleAinSelectPopup = Inherit(BasePanel) local this = TopMatchPlayBattleAinSelectPopup local resultRes = { diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua index 5c4f879b49..c3c79d019c 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua @@ -1,4 +1,4 @@ ---- +--- --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by Steven Hawking. --- DateTime: 9/11/21 17:04 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_EliminationView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_EliminationView.lua index 4c19af7abe..72687e1089 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_EliminationView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_EliminationView.lua @@ -1,4 +1,4 @@ -local ATM_EliminationView={} +local ATM_EliminationView={} local this=ATM_EliminationView -- Tab管理器 local ArenaTopMatchPanel= require("Modules/ArenaTopMatch/ArenaTopMatchPanel") diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessTipView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessTipView.lua index 3a2fc52108..6ea43af8fe 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessTipView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessTipView.lua @@ -1,4 +1,4 @@ ---竞猜提示面板 +--竞猜提示面板 local ATM_GuessTipView = {} local this = ATM_GuessTipView local betBattleInfo = nil diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua index 35276dc5c0..c6ebd727b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua @@ -1,4 +1,4 @@ -local ATM_GuessView={} +local ATM_GuessView={} local this=ATM_GuessView local commonInfo = require("Modules/ArenaTopMatch/View/ATM_CommonInfo") local matchPanel=require("Modules/ArenaTopMatch/ArenaTopMatchPanel") diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua index b0ccb50527..8018e79809 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -1,4 +1,4 @@ -local ATM_MainMatchView={} +local ATM_MainMatchView={} local this=ATM_MainMatchView local commonInfo = require("Modules/ArenaTopMatch/View/ATM_CommonInfo") --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RankView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RankView.lua index 8b7994f45e..296c9b834b 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RankView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RankView.lua @@ -1,4 +1,4 @@ -local ATM_RankView={} +local ATM_RankView={} local this=ATM_RankView --头名 -- local TitleName={ diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RewardView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RewardView.lua index eefb7a4839..1d5e514ef2 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RewardView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RewardView.lua @@ -1,4 +1,4 @@ -local ATM_RewardView = {} +local ATM_RewardView = {} local this = ATM_RewardView ---巅峰战奖励 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_Title.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_Title.lua index a8ee7fcdff..89860273fe 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_Title.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_Title.lua @@ -1,4 +1,4 @@ -local ATM_Title={} +local ATM_Title={} local this = ATM_Title --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index 0a91ca82cf..3f4090d606 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -1,4 +1,4 @@ -BagManager = {} +BagManager = {} local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local equipConfig = ConfigManager.GetConfig(ConfigName.EquipConfig) local equipSign = ConfigManager.GetConfig(ConfigName.EquipSign) diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 4eebf46004..d06a326dcd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") BagPanel = Inherit(BasePanel) local this = BagPanel local sortIndex = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua index c8508ba017..717fcc50ca 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") BagResolveAnCompoundPanel = Inherit(BasePanel) local this=BagResolveAnCompoundPanel --分解 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleAnalysisManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleAnalysisManager.lua index fd4ba077ed..858c315e13 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleAnalysisManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleAnalysisManager.lua @@ -1,4 +1,4 @@ -BattleAnalysisManager = {} +BattleAnalysisManager = {} function BattleAnalysisManager:Init() self.data = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 74b8fa3da8..724132d087 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -1,4 +1,4 @@ -BattleManager = {} +BattleManager = {} local this = BattleManager local PassiveSkillLogicConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillLogicConfig) local SkillLogicConfig = ConfigManager.GetConfig(ConfigName.SkillLogicConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattlePool.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattlePool.lua index 945a7c8788..c76e4ce764 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattlePool.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattlePool.lua @@ -1,4 +1,4 @@ -require("Base/Stack") +require("Base/Stack") BATTLE_POOL_TYPE = { MY_ROLE = 0, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua index 46b56d943d..8478fe4443 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua @@ -1,4 +1,4 @@ -require("Modules.Battle.BattleAnalysisManager") +require("Modules.Battle.BattleAnalysisManager") BattleRecordManager = {} local this = BattleRecordManager diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Config/FightEffectAudioConfig.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Config/FightEffectAudioConfig.lua index 3c16a55d2e..4fed2b7a3f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Config/FightEffectAudioConfig.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Config/FightEffectAudioConfig.lua @@ -1,4 +1,4 @@ -local FightEffectAudioConfig = {} +local FightEffectAudioConfig = {} local this = FightEffectAudioConfig function FightEffectAudioConfig.Init() diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Config/LuaFileConfig.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Config/LuaFileConfig.lua index c768806fb5..e9ac76026e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Config/LuaFileConfig.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Config/LuaFileConfig.lua @@ -1,4 +1,4 @@ - + local Files = { "Modules.Battle.BattlePool", "Modules.Battle.Logic.Misc.BattleDefine", diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Config/PokemonEffectConfig.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Config/PokemonEffectConfig.lua index 67b0c0520f..27bc006f0e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Config/PokemonEffectConfig.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Config/PokemonEffectConfig.lua @@ -1,4 +1,4 @@ -PokemonEffectConfig = { +PokemonEffectConfig = { [1] = { live = "live2d_s_jieling_dlg_3010", scale = 0.6, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/BattleEvent.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/BattleEvent.lua index 30735fd959..96b9e372ff 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/BattleEvent.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/BattleEvent.lua @@ -1,4 +1,4 @@ -BattleEvent={} +BattleEvent={} BattleEvent.__index = BattleEvent local listPool = BattleObjectPool.New(function () diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua index 98358be52f..41fc6c3266 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua @@ -1,4 +1,4 @@ -Buff = {} +Buff = {} local floor = math.floor local buffPoolList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index d75ee39523..b58f7ff010 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -1,4 +1,4 @@ -local floor = math.floor +local floor = math.floor local min = math.min local max = math.max --local RoleDataName = RoleDataName diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/EffectCaster.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/EffectCaster.lua index 5228d326ac..17a70c58c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/EffectCaster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/EffectCaster.lua @@ -1,4 +1,4 @@ -local Effect = require("Modules/Battle/Logic/Base/Effect") +local Effect = require("Modules/Battle/Logic/Base/Effect") EffectCaster = {} local effectPool = BattleObjectPool.New(function () diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 65b60c3445..fcb2953517 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1,4 +1,4 @@ -local floor = math.floor +local floor = math.floor local max = math.max local min = math.min --local RoleDataName = RoleDataName diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Random.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Random.lua index 9d32f100e6..c9d64a3b5f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Random.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Random.lua @@ -1,4 +1,4 @@ -Random = {} +Random = {} local floor = math.floor local seed = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogManager.lua index ab9b38e774..788e12233f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogManager.lua @@ -1,4 +1,4 @@ -BattleLogManager = {} +BattleLogManager = {} local this = BattleLogManager local isEditor = AppConst and AppConst.Platform == "EDITOR" local isMobile = AppConst and (AppConst.Platform == "ANDROID" or AppConst.Platform == "IOS") diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua index ef2e1f797c..dbbe9cdcea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua @@ -1,4 +1,4 @@ -BattleLogic = {} +BattleLogic = {} local floor = math.floor local min = math.min -- local objList = BattleDictionary.New() diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Aura.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Aura.lua index 63c43cbb54..9ae283f9a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Aura.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Aura.lua @@ -1,4 +1,4 @@ -Aura = Buff:New() +Aura = Buff:New() --初始化Buff,通过传入一些自定义参数控制成长相关的数值 function Aura:SetData(...) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Brand.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Brand.lua index 0efa4954d6..4932db0bed 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Brand.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Brand.lua @@ -1,4 +1,4 @@ -Brand = Buff:New() +Brand = Buff:New() --初始化Buff,通过传入一些自定义参数控制成长相关的数值 function Brand:SetData(...) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Control.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Control.lua index 91d4d347d5..e95b8f17f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Control.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Control.lua @@ -1,4 +1,4 @@ -Control = Buff:New() +Control = Buff:New() --初始化Buff,通过传入一些自定义参数控制成长相关的数值 function Control:SetData(...) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Curse.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Curse.lua index 328de235e6..6df09ed262 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Curse.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Curse.lua @@ -1,4 +1,4 @@ -Curse = Buff:New() +Curse = Buff:New() --初始化Buff,通过传入一些自定义参数控制成长相关的数值 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua index 8e89bfd470..a1e36a0b1f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua @@ -1,4 +1,4 @@ -DOT = Buff:New() +DOT = Buff:New() --初始化Buff,通过传入一些自定义参数控制成长相关的数值 function DOT:SetData(...) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Exile.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Exile.lua index fe99750bca..e13a3253f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Exile.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Exile.lua @@ -1,4 +1,4 @@ -Exile = Buff:New() +Exile = Buff:New() --初始化Buff,通过传入一些自定义参数控制成长相关的数值 function Exile:SetData(...) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua index d441181461..dc1358c009 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua @@ -1,4 +1,4 @@ -HOT = Buff:New() +HOT = Buff:New() --初始化Buff,通过传入一些自定义参数控制成长相关的数值 function HOT:SetData(...) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua index fe826bb0ee..f1f3061e07 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua @@ -1,4 +1,4 @@ --- 免疫效果 +-- 免疫效果 Immune = Buff:New() local immune0 = function(buff) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/KylinMark.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/KylinMark.lua index 3bd06e2390..de5a05928e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/KylinMark.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/KylinMark.lua @@ -1,4 +1,4 @@ -KylinMark = Buff:New() +KylinMark = Buff:New() --初始化Buff,通过传入一些自定义参数控制成长相关的数值 function KylinMark:SetData(...) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/NoDead.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/NoDead.lua index 512d04eba2..058d3a16ed 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/NoDead.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/NoDead.lua @@ -1,4 +1,4 @@ -NoDead = Buff:New() +NoDead = Buff:New() --初始化Buff,通过传入一些自定义参数控制成长相关的数值 function NoDead:SetData(...) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/PropertyChange.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/PropertyChange.lua index b99922318f..520ccb9efb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/PropertyChange.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/PropertyChange.lua @@ -1,4 +1,4 @@ -PropertyChange = Buff:New() +PropertyChange = Buff:New() --初始化Buff,通过传入一些自定义参数控制成长相关的数值 function PropertyChange:SetData(...) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua index 876dd30ca7..f9e2b55675 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua @@ -1,4 +1,4 @@ -Shield = Buff:New() +Shield = Buff:New() -- 无敌吸血盾的免疫状态 local immune0 = function(buff) return buff.type == BuffName.Control or buff.isDeBuff or buff.type == BuffName.DOT diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index b42d1fc1c1..7192992ff6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -1,4 +1,4 @@ -local index = 0 +local index = 0 local function indexAdd() index = index + 1 return index diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDictionary.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDictionary.lua index 324b172f63..e7a17f9db8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDictionary.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDictionary.lua @@ -1,4 +1,4 @@ -BattleDictionary = {} +BattleDictionary = {} function BattleDictionary.New() local o = {} setmetatable(o, BattleDictionary) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleList.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleList.lua index 608be66ee8..0e512ea12e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleList.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleList.lua @@ -1,4 +1,4 @@ -BattleList = {} +BattleList = {} function BattleList.New() local o = {} setmetatable(o, BattleList) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleObjectPool.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleObjectPool.lua index a3d0690e6d..8b151091c2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleObjectPool.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleObjectPool.lua @@ -1,4 +1,4 @@ -BattleObjectPool = {} +BattleObjectPool = {} function BattleObjectPool.New(onCreate) local o = {} setmetatable(o, BattleObjectPool) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleQueue.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleQueue.lua index 9b6d8c1e6e..f9f50dfec9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleQueue.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleQueue.lua @@ -1,4 +1,4 @@ -BattleQueue = {} +BattleQueue = {} function BattleQueue.New() local o = {} setmetatable(o, BattleQueue) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 8d1dd35252..24ad17c30d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -1,4 +1,4 @@ -BattleUtil = {} +BattleUtil = {} --local BattleUtil = BattleUtil local floor = math.floor local max = math.max diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/Monster.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/Monster.lua index f21db85a74..d257857a29 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/Monster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/Monster.lua @@ -1,4 +1,4 @@ -require("Modules.Battle.Logic.Monster.MonsterSkill.MSkillManager") +require("Modules.Battle.Logic.Monster.MonsterSkill.MSkillManager") Monster = {} function Monster:New() diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterManager.lua index a41f30502b..34269325be 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterManager.lua @@ -1,4 +1,4 @@ - + require("Modules.Battle.Logic.Monster.Monster") MonsterManager = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua index 93e49c6904..1664b31b34 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua @@ -1,4 +1,4 @@ -MCondition = {} +MCondition = {} local this = MCondition diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkill.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkill.lua index f09ad9c3ec..daaf6af287 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkill.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkill.lua @@ -1,4 +1,4 @@ -MSkill = {} +MSkill = {} function MSkill:New() local o = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkillGroup.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkillGroup.lua index 3bf39fb8f5..fa01a5641d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkillGroup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkillGroup.lua @@ -1,4 +1,4 @@ -MSkillGroup = {} +MSkillGroup = {} function MSkillGroup:New() local o = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkillManager.lua index 3d210ec60b..42deeef8da 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MSkillManager.lua @@ -1,4 +1,4 @@ -require("Modules.Battle.Logic.Monster.MonsterSkill.MTrigger") +require("Modules.Battle.Logic.Monster.MonsterSkill.MTrigger") require("Modules.Battle.Logic.Monster.MonsterSkill.MSkill") require("Modules.Battle.Logic.Monster.MonsterSkill.MSkillGroup") diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua index 6f0f2f02f8..eebb84f5f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua @@ -1,4 +1,4 @@ -require("Modules.Battle.Logic.Monster.MonsterSkill.MCondition") +require("Modules.Battle.Logic.Monster.MonsterSkill.MCondition") MTrigger = {} local this = MTrigger diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/OutDataManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/OutDataManager.lua index be347bb37b..3ae6b3fe84 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/OutDataManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/OutDataManager.lua @@ -1,4 +1,4 @@ ---战斗外数据管理、 +--战斗外数据管理、 OutDataManager = {} local this = OutDataManager diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua index 433839ecc1..0b3514f937 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua @@ -1,4 +1,4 @@ -RoleData = {} +RoleData = {} RoleData.__index = RoleData local max = math.max local floor = math.floor diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index da8947ebdc..5d72c5d52a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -1,4 +1,4 @@ -RoleLogic = {} +RoleLogic = {} RoleLogic.__index = RoleLogic --local RoleLogic = RoleLogic --local RoleDataName = RoleDataName diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua index 901d4fe776..22c19b6194 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua @@ -1,4 +1,4 @@ -RoleManager = {} +RoleManager = {} local this = RoleManager -- 将死之人 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua index b8a4efca4f..641b0233fa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua @@ -1,4 +1,4 @@ -require("Modules/Battle/Logic/Base/EffectCaster") +require("Modules/Battle/Logic/Base/EffectCaster") Skill = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua index eca681d0ac..98c33aefe2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua @@ -1,4 +1,4 @@ -SkillManager = {} +SkillManager = {} local this = SkillManager local skillPool = BattleObjectPool.New(function () diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua index a18ae3f780..3a813585a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Base/Stack") require("Modules.Battle.Config.PokemonEffectConfig") require("Modules.Battle.Test.View.AllSetView") diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/AllSetView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/AllSetView.lua index fd74cc1167..9752e8364d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/AllSetView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/AllSetView.lua @@ -1,4 +1,4 @@ - + -- 全局设置界面 AllSetView = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/MonsterSetView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/MonsterSetView.lua index 99c2d5a818..6645b0dc63 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/MonsterSetView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/MonsterSetView.lua @@ -1,4 +1,4 @@ - + -- 异妖设置界面 MonsterSetView = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/RoleSetView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/RoleSetView.lua index a170136121..ebf591e534 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/RoleSetView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/RoleSetView.lua @@ -1,4 +1,4 @@ - + RoleSetView = {} local MonsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig) -- 初始化角色设置界面 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/SkillSetView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/SkillSetView.lua index b77bfd9395..ce65b3f31a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/SkillSetView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Test/View/SkillSetView.lua @@ -1,4 +1,4 @@ - + -- 全局设置界面 SkillSetView = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua index 176b5a2e59..e332f6fd6b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local BattleBestPopup = Inherit(BasePanel) local this = BattleBestPopup local func2 = nil--此回调目前只有大闹天宫试炼节点用 当有没有事件时 关闭按钮不好使 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua index 5150581e56..f8d8e1aa9a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local BattleBossInfoPanel = Inherit(BasePanel) local func local HeroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua index 36afb56bb3..e7099a913c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") BattleEndPanel = Inherit(BasePanel) local this = BattleEndPanel local BattlePanel diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index def6b745f3..b735292652 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Base/Stack") require("Modules.Battle.Config.PokemonEffectConfig") local BattleView = require("Modules/Battle/View/BattleView") diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleRoleShowView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleRoleShowView.lua index 09457838c2..205acb7f4a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleRoleShowView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleRoleShowView.lua @@ -1,4 +1,4 @@ -local RoleShowView = {} +local RoleShowView = {} local this = RoleShowView -- local liveNodes={}--立绘容器 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleStageTipPopup.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleStageTipPopup.lua index 277b241d01..15c6fd80ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleStageTipPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleStageTipPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local BattleStageTipPopup = Inherit(BasePanel) local this = BattleStageTipPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index ce403c93de..9db0bb2f5c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Modules.Battle.Config.PokemonEffectConfig") local FEAConfig = require("Modules/Battle/Config/FightEffectAudioConfig") -- local RoleShowView = require("Modules/Battle/View/BattleRoleShowView") diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua index a803ad89a7..07b183a2b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua @@ -1,4 +1,4 @@ -require("Modules.Battle.Config.PokemonEffectConfig") +require("Modules.Battle.Config.PokemonEffectConfig") require("Base/BasePanel") local SpiritAnimal = ConfigManager.GetConfig(ConfigName.SpiritAnimal) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattleLogic.lua index 32b3508f74..0a295e1e91 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattleLogic.lua @@ -1,4 +1,4 @@ -local GuideBattleLogic = {} +local GuideBattleLogic = {} -- 引导节点配置 local _GuideConfig = { diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua index 19628798fd..579c7f86c4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Base/Stack") require("Modules.Battle.Config.PokemonEffectConfig") local BattleView = require("Modules/Battle/View/BattleView") diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua index be0e43e5a5..5703606ea7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua @@ -1,4 +1,4 @@ -BattleUnit = {} +BattleUnit = {} function BattleUnit.New(go, role, position, root) local o = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua index 126c35457f..f1a205a62e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua @@ -1,4 +1,4 @@ -BuffCtrl = {} +BuffCtrl = {} local BuffTypeToConfigType = { [BuffName.PropertyChange] = 1, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffView.lua index e43477b9bf..313d01307a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffView.lua @@ -1,4 +1,4 @@ -BuffView ={} +BuffView ={} BuffView.__index = BuffView function BuffView.New(go, buff, icon) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index 32849f5d4a..6bfa7d97e3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -1,4 +1,4 @@ - + local RoleConfig = ConfigManager.GetConfig(ConfigName.RoleConfig) local HeroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) local SkillLogicConfig = ConfigManager.GetConfig(ConfigName.SkillLogicConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/FloatNode.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/FloatNode.lua index e5b71769dc..59f435c123 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/FloatNode.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/FloatNode.lua @@ -1,4 +1,4 @@ -FloatNode = {} +FloatNode = {} local floatingEffect = "FloatingText" local buffFloatingEffect = "BuffFloatingText" diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua index 5ff06a29a9..22ff6c12e4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua @@ -1,4 +1,4 @@ - + local RoleConfig = ConfigManager.GetConfig(ConfigName.RoleConfig) local SpiritAnimal = ConfigManager.GetConfig(ConfigName.SpiritAnimal) local SkillLogicConfig = ConfigManager.GetConfig(ConfigName.SkillLogicConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index 4150eabf57..64c0935e5b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -1,4 +1,4 @@ - + local RoleConfig = ConfigManager.GetConfig(ConfigName.RoleConfig) local HeroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) local SkillLogicConfig = ConfigManager.GetConfig(ConfigName.SkillLogicConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua index ecfbfe419d..9365ebf221 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua @@ -1,4 +1,4 @@ - + local RoleConfig = ConfigManager.GetConfig(ConfigName.RoleConfig) local HeroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) local SkillLogicConfig = ConfigManager.GetConfig(ConfigName.SkillLogicConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua index ed35191c18..ab8f95c2d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua @@ -1,4 +1,4 @@ - + local Bezier = require("Base.Bezier") local SkillLogicConfig = ConfigManager.GetConfig(ConfigName.SkillLogicConfig) local BuffEffectConfig = ConfigManager.GetConfig(ConfigName.BuffEffectConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillEffectNode.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillEffectNode.lua index bef4981e48..8b3b1b6b70 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillEffectNode.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillEffectNode.lua @@ -1,4 +1,4 @@ -SkillEfectNode = {} +SkillEfectNode = {} function SkillEfectNode.New() local o = {} diff --git a/Assets/ManagedResources/~Lua/Modules/BindPhone/BindPhoneNumberManager.lua b/Assets/ManagedResources/~Lua/Modules/BindPhone/BindPhoneNumberManager.lua index 3f8f987754..691aaec793 100644 --- a/Assets/ManagedResources/~Lua/Modules/BindPhone/BindPhoneNumberManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/BindPhone/BindPhoneNumberManager.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName BindPhoneNumberManager * @Description 手机绑定管理 * @Date 2019/9/2 9:39 diff --git a/Assets/ManagedResources/~Lua/Modules/BindPhone/ConfirmBindPanel.lua b/Assets/ManagedResources/~Lua/Modules/BindPhone/ConfirmBindPanel.lua index 9e4f8f549c..ffe55428ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/BindPhone/ConfirmBindPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/BindPhone/ConfirmBindPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName ConfirmBindPanel * @Description 确定关联手机 * @Date 2019/8/30 16:17 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua index a736de2259..db337a0a57 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua @@ -1,4 +1,4 @@ --- 管理副本的一些通用数据 +-- 管理副本的一些通用数据 -- 副本ID就是地图Id CarbonManager = {}; local this = CarbonManager diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonMopUpEndPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonMopUpEndPanel.lua index 03ac354849..8a296dff28 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonMopUpEndPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonMopUpEndPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CarbonMopUpEndPanel = Inherit(BasePanel) local this=CarbonMopUpEndPanel local challengeConfig = ConfigManager.GetConfig(ConfigName.ChallengeConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua index af2ac5b513..7869c45b16 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CarbonScoreSortPanel = Inherit(BasePanel) local this=CarbonScoreSortPanel local mapRankInfo={} diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanel.lua index 15155ce7be..b0831841c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CarbonTypePanel = Inherit(BasePanel) local this = CarbonTypePanel local hasFresh = false diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index a24f6cf4aa..bd899bc480 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CarbonTypePanelV2 = Inherit(BasePanel) local this = CarbonTypePanelV2 local hasFresh = false diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV3.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV3.lua index 42bc812eb5..29a46370ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV3.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV3.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CarbonTypePanelV3 = Inherit(BasePanel) local this = CarbonTypePanelV3 local hasFresh = false diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index 2af10b6962..dc535d8d67 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -1,4 +1,4 @@ ------ 日常副本 ----- +----- 日常副本 ----- require("Base/BasePanel") DailyCarbonPanel = Inherit(BasePanel) local this = DailyCarbonPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EliteCarbonAchievePanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EliteCarbonAchievePanel.lua index bb405f9428..ad6e2b8f91 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EliteCarbonAchievePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EliteCarbonAchievePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local EliteCarbonAchievePanel = Inherit(BasePanel) local this = EliteCarbonAchievePanel diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EliteCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EliteCarbonPanel.lua index e1a2529ddd..5cfffb203f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EliteCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EliteCarbonPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") EliteCarbonPanel = Inherit(BasePanel) local this = EliteCarbonPanel local challengeConfig = ConfigManager.GetConfig(ConfigName.ChallengeConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua index 9603324b42..fb4ba9fced 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") EndLessCarbonPanel = Inherit(BasePanel) local this = EndLessCarbonPanel local endLessConfig = ConfigManager.GetConfig(ConfigName.EndlessMapConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/MapLeavePanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/MapLeavePanel.lua index 793401b1e6..17effe6464 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/MapLeavePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/MapLeavePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MapLeavePanel = Inherit(BasePanel) local this = MapLeavePanel local challengeConfig = ConfigManager.GetConfig(ConfigName.ChallengeConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/MapStatsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/MapStatsPanel.lua index 26ca26a580..160b1e1ab7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/MapStatsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/MapStatsPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MapStatsPanel = Inherit(BasePanel) local this = MapStatsPanel local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua index bbab92706a..7db44d64b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MinMapPopup = Inherit(BasePanel) local this = MinMapPopup local mapConfig = ConfigManager.GetConfig(ConfigName.ChallengeMapConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/PlotCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/PlotCarbonPanel.lua index 6052cf236a..3042bce935 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/PlotCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/PlotCarbonPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PlotCarbonPanel = Inherit(BasePanel) local this = PlotCarbonPanel local challengeMapConfig = ConfigManager.GetConfig(ConfigName.ChallengeMapConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/PlotRewardPreviewPupop.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/PlotRewardPreviewPupop.lua index cbdeee00f1..2e645163b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/PlotRewardPreviewPupop.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/PlotRewardPreviewPupop.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PlotRewardPreviewPupop = Inherit(BasePanel) local this = PlotRewardPreviewPupop --local starConfig = ConfigManager.GetConfig(ConfigName.ChallengeStarBox) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/TrialCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/TrialCarbonPanel.lua index 0b9c60c571..131f27772e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/TrialCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/TrialCarbonPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") TrialCarbonPanel = Inherit(BasePanel) local this = TrialCarbonPanel local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/TrialResetPopup.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/TrialResetPopup.lua index 3559bb43be..48ef67ac62 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/TrialResetPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/TrialResetPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local TrialResetPopup = Inherit(BasePanel) local this = TrialResetPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua index 09e9b4cbae..b7789e45fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua @@ -1,4 +1,4 @@ -XuanYuanMirrorManager = {}; +XuanYuanMirrorManager = {}; local raceTowerConfig local raceTowerRewardConfig local this = XuanYuanMirrorManager diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua index 1142757dbd..113df7e2e4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") XuanYuanMirrorPanel = Inherit(BasePanel) local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig) local this = XuanYuanMirrorPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua index 304242066a..cbe1c5bdd2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") XuanYuanMirrorPanelList = Inherit(BasePanel) local raceTowerConfig = ConfigManager.GetConfig(ConfigName.RaceTowerConfig) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua index 776ca41f7c..b91d52c3a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua @@ -1,4 +1,4 @@ ------ 公会十绝阵排行弹窗 ----- +----- 公会十绝阵排行弹窗 ----- require("Base/BasePanel") local XuanYuanMirrorRankPopup = Inherit(BasePanel) local this = XuanYuanMirrorRankPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRewardSortPopup.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRewardSortPopup.lua index b65617ca40..31e077fed4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRewardSortPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRewardSortPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") XuanYuanMirrorRewardSortPopup = Inherit(BasePanel) local this = XuanYuanMirrorRewardSortPopup local rewardList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua index f54b12ea2e..f72e5967fd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua @@ -1,4 +1,4 @@ -local _isDebug = false +local _isDebug = false local specialConfig=ConfigManager.GetConfig(ConfigName.SpecialConfig) local function __DebugLog(str) if _isDebug then diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index 535b6a9148..eb5de8d90c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ChatPanel = Inherit(BasePanel) local this = ChatPanel local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatManager.lua index cb9f20bb72..765a2c4503 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatManager.lua @@ -1,4 +1,4 @@ -local ChatMaxSaveNum = 100 -- 每个好友本地数据最大保存聊天数量 +local ChatMaxSaveNum = 100 -- 每个好友本地数据最大保存聊天数量 FriendChatManager = {} local this = FriendChatManager diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua index 3d65bb66b6..f1fd9f4cd2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local FriendChatPanel = Inherit(BasePanel) local this = FriendChatPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/HorseRaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/HorseRaceManager.lua index 95744fc0ff..09f1f60c9e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/HorseRaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/HorseRaceManager.lua @@ -1,4 +1,4 @@ -HorseRaceManager = {} +HorseRaceManager = {} local this = HorseRaceManager local _GMRaceDeltaTime = 5 diff --git a/Assets/ManagedResources/~Lua/Modules/Common/CountDownTimer.lua b/Assets/ManagedResources/~Lua/Modules/Common/CountDownTimer.lua index e47983e9b4..7d29cba18b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/CountDownTimer.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/CountDownTimer.lua @@ -1,4 +1,4 @@ ---- +--- --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by Administrator. --- DateTime: 2019/5/16 11:21 diff --git a/Assets/ManagedResources/~Lua/Modules/Common/LimitScrollView/LimitNodeController.lua b/Assets/ManagedResources/~Lua/Modules/Common/LimitScrollView/LimitNodeController.lua index f3c88f8e8a..4913590e40 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/LimitScrollView/LimitNodeController.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/LimitScrollView/LimitNodeController.lua @@ -1,4 +1,4 @@ --- 管理器的对象池 +-- 管理器的对象池 local _ControllerPool = {} -- 管理器类 diff --git a/Assets/ManagedResources/~Lua/Modules/Common/LimitScrollView/LimitScrollView.lua b/Assets/ManagedResources/~Lua/Modules/Common/LimitScrollView/LimitScrollView.lua index f25bcbe52f..2892ca944c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/LimitScrollView/LimitScrollView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/LimitScrollView/LimitScrollView.lua @@ -1,4 +1,4 @@ -local LimitScrollView = {} +local LimitScrollView = {} function LimitScrollView.New() local o = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua index ffcece1a78..da61e28077 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua @@ -1,4 +1,4 @@ -MoneyUtil = {} +MoneyUtil = {} local this = MoneyUtil diff --git a/Assets/ManagedResources/~Lua/Modules/Common/Pool/CommonPool.lua b/Assets/ManagedResources/~Lua/Modules/Common/Pool/CommonPool.lua index de1368f190..3ea8f27308 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/Pool/CommonPool.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/Pool/CommonPool.lua @@ -1,4 +1,4 @@ ---- +--- --- 对象池使用方法 --- 1、注册对象枚举 POOL_ITEM_TYPE --- 2、创建对象预制体,创建对象类并继承PoolItemBase类,参照 PlayerHead diff --git a/Assets/ManagedResources/~Lua/Modules/Common/Pool/Item/PlayerHead.lua b/Assets/ManagedResources/~Lua/Modules/Common/Pool/Item/PlayerHead.lua index 1c45dae630..fe3f85a4eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/Pool/Item/PlayerHead.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/Pool/Item/PlayerHead.lua @@ -1,4 +1,4 @@ -local PoolItemBase = require("Modules/Common/Pool/PoolItemBase") +local PoolItemBase = require("Modules/Common/Pool/PoolItemBase") local PlayerHead = quick_class("PlayerHead", PoolItemBase) -- 对象创建时回调(只会调用一次) diff --git a/Assets/ManagedResources/~Lua/Modules/Common/Pool/PoolItemBase.lua b/Assets/ManagedResources/~Lua/Modules/Common/Pool/PoolItemBase.lua index 73a9730921..a29fddbbfa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/Pool/PoolItemBase.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/Pool/PoolItemBase.lua @@ -1,4 +1,4 @@ - + -- 对象池物体的父类 local PoolItemBase = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Common/TabBox.lua b/Assets/ManagedResources/~Lua/Modules/Common/TabBox.lua index e8bac175e8..b1c4634599 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/TabBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/TabBox.lua @@ -1,4 +1,4 @@ ---- +--- ---tab管理器 ---1、构建自己的tabbox节点,注意tabbox节点的根节点下必须包含两个命名为 tab 和 box 的两个节点 --- tab: 是一个按钮,所有tab节点从此节点clone,保存时请将此节点置为不可见,请自定义按钮的样式,我们将提供自定义按钮样式的接口 diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/CompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Compound/CompoundPanel.lua index d05e58e172..b88359e3b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/CompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/CompoundPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CompoundPanel = Inherit(BasePanel) local this = CompoundPanel local TabBox = require("Modules/Common/TabBox") diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua b/Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua index 5f7b4db696..c0d514af02 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CompoundSelectListPopup = Inherit(BasePanel) local this = CompoundSelectListPopup local curSelectSoulPrint = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua index 242925c316..90a163b31e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua @@ -1,4 +1,4 @@ ------ 装备合成 ----- +----- 装备合成 ----- local this = {} local sortingOrder=0 local equipStarsConfig = ConfigManager.GetConfig(ConfigName.EquipStarsConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua index ba08c250ce..e899c93236 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua @@ -1,4 +1,4 @@ ------ 魂印合成 ----- +----- 魂印合成 ----- local this = {} local soulPrintDatas = {}--所有可合成数据 local materidaIsCan = false--合成是材料是否满足 diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Talisman.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Talisman.lua index 1c42837131..658a0db3b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Talisman.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Talisman.lua @@ -1,4 +1,4 @@ ------ 宝器合成 ----- +----- 宝器合成 ----- local this = {} local sortingOrder=0 diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua index 5d8a2571aa..018cfd1110 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua @@ -1,4 +1,4 @@ ------ 寶物合成 ----- +----- 寶物合成 ----- local this = {} local sortingOrder=0 local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua index de6c457cc9..5f978dfdee 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CompoundHeroFirstUpStarListPanel = Inherit(BasePanel) local this = CompoundHeroFirstUpStarListPanel local curSelectHeroList={} diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua index b3d0a6365b..71944ddc36 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CompoundHeroPanel = Inherit(BasePanel) local this = CompoundHeroPanel local TabBox = require("Modules/Common/TabBox") diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua index 6c1f3600aa..91e05cc0d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CompoundHeroUpStarListPanel = Inherit(BasePanel) local this = CompoundHeroUpStarListPanel local curSelectHeroList={} diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua index 834a1940a0..82335511d8 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua @@ -1,4 +1,4 @@ ------ 神将合成 ----- +----- 神将合成 ----- local this = {} local sortingOrder=0 local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua index 993af63811..81b356fda3 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua @@ -1,4 +1,4 @@ ------ 神将置换 ----- +----- 神将置换 ----- local this = {} local sortingOrder=0 local tabs={} diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua index 862a39be84..f4622e8620 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @Classname DailyRechargeManager * @Description 每日首充 * @Date 2019/8/2 13:51 diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index 9841906c12..3e35b71702 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName DailyRechargePanel * @Description 每日首充 * @Date 2019/8/1 19:28 diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/BuglyManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/BuglyManager.lua index ebd8c84305..4fb3cc3fda 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/BuglyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/BuglyManager.lua @@ -1,4 +1,4 @@ -BuglyManager = {} +BuglyManager = {} local this = BuglyManager function this.Initialize() if AppConst.isSDK then diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua index dc192cd19e..d693f361f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua @@ -1,4 +1,4 @@ -CustomEventManager = {} +CustomEventManager = {} local this = CustomEventManager local customEventConfig = ConfigManager.GetConfig(ConfigName.CustomEventConfig) function this.SetisFirstLogVal(isDayFirst) diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/DataCenterManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/DataCenterManager.lua index 6dddba86ae..31492d7ae3 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/DataCenterManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/DataCenterManager.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName DataCenterManager * @Description 数据中心管理 * @Date 2019/7/3 10:48 diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/TapDBManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/TapDBManager.lua index 726e9b8439..12d7cae043 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/TapDBManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/TapDBManager.lua @@ -1,4 +1,4 @@ -TapDBManager = {} +TapDBManager = {} local this = TapDBManager function this.Initialize() if AppConst.isSDK then diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua index a80ad82a9c..c0d82f7ef6 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua @@ -1,4 +1,4 @@ -ThinkingAnalyticsManager = {} +ThinkingAnalyticsManager = {} local this = ThinkingAnalyticsManager TA_EVENT = { diff --git a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua index 31464f9d63..dd3efdab06 100644 --- a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local DemonSlayerPanel = Inherit(BasePanel) local this = DemonSlayerPanel local sortingOrder = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua index 1a9ff23f7c..b06e25af32 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ 异妖解印界面 --]] require("Base/BasePanel") diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonInfoPanel.lua index eb022ebfd5..abacaed1f1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonInfoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") DemonInfoPanel = Inherit(BasePanel) local this = DemonInfoPanel local demonDataConfig = ConfigManager.GetConfig(ConfigName.DifferDemonsConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsActiveSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsActiveSuccessPanel.lua index a3da654ac4..8c4be2a652 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsActiveSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsActiveSuccessPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName DemonPartsActiveSuccessPanel * @Description 异妖部件激活成功界面 * @Date 2019/5/13 14:58 diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsUpStarPanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsUpStarPanel.lua index ead3682717..3bba55a647 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsUpStarPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsUpStarPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") DemonPartsUpStarPanel = Inherit(BasePanel) local this = DemonPartsUpStarPanel local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsUpStarSuccessPanel.lua index 11716cd982..450745df81 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsUpStarSuccessPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName DemonPartsUpStarSuccessPanel * @Description 配件进阶成功界面 * @Date 2019/9/5 20:11 diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua index ad6fc1701e..ee62e0f445 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName DemonUpGradePanel * @Description 异妖进阶材料界面 * @Date 2019/5/14 16:09 diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterAttributeAdditionPanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterAttributeAdditionPanel.lua index bf58246e7b..6f99bfe00c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterAttributeAdditionPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterAttributeAdditionPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName DiffMonsterAttributeAdditionPanel * @Description 异妖属性总加成 * @Date 2019/5/14 17:22 diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterManager.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterManager.lua index f141fb6c75..4cecc3f4b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterManager.lua @@ -1,4 +1,4 @@ -DiffMonsterManager = {} +DiffMonsterManager = {} local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) local pokemonComonpentsConfig = ConfigManager.GetConfig(ConfigName.DifferDemonsComonpentsConfig) local pokemonStageConfig = ConfigManager.GetConfig(ConfigName.DifferDemonsStageConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterPanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterPanel.lua index c0681f0177..5ec18cb266 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") DiffMonsterPanel = Inherit(BasePanel) local this = DiffMonsterPanel diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterPreviewPanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterPreviewPanel.lua index cd3bde8fa4..a7a2a042a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterPreviewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterPreviewPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName DiffMonsterPreviewPanel * @Description 异妖预览查看 * @Date 2019/5/11 14:50 diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterPreviewSecretBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterPreviewSecretBoxPanel.lua index b84a05a443..e605186666 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterPreviewSecretBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterPreviewSecretBoxPanel.lua @@ -1,4 +1,4 @@ ----秘盒招募异妖预览 +---秘盒招募异妖预览 require("Base/BasePanel") DiffMonsterPreviewSecretBoxPanel = Inherit(BasePanel) local this=DiffMonsterPreviewSecretBoxPanel diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterUpGradSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterUpGradSuccessPanel.lua index 53a93d116d..9af6de531b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterUpGradSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterUpGradSuccessPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName DiffMonsterUpGradSuccessPanel * @Description 异妖升阶成功界面 * @Date 2019/5/16 10:30 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua index 8866dd9f38..7f0214667f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua @@ -1,4 +1,4 @@ -local ActivityDetail= quick_class("ActivityDetail") +local ActivityDetail= quick_class("ActivityDetail") local sortingOrder = 0 local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local listUpPre={} --限时召唤 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index cfeeda7254..297c7e6ab7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ActivityMainPanel = Inherit(BasePanel) local this = ActivityMainPanel -- Tab管理器 @@ -32,10 +32,12 @@ function ActivityMainPanel:BindEvent() Util.AddClick(this.btnBack, function() DynamicActivityManager.RemoveUIList() if #DynamicActivityManager.OpenUIList > 0 then + LogRed("jump ") JumpManager.GoJump(DynamicActivityManager.OpenUIList[#DynamicActivityManager.OpenUIList],function() DynamicActivityManager.RemoveUIList() end) else + LogRed("close ") this:ClosePanel() end end) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index fda48d5c99..d96acb9e0f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -1,4 +1,4 @@ -DynamicActivityManager = {} +DynamicActivityManager = {} local this = DynamicActivityManager local SpiritAnimalSummonConfig = ConfigManager.GetConfig(ConfigName.SpiritAnimalSummon) local shopItemConfig = ConfigManager.GetConfig(ConfigName.StoreConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index bc04024bf1..8875783a3d 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local DynamicActivityPanel = Inherit(BasePanel) local this = DynamicActivityPanel -- Tab管理器 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index d233eb4b5d..836470bec0 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -1,4 +1,4 @@ -local DynamicTaskPage = quick_class("DynamicTaskPage") +local DynamicTaskPage = quick_class("DynamicTaskPage") local allData={} local itemsGrid = {}--item重复利用 local singleTaskPre = {} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua index bf74c16d19..6400dc959f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua @@ -1,4 +1,4 @@ -local LeiJiChongZhiPage = quick_class("LeiJiChongZhiPage") +local LeiJiChongZhiPage = quick_class("LeiJiChongZhiPage") local allData={} local itemsGrid = {}--item重复利用 local moneyGrid = {}--moneyview重复利用 @@ -185,6 +185,9 @@ function this.SingleDataShow(pre,value) lingquButton:GetComponent("Button").enabled = (state ~= 1) Util.SetGray(lingquButton,state == 1) + --强制刷新大小 + ForceRebuildLayout(Util.GetGameObject(pre, "context").transform) + Util.AddOnceClick(lingquButton, function() if state == 2 then local curActivityId = ActivityGiftManager.GetActivityIdByType(curtype) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index 6c860f7bf0..eef67a23ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -1,4 +1,4 @@ -local LingShouBaoGe= quick_class("LingShouBaoGe") +local LingShouBaoGe= quick_class("LingShouBaoGe") local this = LingShouBaoGe local ActivityDetail = require("Modules/DynamicActivity/ActivityDetail")--活动详情 local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua index 5a8ec3c683..4cc9092dae 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") LingShouBaoGeOneResultPanel = Inherit(BasePanel) local this=LingShouBaoGeOneResultPanel local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua index d5ef4b95aa..96285edcb1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Base/Stack") LingShouBaoGeTenResultPanel = Inherit(BasePanel) local this=LingShouBaoGeTenResultPanel diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua index a5c5df0c72..b34901809b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua @@ -1,4 +1,4 @@ -local LingShowTeHui = quick_class("LingShowTeHui") +local LingShowTeHui = quick_class("LingShowTeHui") local allData={} local itemsGrid = {}--item重复利用 local this=LingShowTeHui diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index 46f1da7476..396c869a3e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -1,4 +1,4 @@ -local QianKunBox = quick_class("QianKunBox") +local QianKunBox = quick_class("QianKunBox") local ActivityDetail = require("Modules/DynamicActivity/ActivityDetail")--活动详情 local parent local iconsData = nil diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua index f05c9604fb..9a972aac91 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") QianKunBoxBuyOnePanel = Inherit(BasePanel) local this=QianKunBoxBuyOnePanel local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua index 8fc2249e55..55d7c79125 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Base/Stack") QianKunBoxBuyTenPanel = Inherit(BasePanel) local this=QianKunBoxBuyTenPanel diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/RewardPreview.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/RewardPreview.lua index 5d6edb3c71..8225831b5e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/RewardPreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/RewardPreview.lua @@ -1,4 +1,4 @@ -local RewardPreview = quick_class("RewardPreview") +local RewardPreview = quick_class("RewardPreview") local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting) local data = {} local listPre = {} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua index 85f66486ce..7cb5827de0 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua @@ -1,4 +1,4 @@ -local SheJiDaDian = quick_class("SheJiDaDian") +local SheJiDaDian = quick_class("SheJiDaDian") local this = SheJiDaDian local orginLayer = 0 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengXingYouLi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengXingYouLi.lua index a92906837e..9111701e38 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengXingYouLi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengXingYouLi.lua @@ -1,4 +1,4 @@ -local ShengXingYouLi = quick_class("ShengXingYouLi") +local ShengXingYouLi = quick_class("ShengXingYouLi") local actData={} local itemsGrid = {}--item重复利用 local this=ShengXingYouLi diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua index f97d636f6e..5fc3f9fa84 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua @@ -1,4 +1,4 @@ -local ShengYiTianJiang = quick_class("ShengYiTianJiang") +local ShengYiTianJiang = quick_class("ShengYiTianJiang") local allData={} local itemsGrid = {}--item重复利用 local this=ShengYiTianJiang diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index e7a8645e9f..a74576725b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -1,4 +1,4 @@ -local TimeLimitedCall= quick_class("TimeLimitedCall") +local TimeLimitedCall= quick_class("TimeLimitedCall") local ActivityDetail = require("Modules/DynamicActivity/ActivityDetail")--活动详情 local RewardPreview = require("Modules/DynamicActivity/RewardPreview")--奖励预览 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua index 640f2300d2..3bf4cb2221 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua @@ -1,4 +1,4 @@ -local XianShiShangShi = quick_class("XianShiShangShi") +local XianShiShangShi = quick_class("XianShiShangShi") local allData={} local itemsGrid = {}--item重复利用 local this=XianShiShangShi diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua index 462e5c7966..4eeaf1ce36 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua @@ -1,4 +1,4 @@ -local XiangYaoDuoBao= quick_class("XiangYaoDuoBao") +local XiangYaoDuoBao= quick_class("XiangYaoDuoBao") local this = XiangYaoDuoBao local ActivityDetail = require("Modules/DynamicActivity/ActivityDetail")--活动详情 local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua index e54ddeac50..a173ca00b5 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua @@ -1,4 +1,4 @@ -local XinJiangLaiXi = quick_class("XinJiangLaiXi") +local XinJiangLaiXi = quick_class("XinJiangLaiXi") local this=XinJiangLaiXi local allData={} local itemsGrid = {}--item重复利用 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua index 190c1d5d4e..b146ebc742 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua @@ -1,4 +1,4 @@ -local YiJingBaoKu = quick_class("YiJingBaoKu") +local YiJingBaoKu = quick_class("YiJingBaoKu") local this = YiJingBaoKu local _itemsList = {} local _itemsPosList={} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua index 39705356dc..3c32c88986 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua @@ -1,4 +1,4 @@ -local ZhenQiYiBaoPage = quick_class("ZhenQiYiBaoPage") +local ZhenQiYiBaoPage = quick_class("ZhenQiYiBaoPage") local allData={} local itemsGrid = {}--item重复利用 local this=ZhenQiYiBaoPage diff --git a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua index 4a2ea8eb22..aa6a0f121b 100644 --- a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local EightDayGiftPanel = Inherit(BasePanel) local this = EightDayGiftPanel diff --git a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayRewardItem.lua b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayRewardItem.lua index 83178cba98..ce2b7f1657 100644 --- a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayRewardItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayRewardItem.lua @@ -1,4 +1,4 @@ ----@class EightDayRewardItem +---@class EightDayRewardItem local EightDayRewardItem = quick_class("EightDayRewardItem") local itemDayList={Language[10001],Language[10002],Language[10003],Language[10004],Language[10005],Language[10006],Language[10007],Language[10008]} local Gift = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",ActivityTypeDef.EightDayGift) diff --git a/Assets/ManagedResources/~Lua/Modules/EliteMonster/EliteMonsterManager.lua b/Assets/ManagedResources/~Lua/Modules/EliteMonster/EliteMonsterManager.lua index 4932dd1282..b3f22eea71 100644 --- a/Assets/ManagedResources/~Lua/Modules/EliteMonster/EliteMonsterManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/EliteMonster/EliteMonsterManager.lua @@ -1,4 +1,4 @@ -EliteMonsterManager = {} +EliteMonsterManager = {} local this = EliteMonsterManager function this.Initialize() diff --git a/Assets/ManagedResources/~Lua/Modules/EliteMonster/EliteMonsterPanel.lua b/Assets/ManagedResources/~Lua/Modules/EliteMonster/EliteMonsterPanel.lua index 2a0eb6bfb2..dc5d7ced76 100644 --- a/Assets/ManagedResources/~Lua/Modules/EliteMonster/EliteMonsterPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/EliteMonster/EliteMonsterPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local EliteMonsterPanel = Inherit(BasePanel) local this = EliteMonsterPanel local monsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup) diff --git a/Assets/ManagedResources/~Lua/Modules/EliteMonster/MonsterShowPanel.lua b/Assets/ManagedResources/~Lua/Modules/EliteMonster/MonsterShowPanel.lua index ef389e7d45..148e7e75a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/EliteMonster/MonsterShowPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/EliteMonster/MonsterShowPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local MonsterShowPanel = Inherit(BasePanel) local this = MonsterShowPanel local monsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup) diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua index b227b7699a..bf54bd6eb2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua @@ -1,4 +1,4 @@ -EquipManager = {} +EquipManager = {} local this = EquipManager local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local equipConfig = ConfigManager.GetConfig(ConfigName.EquipConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/TalismanManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/TalismanManager.lua index 789ae99b7c..407be348b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/TalismanManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/TalismanManager.lua @@ -1,4 +1,4 @@ -TalismanManager = {}; +TalismanManager = {}; local this = TalismanManager local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHalidomPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHalidomPanel.lua index 2d2c4b1016..8e5920754d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHalidomPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHalidomPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ExpeditionHalidomPanel = Inherit(BasePanel) local _HalidomQualityConfig = { [3] = {bg = "l_lieyaozhilu_chuanshuo_zh", selectImg = "l_lieyaozhilu_chuanshuo1"}, diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua index 1e3cc07302..c264fa3e7c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ExpeditionHeroListInfoPopup = Inherit(BasePanel) local this = ExpeditionHeroListInfoPopup local sortType = 1 -- 1:品阶 2:等级 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua index 2551c877c2..886fe39975 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ExpeditionHeroListResurgencePopup = Inherit(BasePanel) local this = ExpeditionHeroListResurgencePopup local cueSelectHeroDid = "" diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua index 0e995a9762..d1ad7ef8ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel")--(24暂时关闭)prefab中的天宫秘宝入口被关闭,记得开启,按钮底下还有个底儿 +require("Base/BasePanel")--(24暂时关闭)prefab中的天宫秘宝入口被关闭,记得开启,按钮底下还有个底儿 ExpeditionMainPanel = Inherit(BasePanel) local this = ExpeditionMainPanel local nodeGrid = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 155062f4d0..4156b48584 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -1,4 +1,4 @@ -ExpeditionManager = {}; +ExpeditionManager = {}; local equipStarsConfig = ConfigManager.GetConfig(ConfigName.EquipStarsConfig) local this = ExpeditionManager this.nodeInfo = {}--所有节点信息 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua index eb301ebe20..4a393cc613 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ExpeditionMonsterInfoPopup = Inherit(BasePanel) local this = ExpeditionMonsterInfoPopup --子模块脚本 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionPreView.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionPreView.lua index 21b538240d..8c002aec68 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionPreView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionPreView.lua @@ -1,4 +1,4 @@ -ExpeditionPreView = {} +ExpeditionPreView = {} function ExpeditionPreView:New(gameObject) local b = {} b.gameObject = gameObject diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionSelectHalidomPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionSelectHalidomPanel.lua index fb8f629e63..3020c7c4f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionSelectHalidomPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionSelectHalidomPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ExpeditionSelectHalidomPanel = Inherit(BasePanel) local fun local curSelectHalidom diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Greed.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Greed.lua index deb564e5d7..5fdcc96965 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Greed.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Greed.lua @@ -1,4 +1,4 @@ ------ 远征贪婪节点弹窗 ----- +----- 远征贪婪节点弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua index b1964613fe..b2e29bafa2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua @@ -1,4 +1,4 @@ ------ 远征怪节点弹窗 ----- +----- 远征怪节点弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua index 69d96d92c9..336265b075 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua @@ -1,4 +1,4 @@ ------ 远征招募节点弹窗 ----- +----- 远征招募节点弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua index 51ad6f5ff2..ed1b8c2b0b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua @@ -1,4 +1,4 @@ ------ 远征商店节点弹窗 ----- +----- 远征商店节点弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Trail.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Trail.lua index bc0547d78d..886dd1cc2a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Trail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Trail.lua @@ -1,4 +1,4 @@ ------ 远征试炼节点弹窗 ----- +----- 远征试炼节点弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua b/Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua index 04da133c4a..ffd8c83aa8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua @@ -1,4 +1,4 @@ -local DiffMonsterBuy = quick_class("DiffMonsterBuy") +local DiffMonsterBuy = quick_class("DiffMonsterBuy") local this = DiffMonsterBuy local diffMonsterBuyData = {}--异妖直购数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/DynamicActivityExChange.lua b/Assets/ManagedResources/~Lua/Modules/Expert/DynamicActivityExChange.lua index 33ae438b9f..4fab08e764 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/DynamicActivityExChange.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/DynamicActivityExChange.lua @@ -1,4 +1,4 @@ -local ExChange = quick_class("ExChange") +local ExChange = quick_class("ExChange") local this = ExChange local exChangeInfoGrid = {}--限时兑换内容 diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua index 060d4a5049..70e8b510de 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua @@ -1,4 +1,4 @@ -local ExChange = quick_class("ExChange") +local ExChange = quick_class("ExChange") local this = ExChange local exChangeInfoGrid = {}--限时兑换内容 diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua b/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua index 4d3996931b..c32e25ef30 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua @@ -1,4 +1,4 @@ -local Expert = quick_class("Expert") +local Expert = quick_class("Expert") local this = Expert local expertRewardGrid = {}--七种达人 + 周卡 限时兑换 local expertRewardItemsGrid = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua index 90c85b40ef..0625353751 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ExpertPanel = Inherit(BasePanel) local this = ExpertPanel local activeIndext = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua index 53a9105ede..c97315a391 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ExpertRewardSortPanel = Inherit(BasePanel) local this = ExpertRewardSortPanel local activeId = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua b/Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua index a1973a72a8..a721f25e12 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/Expert_UpLv.lua @@ -1,4 +1,4 @@ -local Expert_UpLv = quick_class("Expert_UpLv") +local Expert_UpLv = quick_class("Expert_UpLv") local this = Expert_UpLv local itemList = {}--优化itemView使用 local activityRewardConfig diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua b/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua index bfe32d5068..8aa65a9593 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua @@ -1,4 +1,4 @@ -local GiftBuy = quick_class("GiftBuy") +local GiftBuy = quick_class("GiftBuy") local this = GiftBuy local itemsGrid = {}--item重复利用 local allData = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/HeroStarFeedPage.lua b/Assets/ManagedResources/~Lua/Modules/Expert/HeroStarFeedPage.lua index 5dbfb4b1fd..1694661418 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/HeroStarFeedPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/HeroStarFeedPage.lua @@ -1,4 +1,4 @@ ---- 不知道多少星级的听说是可以让英雄成长的感觉应该不怎么好玩的礼包购买页面 +--- 不知道多少星级的听说是可以让英雄成长的感觉应该不怎么好玩的礼包购买页面 HeroStarFeedPage = {} local this = HeroStarFeedPage diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFace.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFace.lua index 9142de9721..67a616505f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFace.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFace.lua @@ -1,4 +1,4 @@ -local PatFace = quick_class("PatFace") +local PatFace = quick_class("PatFace") local this = PatFace function PatFace:ctor(mainPanel, gameObject) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceDiffMonsterInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceDiffMonsterInfoPanel.lua index ef3af401e1..09d4c0110e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceDiffMonsterInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceDiffMonsterInfoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PatFaceDiffMonsterInfoPanel = Inherit(BasePanel) local pokemonId = 0 --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceFindFairy.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceFindFairy.lua index d1ddb0ea6c..544894ade7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceFindFairy.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceFindFairy.lua @@ -1,4 +1,4 @@ -local patFaceFindFairy = quick_class("patFaceFindFairy") +local patFaceFindFairy = quick_class("patFaceFindFairy") local this = patFaceFindFairy local patFaceSingleData local heroData diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index f7568b83d0..4093f8a89c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -1,4 +1,4 @@ -PatFaceManager = {}; +PatFaceManager = {}; local this = PatFaceManager this.isFirstLog = 0--0当天第一次登陆 this.isLogin = false diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index 60d70ac9b7..3bd07714d1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PatFacePanel = Inherit(BasePanel) local patFaceSingleData = {} local callBackEvent = nil diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua b/Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua index 2ec37da46e..e98404b02d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua @@ -1,4 +1,4 @@ -local WeekCard = quick_class("WeekCard") +local WeekCard = quick_class("WeekCard") local this = WeekCard local weekCardItemViews = {} local weekCardItemViewGos = {} diff --git a/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftManager.lua index d2d211a5bf..b20af6e043 100644 --- a/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftManager.lua @@ -1,4 +1,4 @@ -FifteenDayGiftManager = {} +FifteenDayGiftManager = {} local this = FifteenDayGiftManager local Data diff --git a/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua index d67e6f851e..05a411f5d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local FifteenDayGift = Inherit(BasePanel) local this = FifteenDayGift local sortingOrder = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua index 90559b1f63..a44fe4c299 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FastExploreInfoPopup = Inherit(BasePanel) local StoreConfig = ConfigManager.GetConfig(ConfigName.StoreConfig) local fightLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua index f39f510fa0..4b5a85ee99 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local FightAreaRewardFullPopup = Inherit(BasePanel) local this = FightAreaRewardFullPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua index 43489d437d..b08cd64248 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local FightAreaRewardPopup = Inherit(BasePanel) local this = FightAreaRewardPopup local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightEndLvUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightEndLvUpPanel.lua index 51f903ffce..a383731b5d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightEndLvUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightEndLvUpPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FightEndLvUpPanel = Inherit(BasePanel) local this=FightEndLvUpPanel local oldLevel diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightLevelSwitchPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightLevelSwitchPopup.lua index ecf2d38c96..620437288e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightLevelSwitchPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightLevelSwitchPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FightLevelSwitchPopup = Inherit(BasePanel) local this = FightLevelSwitchPopup local fightAnimRes = "live2d_guaji_yuguai" diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightManager.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightManager.lua index a607407d40..7f405554e4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightManager.lua @@ -1,4 +1,4 @@ -FightManager = {}; +FightManager = {}; local this = FightManager --this.rewardGroupConfig = ConfigManager.GetConfig(ConfigName.RewardGroup) this.levelSetting = ConfigManager.GetConfig(ConfigName.LevelSetting) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightMiddleChoosePanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightMiddleChoosePanel.lua index 1915c886ad..65dbd3e33d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightMiddleChoosePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightMiddleChoosePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FightMiddleChoosePanel = Inherit(BasePanel) local mainLevelSettingConfig = ConfigManager.GetConfig(ConfigName.MainLevelSettingConfig) local orginLayer diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua index 8342d829f5..9580b5cecb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FightMopUpEndPanel = Inherit(BasePanel) local this=FightMopUpEndPanel local rewardGos diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 2a28c024c5..fecea6c54c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FightPointPassMainPanel = Inherit(BasePanel) local this = FightPointPassMainPanel -- 外地入侵模块 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua index 185fe84b0e..34c63ea3e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua @@ -1,4 +1,4 @@ -FightPointPassManager = {}; +FightPointPassManager = {}; local this = FightPointPassManager local mainLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig) -- 火洞吊裸 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassRankPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassRankPopup.lua index 9a26e7171f..e1aa3d5f94 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassRankPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassRankPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FightPointPassRankPopup = Inherit(BasePanel) local this=FightPointPassRankPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightSelectAreaShowMopUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightSelectAreaShowMopUpPanel.lua index 5be70a8a1d..dcf86f0cb7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightSelectAreaShowMopUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightSelectAreaShowMopUpPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FightSelectAreaShowMopUpPanel = Inherit(BasePanel) local fightId = 0 local fightData = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightSmallChoosePanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightSmallChoosePanel.lua index d4313b8f70..92147a3a18 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightSmallChoosePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightSmallChoosePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FightSmallChoosePanel = Inherit(BasePanel) local smallListGo = {} local mainLevelSettingConfig = ConfigManager.GetConfig(ConfigName.MainLevelSettingConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMapIconShowView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMapIconShowView.lua index ef1fcac10f..24ca9e29b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMapIconShowView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMapIconShowView.lua @@ -1,4 +1,4 @@ ---- 执行关卡地图图标事件 +--- 执行关卡地图图标事件 --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/10/18 18:23 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMiddleChooseMapView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMiddleChooseMapView.lua index a703162b3b..f7e35c2b2f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMiddleChooseMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMiddleChooseMapView.lua @@ -1,4 +1,4 @@ - + require("Base/Stack") require("Modules/Map/Logic/TileMapController") require("Modules/Map/Logic/TileMapView") diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua index 3318ac463b..cba5a8e1a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua @@ -1,4 +1,4 @@ ---- 关卡小地图 +--- 关卡小地图 --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/9/25 14:19 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua index 79c8d18d7f..cb7296cf4c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua @@ -1,4 +1,4 @@ -InvadeMonsterView = {} +InvadeMonsterView = {} local this = InvadeMonsterView local StoreConfig = ConfigManager.GetConfig(ConfigName.StoreConfig) local orginLayer = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/RoleShowView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/RoleShowView.lua index 6a7d127453..dbd22908e3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/RoleShowView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/RoleShowView.lua @@ -1,4 +1,4 @@ ---- +--- --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/9/25 9:57 diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyManager.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyManager.lua index 8f4e9412e8..3530546983 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyManager.lua @@ -1,4 +1,4 @@ -FindFairyManager = {}; +FindFairyManager = {}; local this = FindFairyManager --本地表数据 this.rankRewardData={}--排名大奖数据 diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyPanel.lua index e13306119d..11cb988448 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyPanel.lua @@ -1,4 +1,4 @@ ----东海寻仙限时抽卡活动--- +---东海寻仙限时抽卡活动--- require("Base/BasePanel") FindFairyPanel = Inherit(BasePanel) local this = FindFairyPanel diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyPopup.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyPopup.lua index f090d9452e..b8bfc93eb1 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FindFairyPopup = Inherit(BasePanel) local this = FindFairyPopup this.type = nil --当前面板弹窗类型 diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFiveView.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFiveView.lua index 1460c64c81..56097db705 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFiveView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFiveView.lua @@ -1,4 +1,4 @@ ------ 东海寻仙-限时豪礼 ----- +----- 东海寻仙-限时豪礼 ----- local this = {} local sortingOrder -- local activeData diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFourView.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFourView.lua index 32f6f243a8..8e0f041f1f 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFourView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFourView.lua @@ -1,4 +1,4 @@ ------ 东海寻仙-寻仙盛典 ----- +----- 东海寻仙-寻仙盛典 ----- local this = {} local sortingOrder local activeData={} diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftOneView.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftOneView.lua index 6c01447970..4f3dae7a75 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftOneView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftOneView.lua @@ -1,4 +1,4 @@ ------ 东海寻仙-天官赐福 ----- +----- 东海寻仙-天官赐福 ----- local this = {} local shopItemData local conFigData diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftThreeView.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftThreeView.lua index 8385efb192..35f5bdd131 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftThreeView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftThreeView.lua @@ -1,4 +1,4 @@ ------ 东海寻仙-进阶 ----- +----- 东海寻仙-进阶 ----- local this = {} local sortingOrder = 0 local rewardGrid = {} diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftTwoView.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftTwoView.lua index b3460a2d18..919cb0f33a 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftTwoView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftTwoView.lua @@ -1,4 +1,4 @@ ------ 东海寻仙-每日仙缘礼 ----- +----- 东海寻仙-每日仙缘礼 ----- local this = {} local preGrid = {} diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_MainView.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_MainView.lua index 5a8b02395e..b1dbd37502 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_MainView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_MainView.lua @@ -1,4 +1,4 @@ ------ 东海寻仙主面板 ----- +----- 东海寻仙主面板 ----- local this = {} local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua index 8a64b8e5c5..d60ffa6d97 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua @@ -1,4 +1,4 @@ -starNumIamage = { +starNumIamage = { [1] = "x_xb_shuzi_01", [2] = "x_xb_shuzi_02", [3] = "x_xb_shuzi_03", diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua index b2f2e4304b..487a2b63d0 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FindTreasureMainPanel = Inherit(BasePanel) -- local findTreasureGrid = {} local findTreasureItemsGrid = {} diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua index ccee1ec939..280f94affa 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua @@ -1,4 +1,4 @@ -FindTreasureManager = {}; +FindTreasureManager = {}; local this = FindTreasureManager local allMissionUpHeros = {} this.refreshTicketItemId = ConfigManager.GetConfigData(ConfigName.MazeTreasureSetting,1).TakeOrder[1]--83迷宫寻宝免费刷新次数 diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureVipPopup.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureVipPopup.lua index 6c8fc950fe..83d47f5721 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureVipPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureVipPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FindTreasureVipPopup = Inherit(BasePanel) local MazeTreasureSetting = ConfigManager.GetConfig(ConfigName.MazeTreasureSetting) local orginLayer = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/DayRewardItem.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/DayRewardItem.lua index 09ab398581..9ffcbabd54 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/DayRewardItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/DayRewardItem.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName DayRewardItem * @Description 首冲每日奖励 * @Date 2019/6/3 14:41 diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargeManager.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargeManager.lua index b5031a44eb..a47407a46a 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargeManager.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName FirstRechargeManager * @Description 首充管理 * @Date 2019/7/4 19:11 diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua index 34f6e11173..d553f4ef78 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName FirstRechargePanel * @Description 首充 * @Date 2019/6/3 11:45 diff --git a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/FightMatchPanel.lua b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/FightMatchPanel.lua index 03917a3176..8e9da0caed 100644 --- a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/FightMatchPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/FightMatchPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FightMatchPanel = Inherit(BasePanel) local this = FightMatchPanel local matchView = require("Modules/FormFightMatch/MatchFight") diff --git a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua index 51979d6407..43bcf2332e 100644 --- a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local MapFightBuyExtraPopup = Inherit(BasePanel) local this = MapFightBuyExtraPopup diff --git a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightRewardPanel.lua index b4c01e5a60..3aff4ada8f 100644 --- a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightRewardPanel.lua @@ -1,4 +1,4 @@ -local RewardItem = {} +local RewardItem = {} function RewardItem:New(gameObject) local b = {} b.gameObject = gameObject diff --git a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua index 9ac18bcd68..e8800556e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua @@ -1,4 +1,4 @@ -MatchDataManager = {}; +MatchDataManager = {}; local this = MatchDataManager local rankConfig = ConfigManager.GetConfig(ConfigName.BloodyRankConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchFight.lua b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchFight.lua index 0dc8b8f9e9..513fd684a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchFight.lua +++ b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchFight.lua @@ -1,4 +1,4 @@ ---- +--- --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/8/30 15:40 diff --git a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchingPopup.lua b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchingPopup.lua index 705d3dca50..88443ee706 100644 --- a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchingPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchingPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MatchingPopup = Inherit(BasePanel) local this = MatchingPopup diff --git a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/RankInfoView.lua b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/RankInfoView.lua index a5754cf021..236785db92 100644 --- a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/RankInfoView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/RankInfoView.lua @@ -1,4 +1,4 @@ ---- +--- --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/8/30 15:42 diff --git a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/RewardView.lua b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/RewardView.lua index a06ff1fdef..3b1ecf1b29 100644 --- a/Assets/ManagedResources/~Lua/Modules/FormFightMatch/RewardView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FormFightMatch/RewardView.lua @@ -1,4 +1,4 @@ ---- +--- --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/8/30 15:43 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua index 01a5b0d100..05121f7f3a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ElementPopup = Inherit(BasePanel) local this = ElementPopup local activeColor = "#FFD376FF" diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua index 18a7b64390..42e844d2c4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FormationEditPopup = Inherit(BasePanel) local this = FormationEditPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua index 9d6dda752c..29a48bc2d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua @@ -1,4 +1,4 @@ ------ 编队推荐阵容 ----- +----- 编队推荐阵容 ----- require("Base/BasePanel") FormationExamplePopup = Inherit(BasePanel) local this = FormationExamplePopup diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index 7c90dde8fe..958dac3e4e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -1,4 +1,4 @@ -FormationManager = {} +FormationManager = {} local this = FormationManager local ChallengeData = ConfigManager.GetConfig(ConfigName.ChallengeConfig) local specialConfig=ConfigManager.GetConfig(ConfigName.SpecialConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanel.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanel.lua index d12afaf75d..85c4103745 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FormationPanel = Inherit(BasePanel) local this = FormationPanel this.curFormationIndex = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 9cc2d94249..f19be0244f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FormationPanelV2 = Inherit(BasePanel) local this = FormationPanelV2 local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationSetPanel.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationSetPanel.lua index 156b8e40ba..44163e4b7d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationSetPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationSetPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") FormationSetPanel = Inherit(BasePanel) local proId=0--0 全部 1 火 2风 3 水 4 地 5 光 6 暗 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/AdventureBossFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/AdventureBossFormation.lua index b721906611..31986cb1ce 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/AdventureBossFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/AdventureBossFormation.lua @@ -1,4 +1,4 @@ -local AdventureBossFormation = {} +local AdventureBossFormation = {} local this = AdventureBossFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/AdventureFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/AdventureFormation.lua index 9ff9805256..3f876ed94a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/AdventureFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/AdventureFormation.lua @@ -1,4 +1,4 @@ -local AdventureFormation = {} +local AdventureFormation = {} local this = AdventureFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaAttackFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaAttackFormation.lua index bd7d9033ca..a4c301c26c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaAttackFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaAttackFormation.lua @@ -1,4 +1,4 @@ -local ArenaAttackFormation = {} +local ArenaAttackFormation = {} local this = ArenaAttackFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaDefendFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaDefendFormation.lua index 2b9bf0e998..414e8a014e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaDefendFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaDefendFormation.lua @@ -1,4 +1,4 @@ ------ 竞技场防守 ----- +----- 竞技场防守 ----- local ArenaDefendFormation = {} local this = ArenaDefendFormation diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaTopMatchFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaTopMatchFormation.lua index 530b640b5c..f8334b6a27 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaTopMatchFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaTopMatchFormation.lua @@ -1,4 +1,4 @@ -local ArenaAttackFormation = {} +local ArenaAttackFormation = {} local this = ArenaAttackFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua index 3885059971..f3c9734e9c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua @@ -1,4 +1,4 @@ ------ 副本 ----- +----- 副本 ----- local CarbonFormation = {} local this = CarbonFormation local trialMapData = ConfigManager.GetConfig(ConfigName.TrialConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/EliteMonsterFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/EliteMonsterFormation.lua index 0204416e56..bfb476a1b8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/EliteMonsterFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/EliteMonsterFormation.lua @@ -1,4 +1,4 @@ -local EliteMonsterFormation = {} +local EliteMonsterFormation = {} local this = EliteMonsterFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExpeditionFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExpeditionFormation.lua index 1c7b5cfaf4..e7ebafef5c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExpeditionFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExpeditionFormation.lua @@ -1,4 +1,4 @@ ------ 猎妖之路 ----- +----- 猎妖之路 ----- local ExpeditionFormation = {} local this = ExpeditionFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/FormFightFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/FormFightFormation.lua index 62cefd8ebc..5760c6a1ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/FormFightFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/FormFightFormation.lua @@ -1,4 +1,4 @@ ---- +--- --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/8/30 17:41 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildBossFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildBossFormation.lua index 0783e2816d..dc49cb4134 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildBossFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildBossFormation.lua @@ -1,4 +1,4 @@ -local GuildBossFormation = {} +local GuildBossFormation = {} local this = GuildBossFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildCarDeleayFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildCarDeleayFormation.lua index 01a24005bd..bed39662f8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildCarDeleayFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildCarDeleayFormation.lua @@ -1,4 +1,4 @@ ------ 公会车迟 ----- +----- 公会车迟 ----- local GuildCarDeleayFormation = {} local this = GuildCarDeleayFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildDeathPosFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildDeathPosFormation.lua index 0c4b734313..c2e262e6ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildDeathPosFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildDeathPosFormation.lua @@ -1,4 +1,4 @@ ------ 公会十绝阵编队 ----- +----- 公会十绝阵编队 ----- local GuildDeathPosFormation = {} local this = GuildDeathPosFormation local guildWarConfig=ConfigManager.GetConfig(ConfigName.GuildWarConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildFightAttackFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildFightAttackFormation.lua index 7702ae6372..f7927aa10b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildFightAttackFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildFightAttackFormation.lua @@ -1,4 +1,4 @@ -local GuildFightAttackFormation = {} +local GuildFightAttackFormation = {} local this = GuildFightAttackFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildFightDefendFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildFightDefendFormation.lua index 118cd00197..daecc6663d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildFightDefendFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildFightDefendFormation.lua @@ -1,4 +1,4 @@ -local GuildFightDefendFormation = {} +local GuildFightDefendFormation = {} local this = GuildFightDefendFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildTranscriptFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildTranscriptFormation.lua index a0376ca1a2..8e4b1d5417 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildTranscriptFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildTranscriptFormation.lua @@ -1,4 +1,4 @@ ------ g公会副本 ----- +----- g公会副本 ----- local GuildTranscriptFormation = {} local this = GuildTranscriptFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/MainFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/MainFormation.lua index 22d5de38e3..6bc3b44aa7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/MainFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/MainFormation.lua @@ -1,4 +1,4 @@ -local MainFormation = {} +local MainFormation = {} local this = MainFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/MonsterCampFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/MonsterCampFormation.lua index 1b4b5b7652..776f5a3247 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/MonsterCampFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/MonsterCampFormation.lua @@ -1,4 +1,4 @@ ------ 锁妖塔 ----- +----- 锁妖塔 ----- local MonsterCampFormation = {} local this = MonsterCampFormation local monsterCampConfig = ConfigManager.GetConfig(ConfigName.FloodConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua index 8f3f45dcf2..5f4563ba4d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua @@ -1,4 +1,4 @@ ------ 好友切磋 ----- +----- 好友切磋 ----- local PlayWithSBFormation = {} local this = PlayWithSBFormation diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/SaveFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/SaveFormation.lua index 8812b1fdcb..ab132a06d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/SaveFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/SaveFormation.lua @@ -1,4 +1,4 @@ -local SaveFormation = {} +local SaveFormation = {} local this = SaveFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/StoryFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/StoryFormation.lua index 1d0712ae92..1b9b3441db 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/StoryFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/StoryFormation.lua @@ -1,4 +1,4 @@ ------ 关卡 ----- +----- 关卡 ----- local CarbonFormation = {} local this = CarbonFormation local mainLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua index fbe898c2e6..e522cdb858 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua @@ -1,4 +1,4 @@ ------ 副本 ----- +----- 副本 ----- local XuanYuanMirrorFormation = {} local this = XuanYuanMirrorFormation local curType = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua index a866766492..7add48d179 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua @@ -1,4 +1,4 @@ -FuXingGaoZhaoManager = {} +FuXingGaoZhaoManager = {} local this = FuXingGaoZhaoManager local Data = {} diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua index af5cbf7c55..93d72ad5aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local FuXingGaoZhao = Inherit(BasePanel) local this = FuXingGaoZhao local sortingOrder = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua index 134e4086f1..74a18e5a83 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua @@ -1,4 +1,4 @@ ------ 中号通用弹窗 ----- +----- 中号通用弹窗 ----- require("Base/BasePanel") GeneralBigPopup = Inherit(BasePanel) local this = GeneralBigPopup diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua index 085c8fec7f..63054ada63 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GeneralRankRewardPanel = Inherit(BasePanel) local this = GeneralRankRewardPanel local RewardList diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua index 31611d99ec..e5bfb75704 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua @@ -1,4 +1,4 @@ ------ 易经宝库弹窗 ----- +----- 易经宝库弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua index cedf90ba4e..db1db8bcc7 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua @@ -1,4 +1,4 @@ ------ 易经宝库奖励预览弹窗 ----- +----- 易经宝库奖励预览弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua index d96708fa52..bd48c75073 100644 --- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua @@ -1,4 +1,4 @@ ---- 管理游戏所有功能的开关状态 +--- 管理游戏所有功能的开关状态 --- Created by Steven. --- DateTime: 2019/5/9 16:07 diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FuncOpenClass.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FuncOpenClass.lua index 26e4376475..24cf7ed9d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FuncOpenClass.lua +++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FuncOpenClass.lua @@ -1,4 +1,4 @@ ---- +--- --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by Steven Hawking. --- DateTime: 2019/11/1 11:51 diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua index 5e0a1d864c..1ad2395345 100644 --- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua +++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua @@ -1,4 +1,4 @@ -FunctionOpenMananger = {}; +FunctionOpenMananger = {}; local this = FunctionOpenMananger -- 临时处理 diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua index c4fa23f60e..1a7647e292 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GoodFriendMainPanel = Inherit(BasePanel) local this = GoodFriendMainPanel local friendNumber = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua index f9d14dfb2a..7270b1c60b 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua @@ -1,4 +1,4 @@ -GoodFriendManager = {}; +GoodFriendManager = {}; local this = GoodFriendManager local GameSetting = ConfigManager.GetConfig(ConfigName.GameSetting) local VipLevelConfig = ConfigManager.GetConfig(ConfigName.VipLevelConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index c03ddaa116..e7b66e3519 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -1,4 +1,4 @@ -GuideManager = {} +GuideManager = {} local this = GuideManager local GuideConfig = ConfigManager.GetConfig(ConfigName.GuideConfig) local GlobalSystemConfig = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua index 5baa7fb69b..03cb89aece 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuidePanel = Inherit(BasePanel) local this = GuidePanel local GuideConfig = ConfigManager.GetConfig(ConfigName.GuideConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAidMainPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAidMainPopup.lua index 6c381911ac..a0289c399a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAidMainPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAidMainPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuildAidMainPopup = Inherit(BasePanel) local this = GuildAidMainPopup local curIndex = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAidManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAidManager.lua index c9f0c3970b..7a689d213e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAidManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAidManager.lua @@ -1,4 +1,4 @@ -GuildAidManager = {}; +GuildAidManager = {}; local this = GuildAidManager function this.Initialize() diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_AidRecord.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_AidRecord.lua index 2a4bb27764..710ff5b6f8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_AidRecord.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_AidRecord.lua @@ -1,4 +1,4 @@ -local this = {} +local this = {} local recordPerList = {} local titleText = {} local errorCodeHint = ConfigManager.GetConfig(ConfigName.ErrorCodeHint) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua index ad1156c6b7..75922341f9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua @@ -1,4 +1,4 @@ -local this = {} +local this = {} local guildHelpConfig = ConfigManager.GetConfig(ConfigName.GuildHelpConfig) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua index 8639aa29ee..2517a537c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua @@ -1,4 +1,4 @@ -local this = {} +local this = {} local guildHelpConfig = ConfigManager.GetConfig(ConfigName.GuildHelpConfig) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local allMyAidData = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossFightResultPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossFightResultPopup.lua index 074b96f99b..d0069bce3a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossFightResultPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossFightResultPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildBossFightResultPopup = Inherit(BasePanel) local this = GuildBossFightResultPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossLogPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossLogPopup.lua index 35fd275598..618713f761 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossLogPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossLogPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildBossLogPanel = Inherit(BasePanel) local this = GuildBossLogPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossManager.lua index 9e469dda42..4cdc612cac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossManager.lua @@ -1,4 +1,4 @@ -GuildBossManager = {} +GuildBossManager = {} local this = GuildBossManager function this.Initialize() diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossPanel.lua index ed49ccb7d3..6d7376e76a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildBossPanel = Inherit(BasePanel) local this = GuildBossPanel local monsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossTipPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossTipPopup.lua index d2ab348329..d9782ccb13 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossTipPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Boss/GuildBossTipPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildBossTipPanel = Inherit(BasePanel) local this = GuildBossTipPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayFindBossPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayFindBossPopup.lua index eb7a64a8f0..7d3bc02168 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayFindBossPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayFindBossPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuildCarDelayFindBossPopup = Inherit(BasePanel) local this = GuildCarDelayFindBossPopup local curMonsterId = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua index 7c9c8b3e35..800f6dc0c5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuildCarDelayLootPopup = Inherit(BasePanel) local this = GuildCarDelayLootPopup local CarChallenegList--抢夺后端信息 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua index 2a5b8d08b1..626121ca2a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuildCarDelayLootRecordPopup = Inherit(BasePanel) local this = GuildCarDelayLootRecordPopup local carChallengeItem--后端数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua index b54b12a01a..a429df287d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuildCarDelayMainPanel = Inherit(BasePanel) local this = GuildCarDelayMainPanel local testLiveGO diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua index 956ad94405..042f5985de 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua @@ -1,4 +1,4 @@ -GuildCarDelayManager = {}; +GuildCarDelayManager = {}; local this = GuildCarDelayManager this.ChallengeCdTime = 0 this.LootCdTime = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayRewardSortPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayRewardSortPopup.lua index 09fa3c46c3..ed4ff1e566 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayRewardSortPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayRewardSortPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuildCarDelayRewardSortPopup = Inherit(BasePanel) local this = GuildCarDelayRewardSortPopup local TabBox = require("Modules/Common/TabBox") diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua index b97cb1a9d1..06fd2c1f60 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua @@ -1,4 +1,4 @@ ------ 公会十绝阵详情面板 ----- +----- 公会十绝阵详情面板 ----- require("Base/BasePanel") local DeathPosInfoPanel = Inherit(BasePanel) local this = DeathPosInfoPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua index d95cab0b3b..aa6e5ec069 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua @@ -1,4 +1,4 @@ -DeathPosManager = {}; +DeathPosManager = {}; local this = DeathPosManager local guildSetting=ConfigManager.GetConfig(ConfigName.GuildSetting) this.status=0 --十绝阵阶段状态 0未开启 1挑战阶段 2领奖阶段 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua index 68a747399e..78e77dd0c4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua @@ -1,4 +1,4 @@ ------ 公会十绝阵主面板 ----- +----- 公会十绝阵主面板 ----- require("Base/BasePanel") local DeathPosPanel = Inherit(BasePanel) local this = DeathPosPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.lua index fc10043ce7..96ef569376 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.lua @@ -1,4 +1,4 @@ ------ 公会十绝阵排行弹窗 ----- +----- 公会十绝阵排行弹窗 ----- require("Base/BasePanel") local DeathPosRankPopup = Inherit(BasePanel) local this = DeathPosRankPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRewardPopup.lua index 146ba13385..ca93f99384 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRewardPopup.lua @@ -1,4 +1,4 @@ ------ 公会十绝阵奖励弹窗 ----- +----- 公会十绝阵奖励弹窗 ----- require("Base/BasePanel") local DeathPosRewardPopup = Inherit(BasePanel) local this = DeathPosRewardPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua index 793b470f7f..c3e7f2f19c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local _LogoList = ConfigManager.GetConfigData(ConfigName.GuildSetting, 1).TotemItem local GuildChangePopup = Inherit(BasePanel) local this = GuildChangePopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua index 39ebadf576..a66c904c25 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildCreatePopup = Inherit(BasePanel) local this = GuildCreatePopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua index af8634e120..dd2e9063f2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua @@ -1,4 +1,4 @@ ------ 公会祭祀弹窗 ----- +----- 公会祭祀弹窗 ----- require("Base/BasePanel") local GuildFetePopup = Inherit(BasePanel) local this = GuildFetePopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightAttackInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightAttackInfoPopup.lua index 79a4833122..3efb8c9f4a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightAttackInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightAttackInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildFightAttackInfoPopup = Inherit(BasePanel) local this = GuildFightAttackInfoPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightAttackLogPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightAttackLogPopup.lua index 37febc0b42..f0b9e0f7a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightAttackLogPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightAttackLogPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildFightAttackLogPopup = Inherit(BasePanel) local this = GuildFightAttackLogPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightAttackTipPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightAttackTipPopup.lua index 15f2faf4ad..4678b11062 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightAttackTipPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightAttackTipPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildFightAttackTipPopup = Inherit(BasePanel) local this = GuildFightAttackTipPopup --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightDefendInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightDefendInfoPopup.lua index e6a9a92462..f6c71fe9ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightDefendInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightDefendInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildFightDefendInfoPopup = Inherit(BasePanel) local this = GuildFightDefendInfoPopup -- Tab管理器 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightManager.lua index 596e04fbcb..8da0db4d1e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightManager.lua @@ -1,4 +1,4 @@ ---- 公会战管理 +--- 公会战管理 GuildFightManager = {} local this = GuildFightManager diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightMatchSuccessPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightMatchSuccessPopup.lua index 0dbf5f5456..163859a5c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightMatchSuccessPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightMatchSuccessPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildFightMatchSuccessPopup = Inherit(BasePanel) local this = GuildFightMatchSuccessPopup local orginLayer diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightMatchingPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightMatchingPopup.lua index a8e313aa9f..947d85133e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightMatchingPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightMatchingPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildFightMatchingPopup = Inherit(BasePanel) local this = GuildFightMatchingPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightPopup.lua index 7734cea42d..b68ea095ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildFightPopup = Inherit(BasePanel) local this = GuildFightPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightResultPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightResultPopup.lua index b16c9022d9..1a106094c7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightResultPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightResultPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildFightResultPopup = Inherit(BasePanel) local this = GuildFightResultPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua index 5c8815e74f..255efd37c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildFindPopup = Inherit(BasePanel) local this = GuildFindPopup local _GuildApplyStatusStr = { diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildGetStarPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildGetStarPopup.lua index 0f83802544..7ab3cf76a6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildGetStarPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildGetStarPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildGetStarPopup = Inherit(BasePanel) local this = GuildGetStarPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua index e352621520..ffc1a69d7c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildInfoPopup = Inherit(BasePanel) local this = GuildInfoPopup -- Tab管理器 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildLogoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildLogoPopup.lua index 30437b115d..c4955ed7e2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildLogoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildLogoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildLogoPopup = Inherit(BasePanel) local this = GuildLogoPopup -- Tab管理器 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua index 5babc1f868..8b65b3d14d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local _GuildBuildConfig = { [GUILD_MAP_BUILD_TYPE.HOUSE] = { diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua index 9b04358fb6..56ded51c14 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua @@ -1,4 +1,4 @@ -GuildManager = {} +GuildManager = {} local this = GuildManager this.RecommandGuildList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua index 2e8f93c07c..bb63db50b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local GuildMemberInfoPopup = Inherit(BasePanel) local this = GuildMemberInfoPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua index 1bb09c5d07..838455cf20 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua @@ -1,4 +1,4 @@ -MyGuildManager = {} +MyGuildManager = {} local this = MyGuildManager local guildSacrificeRewardConfig=ConfigManager.GetConfig(ConfigName.GuildSacrificeRewardConfig) local guildHelpConfig=ConfigManager.GetConfig(ConfigName.GuildHelpConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua index 5ccdf6054f..c02006e4a1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua @@ -1,4 +1,4 @@ -GuildRedPacketManager = {} +GuildRedPacketManager = {} local this = GuildRedPacketManager -- 默认未检查公会红包 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPanel.lua index 59ef51acb2..b6bb021ecf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPanel.lua @@ -1,4 +1,4 @@ ------ 公会红包 ----- +----- 公会红包 ----- require("Base/BasePanel") local RedPacketPanel = Inherit(BasePanel) local this=RedPacketPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPopup.lua index 11d166b761..9ee52c0649 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local RedPacketPopup = Inherit(BasePanel) local this=RedPacketPopup this.playerScrollHead={}--滚动条头像 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua index 534d423db1..7f4b030ace 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua @@ -1,4 +1,4 @@ ------ 公会红包-抢红包 ----- +----- 公会红包-抢红包 ----- local this = {} local sortingOrder=0 --红包资源名 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_RankView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_RankView.lua index b4e10d1fc2..eaeb3dbe3d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_RankView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_RankView.lua @@ -1,4 +1,4 @@ ------ 公会红包-抢红包排行榜 ----- +----- 公会红包-抢红包排行榜 ----- local this = {} this.firstHead=nil --第一名玩家头像 this.playerScrollHead={}--玩家头像组 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua index 2920db860a..621f9dfceb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua @@ -1,4 +1,4 @@ ------ 公会红包-发红包 ----- +----- 公会红包-发红包 ----- local this = {} local sortingOrder=0 --按钮类型 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua index 40e66b4136..207490b711 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua @@ -1,4 +1,4 @@ -GuildSkillManager = {}; +GuildSkillManager = {}; local this = GuildSkillManager local guildTechnology = ConfigManager.GetConfig(ConfigName.GuildTechnology) local allGuildSkillData = {}--后端所有数据 根据 Profession 存 二维数组 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua index c5de00512b..d6d0ce46de 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuildSkillUpLvPopup = Inherit(BasePanel) local this = GuildSkillUpLvPopup local TabBox = require("Modules/Common/TabBox") diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua index 49822c45d0..1efbbc8c68 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuildTranscriptMainPopup = Inherit(BasePanel) local this = GuildTranscriptMainPopup local guildCheckpointConfig = ConfigManager.GetConfig(ConfigName.GuildCheckpointConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua index 5f7d6cc6d2..2c102be6b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua @@ -1,4 +1,4 @@ -GuildTranscriptManager = {}; +GuildTranscriptManager = {}; local this = GuildTranscriptManager local guildCheckpointConfig = ConfigManager.GetConfig(ConfigName.GuildCheckpointConfig) local allChapterConfigData = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptRewardSortPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptRewardSortPanel.lua index 7beba1034a..8d2074c547 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptRewardSortPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptRewardSortPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuildTranscriptMainPopup = Inherit(BasePanel) local this = GuildTranscriptMainPopup local guildCheckpointConfig diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildMemberView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildMemberView.lua index 84af9dc53a..3eb6614aba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildMemberView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildMemberView.lua @@ -1,4 +1,4 @@ -require("Modules/Map/Logic/TileMapView") +require("Modules/Map/Logic/TileMapView") GuildMemberView = {} GuildMemberView.__index = GuildMemberView diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildSceneView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildSceneView.lua index 582da6462d..8fb632ed3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildSceneView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildSceneView.lua @@ -1,4 +1,4 @@ -require("Base/Stack") +require("Base/Stack") require("Modules/Map/Logic/TileMapController") require("Modules/Map/Logic/TileMapView") require("Modules/Guild/View/GuildMemberView") diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua index 559a20a3d8..fb3acb3cd8 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HandBookEquipInfoPanel = Inherit(BasePanel) local skillGos = {} local curSuitProGo = {} diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua index 3f4668b6ea..2a5a24e6cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HandBookHeroAndEquipListPanel = Inherit(BasePanel) local OpenType = 0 --1 英雄 2装备 3 法宝 diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua index 91f78ac680..95b69b1004 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HandBookHeroInfoPanel = Inherit(BasePanel) local this = HandBookHeroInfoPanel diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookMainPanel.lua index 438654910c..e976744149 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HandBookMainPanel = Inherit(BasePanel) --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua index 8192ecc919..88400ab97f 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HandBookRoleInfoLayout = Inherit(BasePanel) local this = HandBookRoleInfoLayout local heroConFigData diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleSkinPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleSkinPanel.lua index 657e748f3b..0b30869167 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleSkinPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleSkinPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HandBookRoleSkinPanel = Inherit(BasePanel) local this = HandBookRoleSkinPanel local porpertyConfigs = ConfigManager.GetConfig(ConfigName.PropertyConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookTalismanInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookTalismanInfoPanel.lua index b86eb53f9b..16bd412ec3 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookTalismanInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookTalismanInfoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HandBookTalismanInfoPanel = Inherit(BasePanel) local mainProGrid = {} local otherProGrid = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua index aa14476069..a6db0ad66d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua @@ -1,4 +1,4 @@ -EnvoyItem={} +EnvoyItem={} -- 鸿蒙守卫脚本 function EnvoyItem:New(gameObject) local b = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua index 3462596db6..c74bd265f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HarmonyPanel = Inherit(BasePanel) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua index 8e0ca9953c..3c67061727 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua @@ -1,4 +1,4 @@ -HarmonyManager = {} +HarmonyManager = {} local this = HarmonyManager -- -- 第一阶段 鸿蒙阵数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua index c6ad8161d6..18783998bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GongMingResultTips = Inherit(BasePanel) local this = GongMingResultTips local curSelectHeroList={} diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua index a12b95c211..8f481fbcce 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GongMingResultTips = Inherit(BasePanel) local this = GongMingResultTips local curSelectHeroList={} diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua index 157ab3dd64..f80d516ede 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HongMengEnvoyPanel = Inherit(BasePanel) HongMengEnvoyPanel.contents = { [1] = {view = require("Modules/Harmony/View/HarmonyScrllow"), panelName = " HongMengEnvoyPanel"} diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyUnloadPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyUnloadPanel.lua index eaa82ac29d..39cc62c2d0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyUnloadPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyUnloadPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HongMengUnLoadPanel = Inherit(BasePanel) local this = HongMengUnLoadPanel local curSelectHeroList={} diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua index cf5f6cbd95..00411b2436 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HongMengUnLoadPanel = Inherit(BasePanel) local this = HongMengUnLoadPanel local curSelectHeroList={} diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua index a01a87868d..9cf7c9a03b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua @@ -1,4 +1,4 @@ -local this={} +local this={} this.tab=ConfigManager.GetConfig(ConfigName.Hongmeng) local Gold =0; local DemonCrystal = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua index 9cd1492a98..e9bc7e2a71 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua @@ -1,4 +1,4 @@ -require("misc.GSetClass") +require("misc.GSetClass") local HeroData = GSetClass("Person") HeroData.onCreate = function(self,_msgHeroData, isFindHandBook) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 231ba32071..7b97c5d57a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -1,4 +1,4 @@ -HeroManager = {} +HeroManager = {} local this = HeroManager local HeroData = require("Modules.Hero.HeroData") local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroSkinManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroSkinManager.lua index 921be554ac..9b51a604f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroSkinManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroSkinManager.lua @@ -1,4 +1,4 @@ -HeroSkinManager = {} +HeroSkinManager = {} local this = HeroSkinManager local skinConfig = ConfigManager.GetConfig(ConfigName.HeroSkin) this.skinDatas = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua index bf620e83fb..9b7f9d902a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua @@ -1,4 +1,4 @@ -LoginManager = {}; +LoginManager = {}; local this = LoginManager this.sign = "d13b3e8ef74bf72d8aafce3a1c8672a0" this.openId = nil diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 45fb1228d5..3c5d8f32dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") LoginPanel = Inherit(BasePanel) local this = LoginPanel @@ -6,7 +6,7 @@ this.LoginWay = { Account = 0, WeChat = 1 } SERVER_VERSION = tonumber(ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.ServerVersion) or 0) local ServerVersion = SERVER_VERSION -local IsShowNotice = SERVER_VERSION == 0 -- 正式服显示公告 +local IsShowNotice = false -- 正式服显示公告 local IsSDKLogin = AppConst.isSDK and AppConst.isSDKLogin local IsDevelopLogin = true diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPopup.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPopup.lua index 087999c077..459db04f18 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") LoginPopup = Inherit(BasePanel) local this = LoginPopup local _loginCall diff --git a/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua b/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua index 2a00cf6a4a..eb02281a49 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") NoticePopup = Inherit(BasePanel) local this = NoticePopup --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/RegistPopup.lua b/Assets/ManagedResources/~Lua/Modules/Login/RegistPopup.lua index bc8a3b300a..e77b7cd4b1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/RegistPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/RegistPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RegistPopup = Inherit(BasePanel) local this = RegistPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua b/Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua index 35693a3344..528743cd5f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName ServerListItem * @Description 服务器列表Item * @Date 2019/8/30 14:52 diff --git a/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua index 7ee9256582..68836dacf8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName ServerListSelectPanel * @Description 选服界面 * @Date 2019/8/30 14:32 diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyCat/LuckyCatManager.lua b/Assets/ManagedResources/~Lua/Modules/LuckyCat/LuckyCatManager.lua index d5b532e034..bb342c3c9f 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyCat/LuckyCatManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyCat/LuckyCatManager.lua @@ -1,4 +1,4 @@ -LuckyCatManager = {}; +LuckyCatManager = {}; local this = LuckyCatManager local luckyCatConfig = ConfigManager.GetConfig(ConfigName.LuckyCatConfig) local CHANNEL = 0 --系统频道 diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyCat/LuckyCatPanel.lua b/Assets/ManagedResources/~Lua/Modules/LuckyCat/LuckyCatPanel.lua index f60a54e4d5..81d08e49ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyCat/LuckyCatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyCat/LuckyCatPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") LuckyCatPanel = Inherit(BasePanel) local luckyCatConfig = ConfigManager.GetConfig(ConfigName.LuckyCatConfig) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyCat/View/LuckyCat.lua b/Assets/ManagedResources/~Lua/Modules/LuckyCat/View/LuckyCat.lua index 632dc08aa2..fd96e7e75b 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyCat/View/LuckyCat.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyCat/View/LuckyCat.lua @@ -1,4 +1,4 @@ -local LuckyCat = quick_class("LuckyCat") +local LuckyCat = quick_class("LuckyCat") function LuckyCat:ctor(mainPanel, gameObject) self.mainPanel = mainPanel self.gameObject = gameObject diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua index 70fa485b60..471a8f5381 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua @@ -1,4 +1,4 @@ -LuckyTurnTableManager = {}; +LuckyTurnTableManager = {}; local this = LuckyTurnTableManager this.luckyData={}---服务器幸运探宝跑马灯 物品数据 indication、刷新同一数据 diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua index 1a2380a643..2af73503c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua @@ -1,4 +1,4 @@ ---local LuckyTurnTablePanel= quick_class("LuckyTurnTablePanel") +--local LuckyTurnTablePanel= quick_class("LuckyTurnTablePanel") --local this = LuckyTurnTablePanel --function LuckyTurnTablePanel:ctor(mainPanel, gameObject) -- self.mainPanel = mainPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua index 7c6a8a2855..e222da6dd7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MailMainPanel = Inherit(BasePanel) local this=MailMainPanel local allMail diff --git a/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua b/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua index b5e6a47ddf..4028fc8f14 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua @@ -1,4 +1,4 @@ -MailManager = {}; +MailManager = {}; local this = MailManager this.mialDataList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Mail/MainSingleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Mail/MainSingleInfoPanel.lua index 2102bf0731..c5e9815a6c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mail/MainSingleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mail/MainSingleInfoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MainSingleInfoPanel = Inherit(BasePanel) local mailData local openPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua b/Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua index 779f1d6cfc..8f235b704d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua @@ -1,4 +1,4 @@ -testBattleData1 = { +testBattleData1 = { enemyData = { { { diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index aedf613a7e..65442997d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -1,4 +1,4 @@ --- int ADD_ITEM = 1;//添加道具 +-- int ADD_ITEM = 1;//添加道具 -- int ADD_CARD = 2; //添加卡牌 -- int SEND_MAIIL = 3;// 发送邮件 -- int HERO_STAR = 4;// 添加指定星级英雄 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 99d2050b1d..7333d6f66f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1,4 +1,4 @@ - + require("Base/BasePanel") require("Modules/Main/View/MainPlayerView") MainPanel = Inherit(BasePanel) @@ -1132,6 +1132,7 @@ function this:OnDestroy() this.timer:Stop() this.timer = nil end + self.playerView = nil end --更改姓名刷新 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/RedpotDebugPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/RedpotDebugPanel.lua index e4b74519bb..55764b5c25 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/RedpotDebugPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/RedpotDebugPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local RedpotDebugPanel = Inherit(BasePanel) local RPData = require("Modules/Player/RedPointData") diff --git a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua index 6db379580d..258601aebc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua @@ -1,4 +1,4 @@ -MainPlayerView = {} +MainPlayerView = {} MainPlayerView.__index = MainPlayerView local mapNpcOp = "UI_MainPlayer" diff --git a/Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua index 98fdbfc79d..e507033f8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local BuffChoosePanel = Inherit(BasePanel) local this = BuffChoosePanel diff --git a/Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua index b21b740031..e7ed90ec6c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local BuffOptionPanel = Inherit(BasePanel) local this = BuffOptionPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua b/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua index a6ef50d0a9..afb15aa1c9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua @@ -1,4 +1,4 @@ ---- +--- --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/7/26 10:57 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index d5bcec4e86..6293e02a54 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -1,4 +1,4 @@ -EndLessMapManager = {}; +EndLessMapManager = {}; local this = EndLessMapManager local gameSetting = ConfigManager.GetConfig(ConfigName.GameSetting) local endLessConfig = ConfigManager.GetConfig(ConfigName.EndlessMapConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f1.lua b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f1.lua index ab22b9a6e2..58194700ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f1.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f1.lua @@ -1,4 +1,4 @@ ---- +--- --- 移动速度buff --- local ExploreFunc_MoveSpeed = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f2.lua b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f2.lua index 15e14a9247..1c5ee0489b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f2.lua @@ -1,4 +1,4 @@ ---- +--- --- 视野范围buff --- local ExploreFunc_ViewSize = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f3.lua b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f3.lua index a235233ffc..e64e30aa50 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f3.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f3.lua @@ -1,4 +1,4 @@ ---- +--- --- 扎营次数buff --- local ExploreFunc_StopCount = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f4.lua b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f4.lua index aee4ac4d6b..cf0b8b731e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f4.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f4.lua @@ -1,4 +1,4 @@ ---- +--- --- 采矿暴击率 --- TODO: 未找到使用 --- diff --git a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f5.lua b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f5.lua index 38541f09c8..d31543ab63 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f5.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f5.lua @@ -1,4 +1,4 @@ ---- +--- --- 行动力 --- local ExploreFunc_Active = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f6.lua b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f6.lua index cd004d02d7..8d8ca07425 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f6.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/ExploreFunc/f6.lua @@ -1,4 +1,4 @@ ---- +--- --- 驱散某区域迷雾 --- local ExploreFunc_ClearFog = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/foodbuff_fight.lua b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/foodbuff_fight.lua index 607d20ea22..ac424f3da6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/foodbuff_fight.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/foodbuff_fight.lua @@ -1,4 +1,4 @@ -local FoodBuff = require("Modules/Map/FoodBuff/FoodBuff") +local FoodBuff = require("Modules/Map/FoodBuff/FoodBuff") local foodbuff_fight = Inherit(FoodBuff) local this = foodbuff_fight diff --git a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/foodbuff_map.lua b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/foodbuff_map.lua index 949fdf5cf0..cad528acdc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/foodbuff_map.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/Buff/foodbuff_map.lua @@ -1,4 +1,4 @@ -local FoodBuff = require("Modules/Map/FoodBuff/FoodBuff") +local FoodBuff = require("Modules/Map/FoodBuff/FoodBuff") local foodbuff_map = Inherit(FoodBuff) local this = foodbuff_map diff --git a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/FoodBuff.lua b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/FoodBuff.lua index 206d1c79d2..fde8d9dc7a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/FoodBuff.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuff/FoodBuff.lua @@ -1,4 +1,4 @@ - + local FoodDataConfig = ConfigManager.GetConfig(ConfigName.FoodsConfig) local FoodBuff = {} FoodBuff.ID = nil diff --git a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuffManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuffManager.lua index d55ebc89c2..60443ba138 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/FoodBuffManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/FoodBuffManager.lua @@ -1,4 +1,4 @@ --- 管理地图中的buff效果 +-- 管理地图中的buff效果 FoodBuffManager = {} local exploreData = ConfigManager.GetConfig(ConfigName.ExploreFunctionConfig) local this = FoodBuffManager diff --git a/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapController.lua b/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapController.lua index 26a5cd5a1f..c0ba293499 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapController.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapController.lua @@ -1,4 +1,4 @@ -require("Modules/Map/Logic/TileMapView") +require("Modules/Map/Logic/TileMapView") --在地块表现数据类之上派生一层控制类 TileMapController = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapData.lua b/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapData.lua index c2bac47691..9aae9db64e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapData.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapData.lua @@ -1,4 +1,4 @@ ----定义地图逻辑数据 +---定义地图逻辑数据 TileData = {} TileData.__index = TileData diff --git a/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua index feda72d4d2..d8c007f1b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua @@ -1,4 +1,4 @@ -require("Modules/Map/Logic/TileMapData") +require("Modules/Map/Logic/TileMapData") local MapConst = { tileWidth = 128, diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapAwardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapAwardPanel.lua index b23434f370..7c4d3d2dcd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapAwardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapAwardPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MapAwardPanel = Inherit(BasePanel) local this=MapAwardPanel local nameText--名字 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua index e6e8388bd9..fdcbdb0213 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua @@ -1,4 +1,4 @@ -MapManager = {}; +MapManager = {}; local this = MapManager local OptionAddConfig = ConfigManager.GetConfig(ConfigName.OptionAddCondition) local PropConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua index 10a9a39dae..9edaaa841f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MapOptionPanel = Inherit(BasePanel) local this = MapOptionPanel local addOptConfig = ConfigManager.GetConfig(ConfigName.OptionAddCondition) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index 15b7509fe2..6ce49fe923 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Modules/Map/Logic/TileMapController") require("Modules/Map/Logic/TileMapView") require("Modules/Map/View/MapPointView") diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua index 587375e77c..804ba9c4f2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua @@ -1,4 +1,4 @@ -MapTrialManager = {}; +MapTrialManager = {}; local this = MapTrialManager local trailSetting = ConfigManager.GetConfig(ConfigName.TrialSetting) local trailConfig = ConfigManager.GetConfig(ConfigName.TrialConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua index 5f55dc9751..dafa16e4b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ShowEnemyInfoPanel = Inherit(BasePanel) local this = ShowEnemyInfoPanel local monsterGroupId diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index f4f8bddd22..b1b9d0670c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -1,4 +1,4 @@ -TrialMapPanel = {} +TrialMapPanel = {} local this = TrialMapPanel local istrialMap = false local MapPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_13.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_13.lua index 613dd3b5a1..63875d1a3b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_13.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_13.lua @@ -1,4 +1,4 @@ -Game_13 = {} +Game_13 = {} local this = Game_13 local _btnList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_14.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_14.lua index c8c5dd8157..88d6861fe3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_14.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_14.lua @@ -1,4 +1,4 @@ -Game_14 = {} +Game_14 = {} local this = Game_14 local _itemsList = {} local _iconList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_15.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_15.lua index d099bcb997..d03e90d946 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_15.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_15.lua @@ -1,4 +1,4 @@ -Game_15 = {} +Game_15 = {} local this = Game_15 local _itemsList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_16.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_16.lua index 97f09c9981..8b8895b64c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_16.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_16.lua @@ -1,4 +1,4 @@ -Game_16 = {} +Game_16 = {} local this = Game_16 function this.Init(context, root, gameType, gameId, gameParams) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua index 42b4bcbafe..482e86dc9f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua @@ -1,4 +1,4 @@ -Game_17 = {} +Game_17 = {} local this = Game_17 local state = false diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_18.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_18.lua index e4ca0293f6..a52362a83a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_18.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_18.lua @@ -1,4 +1,4 @@ -Game_18 = {} +Game_18 = {} local this = Game_18 local _itemsList = {} local _ItemViewList={} diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/TrialMiniGameManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/TrialMiniGameManager.lua index e71fbe44f6..f208b7e841 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/TrialMiniGameManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/TrialMiniGameManager.lua @@ -1,4 +1,4 @@ -TrialMiniGameManager = {} +TrialMiniGameManager = {} local this = TrialMiniGameManager local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/TrialMiniGamePanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/TrialMiniGamePanel.lua index 3cb2c6e27e..1d1b805b78 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/TrialMiniGamePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/TrialMiniGamePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local BuffChoosePanel = Inherit(BasePanel) local this = BuffChoosePanel local _LogicConfig = { diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialOpPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialOpPanel.lua index e21ffe5518..282c21ea0d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialOpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialOpPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") -- 使用炸弹跟召唤界面 TrialOpPanel = Inherit(BasePanel) local this = TrialOpPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/CarbonMissionTypeView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/CarbonMissionTypeView.lua index 603564b975..6c3f18a825 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/CarbonMissionTypeView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/CarbonMissionTypeView.lua @@ -1,4 +1,4 @@ ---- 防止随着副本类型的增加,不停在MapMissionView中增加代码 +--- 防止随着副本类型的增加,不停在MapMissionView中增加代码 --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by hahaha. --- DateTime: 2019/7/23 10:34 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index 1716213aaa..b1d11ad067 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -1,4 +1,4 @@ ---- 无尽副本 +--- 无尽副本 --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/7/30 16:30 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/IconShowView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/IconShowView.lua index 147ca6815d..ee62462c76 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/IconShowView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/IconShowView.lua @@ -1,4 +1,4 @@ ---- +--- --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by Steven Hawking. --- DateTime: 2019/11/5 19:19 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua index eaaeaefa33..a5a8c04bad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua @@ -1,4 +1,4 @@ -require("Base/Stack") +require("Base/Stack") require("Modules/Map/Logic/TileMapController") require("Modules/Map/Logic/TileMapView") diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapMissionView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapMissionView.lua index 7521055103..941c3830cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapMissionView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapMissionView.lua @@ -1,4 +1,4 @@ -local this = {} +local this = {} local challengeData = ConfigManager.GetConfig(ConfigName.ChallengeConfig) local carBonMissionData = ConfigManager.GetConfig(ConfigName.ChallengeMissionConfig) local eliteMissionView = require("Modules/Map/View/CarbonMissionTypeView") diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua index 0b516535b1..c9a4e61054 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua @@ -1,4 +1,4 @@ -require("Modules/Map/Logic/TileMapView") +require("Modules/Map/Logic/TileMapView") local this = {} local ctrlView = require("Modules/Map/View/MapControllView") diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPointView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPointView.lua index 81c2d7d400..7594fcd154 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPointView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPointView.lua @@ -1,4 +1,4 @@ -require("Modules/Map/Logic/TileMapView") +require("Modules/Map/Logic/TileMapView") require("Modules/Map/Config/MapConfig") local MapPointConfig = ConfigManager.GetConfig(ConfigName.MapPointConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua index 789208c339..1e2a413826 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/PointHandleView.lua @@ -1,4 +1,4 @@ ---- 事件点的上层处理方法 +--- 事件点的上层处理方法 --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/8/27 10:14 diff --git a/Assets/ManagedResources/~Lua/Modules/MapFight/FightUIManager.lua b/Assets/ManagedResources/~Lua/Modules/MapFight/FightUIManager.lua index eebb9ec219..f42ba6686f 100644 --- a/Assets/ManagedResources/~Lua/Modules/MapFight/FightUIManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MapFight/FightUIManager.lua @@ -1,4 +1,4 @@ --- 管理需要UI表现得的数据 +-- 管理需要UI表现得的数据 FightUIManager = {}; local this = FightUIManager diff --git a/Assets/ManagedResources/~Lua/Modules/MapFight/MapFightManager.lua b/Assets/ManagedResources/~Lua/Modules/MapFight/MapFightManager.lua index 7c8eba65d9..d08f726174 100644 --- a/Assets/ManagedResources/~Lua/Modules/MapFight/MapFightManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MapFight/MapFightManager.lua @@ -1,4 +1,4 @@ -require "Message/SceneFight_pb" +require "Message/SceneFight_pb" require "Message/RoomProto_pb" --require "Message/CommonProto_pb" MapFightManager = {} diff --git a/Assets/ManagedResources/~Lua/Modules/MapFight/MapFightPanel.lua b/Assets/ManagedResources/~Lua/Modules/MapFight/MapFightPanel.lua index 674d3f3210..c6abad57a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/MapFight/MapFightPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MapFight/MapFightPanel.lua @@ -1,4 +1,4 @@ ---- =========== 这个面板只系统执行方法和提供入口 ======= +--- =========== 这个面板只系统执行方法和提供入口 ======= --- =========== 具体的逻辑处理放在各个模块中执行 ======== require("Base/BasePanel") diff --git a/Assets/ManagedResources/~Lua/Modules/MapFight/MapFightResultPopup.lua b/Assets/ManagedResources/~Lua/Modules/MapFight/MapFightResultPopup.lua index da0bf9b973..51b6263c25 100644 --- a/Assets/ManagedResources/~Lua/Modules/MapFight/MapFightResultPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/MapFight/MapFightResultPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local MapFightResultPopup = Inherit(BasePanel) local this = MapFightResultPopup diff --git a/Assets/ManagedResources/~Lua/Modules/MapFight/RoomManager.lua b/Assets/ManagedResources/~Lua/Modules/MapFight/RoomManager.lua index 270301a12c..613dca7fd2 100644 --- a/Assets/ManagedResources/~Lua/Modules/MapFight/RoomManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MapFight/RoomManager.lua @@ -1,4 +1,4 @@ -require "Message/RoomProto_pb" +require "Message/RoomProto_pb" --管理所有房间匹配的处理 RoomManager = {} diff --git a/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapActor.lua b/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapActor.lua index 4904ed9ff6..1c5ef757f8 100644 --- a/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapActor.lua +++ b/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapActor.lua @@ -1,4 +1,4 @@ -MapActor = {} +MapActor = {} MapActor.__index = MapActor local mapNpcOp = "UI_MapPoint_actor" diff --git a/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapAgent.lua b/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapAgent.lua index f0683a5fc9..8c66c3d29b 100644 --- a/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapAgent.lua +++ b/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapAgent.lua @@ -1,4 +1,4 @@ -require("Modules/Map/Logic/TileMapView") +require("Modules/Map/Logic/TileMapView") MapAgent = {} MapAgent.__index = MapAgent diff --git a/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapFightControllView.lua b/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapFightControllView.lua index f5fd1b09ed..967bc89c12 100644 --- a/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapFightControllView.lua +++ b/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapFightControllView.lua @@ -1,4 +1,4 @@ -require("Base/Stack") +require("Base/Stack") require("Modules/Map/Logic/TileMapController") require("Modules/Map/Logic/TileMapView") require("Modules/MapFight/View/MapAgent") diff --git a/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapPointMineral.lua b/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapPointMineral.lua index 0cb18b35a5..3db7cbadac 100644 --- a/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapPointMineral.lua +++ b/Assets/ManagedResources/~Lua/Modules/MapFight/View/MapPointMineral.lua @@ -1,4 +1,4 @@ -MapPointMineral = {} +MapPointMineral = {} MapPointMineral.__index = MapPointMineral local mapNpcOp = "UI_MapPoint_mineral" diff --git a/Assets/ManagedResources/~Lua/Modules/MapFight/View/UICtrlView.lua b/Assets/ManagedResources/~Lua/Modules/MapFight/View/UICtrlView.lua index 61e4e3d0b6..a9b325abf8 100644 --- a/Assets/ManagedResources/~Lua/Modules/MapFight/View/UICtrlView.lua +++ b/Assets/ManagedResources/~Lua/Modules/MapFight/View/UICtrlView.lua @@ -1,4 +1,4 @@ ---- 血战地图面板的UI模块 +--- 血战地图面板的UI模块 --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/9/7 5:56 diff --git a/Assets/ManagedResources/~Lua/Modules/Message/CurlingTipPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/CurlingTipPanel.lua index 7981554982..bd208104d0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/CurlingTipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/CurlingTipPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CurlingTipPanel = Inherit(BasePanel) local this = CurlingTipPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Message/GongGaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/GongGaoPanel.lua index 33e48c5095..cae531d3e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/GongGaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/GongGaoPanel.lua @@ -1,4 +1,4 @@ ---- +--- --- 公告面板 --- diff --git a/Assets/ManagedResources/~Lua/Modules/Message/HorseRaceLampView.lua b/Assets/ManagedResources/~Lua/Modules/Message/HorseRaceLampView.lua index ef84f82e84..9bab542b4d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/HorseRaceLampView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/HorseRaceLampView.lua @@ -1,4 +1,4 @@ -HorseRaceLampView = {} +HorseRaceLampView = {} require("Base/BasePanel") require("Base/Stack") HorseRaceLampView = Inherit(BasePanel) diff --git a/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua index 362be56d9a..8d044e8eed 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") LoadingPanel = Inherit(BasePanel) local this = LoadingPanel local sprites = {"loding1","loding2","loding3","loding4","loding5","loding6"} diff --git a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua index c9b3e0adb4..314a1e1525 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Base/Stack") MissionDailyTipPanel = Inherit(BasePanel) local this = MissionDailyTipPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Message/MsgPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/MsgPanel.lua index d373df13a0..463eb91482 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/MsgPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/MsgPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MsgPanel = Inherit(BasePanel) local str1 = Language[10555] diff --git a/Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua b/Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua index da5a6816d1..eae7412108 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") NotEnoughPopup = Inherit(BasePanel) local this = NotEnoughPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Message/PopupTipPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/PopupTipPanel.lua index e778e23426..fd9231061a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/PopupTipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/PopupTipPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Base/Stack") PopupTipPanel = Inherit(BasePanel) local itemListPrefab = Stack.New() diff --git a/Assets/ManagedResources/~Lua/Modules/Message/RequestPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/RequestPanel.lua index eeb5b2751e..712de3db46 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/RequestPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/RequestPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RequestPanel = Inherit(BasePanel) local time = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Message/SwitchPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/SwitchPanel.lua index b2c1f59793..86e9b52903 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/SwitchPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/SwitchPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") SwitchPanel = Inherit(BasePanel) local this = SwitchPanel --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Message/SysPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/SysPanel.lua index 1ef2f87505..add66d1451 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/SysPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/SysPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") SysPanel = Inherit(BasePanel) local str1 = Language[10732] diff --git a/Assets/ManagedResources/~Lua/Modules/Message/WidelyCallPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/WidelyCallPanel.lua index b352b72733..9b201d5248 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/WidelyCallPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/WidelyCallPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require "Message/msgCommon_pb"; local MsgParser = require("BadWords/MsgParser") diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/BHController.lua b/Assets/ManagedResources/~Lua/Modules/Mission/BHController.lua index 25bbf57161..e33cce2d95 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/BHController.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/BHController.lua @@ -1,4 +1,4 @@ -local BHController = {} +local BHController = {} local this = BHController --- 注册事件节点 diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHBattle.lua b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHBattle.lua index a3ed76cc31..77cc1e0274 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHBattle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHBattle.lua @@ -1,4 +1,4 @@ ---- 触发战斗 +--- 触发战斗 local BHBattle = {} local this = BHBattle diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHBuff.lua b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHBuff.lua index 0d371967f9..fb56b05f7d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHBuff.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHBuff.lua @@ -1,4 +1,4 @@ ---- 吃buff +--- 吃buff local BHBuff = {} local this = BHBuff diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHCheckMission.lua b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHCheckMission.lua index 32c5c5e613..318afde838 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHCheckMission.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHCheckMission.lua @@ -1,4 +1,4 @@ ---- 移动 +--- 移动 local BHMoveTo = {} local this = BHMoveTo diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHDeletePoint.lua b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHDeletePoint.lua index 963f300b01..27267f7d04 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHDeletePoint.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHDeletePoint.lua @@ -1,4 +1,4 @@ ---- 删除事件点 +--- 删除事件点 local BHDeletePoint = {} local this = BHDeletePoint diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHMapProgressChange.lua b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHMapProgressChange.lua index 37e982baae..30f2b2094c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHMapProgressChange.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHMapProgressChange.lua @@ -1,4 +1,4 @@ ---- 消耗物品 +--- 消耗物品 local BHMapProgressChange = {} local this = BHMapProgressChange diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHMoveTo.lua b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHMoveTo.lua index 0b0e5fc4e9..2a6f6347b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHMoveTo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHMoveTo.lua @@ -1,4 +1,4 @@ ---- 移动 +--- 移动 local BHMoveTo = {} local this = BHMoveTo diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHNewPoint.lua b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHNewPoint.lua index afeb1ae9fd..e12f8f1b1e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHNewPoint.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHNewPoint.lua @@ -1,4 +1,4 @@ ---- 删除事件点 +--- 删除事件点 local BHNewPoint = {} local this = BHNewPoint diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHParseMission.lua b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHParseMission.lua index 95804a5017..e4b8392e6a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHParseMission.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHParseMission.lua @@ -1,4 +1,4 @@ ---- 新增任务 +--- 新增任务 local BHParseMission = {} local this = BHParseMission diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHShowProgress.lua b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHShowProgress.lua index f6c33a2ee9..45c97a7e24 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHShowProgress.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHShowProgress.lua @@ -1,4 +1,4 @@ ---- 显示进度条界面 +--- 显示进度条界面 local BHShowProgress = {} local this = BHShowProgress diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHShowReward.lua b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHShowReward.lua index 1d4abd1817..80db24b2ce 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHShowReward.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHShowReward.lua @@ -1,4 +1,4 @@ ---- 显示奖励 +--- 显示奖励 local BHShowReward = {} local this = BHShowReward diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHSpendGoods.lua b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHSpendGoods.lua index e82492ddc7..60fcca79d0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHSpendGoods.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/Behaviour/BHSpendGoods.lua @@ -1,4 +1,4 @@ ---- 消耗物品 +--- 消耗物品 local BHSpendGoods = {} local this = BHSpendGoods diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua index 8589af35ec..4619f427f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MissionDailyPanel = Inherit(BasePanel) local this = MissionDailyPanel --子模块脚本 diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua index e94ff6b109..b9e0a86035 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua @@ -1,4 +1,4 @@ ------ 日常任务弹窗 ----- +----- 日常任务弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua index 0ccb396304..398dbb2a76 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua @@ -1,4 +1,4 @@ ------ 日常任务弹窗 ----- +----- 日常任务弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua index ecd76a65f8..5bfe43dde3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua @@ -1,4 +1,4 @@ ------ 日常任务弹窗 ----- +----- 日常任务弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua index e7a4c2117c..ad6eadfbf0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua @@ -1,4 +1,4 @@ ------ 日常任务弹窗 ----- +----- 日常任务弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua index 2592c4d73d..1f4d233586 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua @@ -1,4 +1,4 @@ ---任务系统,包括事件系统的通用处理 +--任务系统,包括事件系统的通用处理 require("Modules/Map/TrialMiniGame/TrialMiniGameManager") MissionManager = {} local this = MissionManager diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/OptionBehaviourManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/OptionBehaviourManager.lua index 1ae458131c..71737ef15a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/OptionBehaviourManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/OptionBehaviourManager.lua @@ -1,4 +1,4 @@ --- 管理Option表格的行为 +-- 管理Option表格的行为 -- 包含行为类型与跳转类 OptionBehaviourManager = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/ProgressPanel.lua b/Assets/ManagedResources/~Lua/Modules/Mission/ProgressPanel.lua index b7cba170ef..b6f15176ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/ProgressPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/ProgressPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ProgressPanel = Inherit(BasePanel) local this= ProgressPanel --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua index 3828d60dca..5b35b92157 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua @@ -1,4 +1,4 @@ -QinglongSerectTreasureManager = {} +QinglongSerectTreasureManager = {} local this = QinglongSerectTreasureManager local TreasureSunlongConfig = ConfigManager.GetConfig(ConfigName.TreasureSunlongConfig) local TreasureSunLongTaskConfig = ConfigManager.GetConfig(ConfigName.TreasureSunLongTaskConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/SecondaryMissionManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/SecondaryMissionManager.lua index bdc985f7b9..2cf10eefdd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/SecondaryMissionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/SecondaryMissionManager.lua @@ -1,4 +1,4 @@ -SecondaryMissionManager = {}; +SecondaryMissionManager = {}; local this = SecondaryMissionManager function this.Initialize() diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index d4dbb599e9..2bb21ea72e 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -1,4 +1,4 @@ -MonsterCampManager = {}; +MonsterCampManager = {}; local this = MonsterCampManager local monsterCampConfig = ConfigManager.GetConfig(ConfigName.FloodConfig) local monsterGroupConfig = ConfigManager.GetConfig(ConfigName.MonsterGroup) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua index 1fa24da9b0..1486427730 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MonsterCampPanel = Inherit(BasePanel) local this = MonsterCampPanel local orginLayer diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 9838068ad9..42b60afd73 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -1,4 +1,4 @@ -IndicationManager = {} +IndicationManager = {} local this = IndicationManager function this.Initialize() Game.GlobalEvent:AddEvent(Protocal.Connect, this.RegisterMessage) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 7c45436980..c38046560e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -1,4 +1,4 @@ -require "Message/CommonProto_pb" +require "Message/CommonProto_pb" require "Message/ChatProto_pb" require "Message/FightInfoProto_pb" require "Message/MessageTypeProto_pb" diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua index 78351532fb..57487c1e76 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua @@ -1,4 +1,4 @@ -NiuQiChongTianManager = {} +NiuQiChongTianManager = {} local this = NiuQiChongTianManager this.rewardData = {} this.configData = {} diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index 3917265990..e42182c785 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local NiuQiChongTian = Inherit(BasePanel) local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/NiuZhuanQianKun/NiuZhuanQianKunPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuZhuanQianKun/NiuZhuanQianKunPanel.lua index 08e7d43b6c..2309c5df7c 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuZhuanQianKun/NiuZhuanQianKunPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuZhuanQianKun/NiuZhuanQianKunPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local NiuZhuanQianKun = Inherit(BasePanel) local this = NiuZhuanQianKun local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/OnlineReward/OnlineRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/OnlineReward/OnlineRewardPanel.lua index 8ad5088af7..c2573eb135 100644 --- a/Assets/ManagedResources/~Lua/Modules/OnlineReward/OnlineRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/OnlineReward/OnlineRewardPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local OnlineRewardPanel = Inherit(BasePanel) local this = OnlineRewardPanel local itemPreList={} --item预设容器 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/AttentionGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/AttentionGiftPage.lua index 7b4f06b588..52ccd9894e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/AttentionGiftPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/AttentionGiftPage.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName AttentionGiftPage * @Description 关注有礼 * @Date 2019/8/8 14:12 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargeItem.lua b/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargeItem.lua index 4130a20a91..4babd20213 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargeItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargeItem.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName ContinuityRechargeItem * @Description 每日充值Item * @Date 2019/8/2 16:49 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua index d4b7e48c8a..4ad4e94eea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName ContinuityRechargePage * @Description 连续充值 * @Date 2019/8/2 16:45 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua index f11aabf588..d2b9fc1729 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua @@ -1,4 +1,4 @@ - + local CumulativeSignInPage = {} local sortingOrder = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua index 918ec0f9fe..20c945b628 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua @@ -1,4 +1,4 @@ -local GiftPackPage = quick_class("GiftPackPage") +local GiftPackPage = quick_class("GiftPackPage") local shopItemConfig = ConfigManager.GetConfig(ConfigName.StoreConfig) local rechargeCommodityConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig) local giftType = { diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua index 45a5c24847..65dcc29313 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua @@ -1,4 +1,4 @@ - + local GrowthGiftPage = {} local sortingOrder = 0 local rewardNameConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)--读取奖励名称信息 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftTaskItem.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftTaskItem.lua index 4aea2b5923..3e2608043e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftTaskItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftTaskItem.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName GrowthGiftTaskItem * @Description 成长基金任务Item * @Date 2019/5/25 17:01 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua index ffb7dd1339..beb2e08a6c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua @@ -1,4 +1,4 @@ -MissionPre = {} +MissionPre = {} local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local parent function MissionPre:New(gameObject) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua index 6292f61854..909cd65af9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua @@ -1,4 +1,4 @@ - + local MonthCardPage = {} local cardData = { [1] = { curState = 0 ,cardType = MONTH_CARD_TYPE.MONTHCARD,time = nil}, diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthRewardPreviewPopup.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthRewardPreviewPopup.lua index 978c69b4c4..2fbe16a925 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthRewardPreviewPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthRewardPreviewPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MonthRewardPreviewPopup = Inherit(BasePanel) local this = MonthRewardPreviewPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 1c150f1e98..c96182d0d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName OperatingManager * @Description 运营活动管理 * @Date 2019/6/6 10:29 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua index 462afbd55a..7a5791911d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName OperatingPanel * @Description 运营活动 * @Date 2019/5/25 14:16 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 930a2a583b..f1d9b8fbc6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -1,4 +1,4 @@ - + local UpperMonthCard = {} local sortingOrder = 0 local chargeConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua index 974839fff8..88d6d76e37 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua @@ -1,4 +1,4 @@ -local WeekMonthGiftPackPage = quick_class("WeekMonthGiftPackPage") +local WeekMonthGiftPackPage = quick_class("WeekMonthGiftPackPage") local rechargeCommodityConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig) local sortingOrder = 0 local extra=nil--判断周、月礼包 diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua index 4ab10ae943..5a74313d2f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName PayManager * @Description 支付管理系统 * @Date 2019/6/25 20:14 @@ -42,6 +42,10 @@ function this.RechargeSuccessOrder(msg) end function this.Pay(id, func) + if true then + PopupTipPanel.ShowTip("暂不支持付费") + return + end if not func then func = function()end end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua index e149beaa6e..9d084b262b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua @@ -1,4 +1,4 @@ -AutoRecoverManager = {} +AutoRecoverManager = {} local this = AutoRecoverManager local GameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1) --- 注册物品及其获取恢复时间的方法 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua index 0551c28614..6da84ed524 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua @@ -1,4 +1,4 @@ -HeadManager = {} +HeadManager = {} local this = HeadManager this._NewHeadList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 2e514ee4fe..3c84c8b0d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -1,4 +1,4 @@ -JumpManager = {}; +JumpManager = {}; local this = JumpManager local JumpConfig=ConfigManager.GetConfig(ConfigName.JumpConfig) function this.Initialize() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index 5b0caa9d1a..4ce42c35a1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -1,4 +1,4 @@ -PlayerManager = {} +PlayerManager = {} local this = PlayerManager local gameSetting = ConfigManager.GetConfig(ConfigName.GameSetting) this.userLevelData = ConfigManager.GetConfig(ConfigName.PlayerLevelConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua index a865f79d7b..398f7db53f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua @@ -1,4 +1,4 @@ -PrivilegeManager = {} +PrivilegeManager = {} local this = PrivilegeManager function this.Initialize() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedPointData.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedPointData.lua index 7a811489c0..a5d6fedf18 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedPointData.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedPointData.lua @@ -1,4 +1,4 @@ -local isLog = false +local isLog = false local function __DebugLog(str) if isLog then Log("" .. str .. "") diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedPointManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedPointManager.lua index 907a09e17f..bde88b2980 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedPointManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedPointManager.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @Classname RedPointManager * @Description 红点控制 * @Date 2019/5/18 10:48 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index acd2d8198e..1baadcdaa3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -1,4 +1,4 @@ ---- +--- --- 红点系统使用方法: --- 1、注册: --- 在 RedPointType 中注册相应的红点枚举 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/StateManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/StateManager.lua index b70fffb987..5125f5f3c7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/StateManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/StateManager.lua @@ -1,4 +1,4 @@ -StateManager = { +StateManager = { -- 快速战斗 QUICK_FIGHT_START = 1, QUICK_FIGHT_END = 2, diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonAllSkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonAllSkillInfoPopup.lua index 11d346f59e..9ab658992d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonAllSkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonAllSkillInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local PokemonAllSkillInfoPopup = Inherit(BasePanel) local this = PokemonAllSkillInfoPopup local pokemonSkillDataList = {}--数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua index cb2d3b4b9b..47ba81f672 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PokemonGetInfoPopup = Inherit(BasePanel) local this=PokemonGetInfoPopup local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua index c7bb229432..79b6a57588 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PokemonInfoPanel = Inherit(BasePanel) local this = PokemonInfoPanel --升级升星 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonListPanel.lua index b0a6a549e6..e738a8fbf5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PokemonListPanel = Inherit(BasePanel) local this = PokemonListPanel local curIndex = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua index 5204139f4e..1b8271388b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local PokemonMainPanel = Inherit(BasePanel) local this = PokemonMainPanel local PokemonList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua index 3945165dfe..533197f8a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua @@ -1,4 +1,4 @@ -PokemonManager = {} +PokemonManager = {} local this = PokemonManager local spiritAnimal = ConfigManager.GetConfig(ConfigName.SpiritAnimal) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua index 25c85a814a..857f16cbf0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PokemonSingleResultPanel = Inherit(BasePanel) local this=PokemonSingleResultPanel local heroConfigData = ConfigManager.GetConfig(ConfigName.SpiritAnimal) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSkillInfoPopup.lua index c2ea2038f6..657c87d819 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSkillInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local PokemonSkillInfoPopup = Inherit(BasePanel) local this = PokemonSkillInfoPopup local pokemonSkillPreList = {}--预设 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua index 1b7168fd02..f88a3ec98b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PokemonSummonOneResultPanel = Inherit(BasePanel) local this=PokemonSummonOneResultPanel local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua index e9ca3e148c..1670ad5e65 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local PokemonSummonPanel = Inherit(BasePanel) local MazeTreasureSetting = ConfigManager.GetConfig(ConfigName.MazeTreasureSetting) local bType={ diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua index 857cbb3385..1818303ea8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Base/Stack") PokemonSummonTenResultPanel = Inherit(BasePanel) local this=PokemonSummonTenResultPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua index 5672ecc483..886f942bff 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PokemonUpStarSuccessPanel = Inherit(BasePanel) local this=PokemonUpStarSuccessPanel this.skillConfig=ConfigManager.GetConfig(ConfigName.SpiritAnimalSkill) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua index 4873aab6e9..ae6c8c3f84 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua @@ -1,4 +1,4 @@ ------ 灵兽升级 ----- +----- 灵兽升级 ----- local this = {} local sortingOrder=0 local isUpLvMaterials=true--升级 突破 材料是否充足 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua index 37f1f18c5b..1e8e13cd19 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua @@ -1,4 +1,4 @@ ------ 灵兽羁绊 ----- +----- 灵兽羁绊 ----- local this = {} local sortingOrder=0 local isHeroUpStar=false--是否可升星 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua index d2ad97ec79..be5be3b8fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua @@ -1,4 +1,4 @@ ------ 灵兽羁绊 ----- +----- 灵兽羁绊 ----- local this = {} local sortingOrder=0 local curPokemonSidList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua index a6e837c324..26995d5317 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua @@ -1,4 +1,4 @@ ------ 灵兽列表 和 合成 ---- +----- 灵兽列表 和 合成 ---- local this = {} local sortingOrder=0 local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua index dceb62b161..c572e8775d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua @@ -1,4 +1,4 @@ ------ 选择出战灵兽 ----- +----- 选择出战灵兽 ----- local this = {} local sortingOrder=0 local polemonList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index b3e9ccda4c..c5461e79f2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") BattleFailPopup = Inherit(BasePanel) local this = BattleFailPopup local m_battlePanel diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua index 3beb35ec65..2d8b8fd72a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") BattleWinPopup = Inherit(BasePanel) local this = BattleWinPopup local m_isBack diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BazzarPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BazzarPopup.lua index 44dcd6286f..fa821bd556 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BazzarPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BazzarPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") BazzarPopup = Inherit(BasePanel) local this = BazzarPopup this.itemInfo = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BoxRewardShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BoxRewardShowPopup.lua index 444f5fffc6..d1244efabf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BoxRewardShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BoxRewardShowPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") BoxRewardShowPopup = Inherit(BasePanel) local reward local posX diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/CarbonBuyCountPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/CarbonBuyCountPopup.lua index b9034ba39f..ed8cb58991 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/CarbonBuyCountPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/CarbonBuyCountPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) CarbonBuyCountPopup = Inherit(BasePanel) local this = CarbonBuyCountPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/CarbonMissionPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/CarbonMissionPopup.lua index ad84a24f9a..4f6b0d26bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/CarbonMissionPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/CarbonMissionPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ctrlView = require("Modules/Map/View/MapControllView") CarbonMissionPopup = Inherit(BasePanel) local this = CarbonMissionPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/CostConfirmPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/CostConfirmPopup.lua index dadce053e1..6134899564 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/CostConfirmPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/CostConfirmPopup.lua @@ -1,4 +1,4 @@ ---- +--- ---CostConfirmPopup.Show(itemId, costNum, content, tip, func, costTipType) --- 参数:itemId 物品id (not nil) --- costNum 要消耗的数量(not nil) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua index 6e4213cb6d..89598ae889 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") CreateNamePopup = Inherit(BasePanel) local this = CreateNamePopup local boy = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/DiffmonsterEditPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/DiffmonsterEditPopup.lua index 29ebc32128..8bee47e3f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/DiffmonsterEditPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/DiffmonsterEditPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") DiffmonsterEditPopup = Inherit(BasePanel) local this=DiffmonsterEditPopup -- local diffmonsterOrder = {1,9,3,5,4,6,8,7,10,2} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/DropGetPlayerDecorateShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/DropGetPlayerDecorateShopPanel.lua index a6dc416497..662522a839 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/DropGetPlayerDecorateShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/DropGetPlayerDecorateShopPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") DropGetPlayerDecorateShopPanel = Inherit(BasePanel) local callBack local orginLayer diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/DropGetSSRHeroShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/DropGetSSRHeroShopPanel.lua index ab4275ee3c..0023bc266f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/DropGetSSRHeroShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/DropGetSSRHeroShopPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") DropGetSSRHeroShopPanel = Inherit(BasePanel) local heroConfigData = ConfigManager.GetConfig(ConfigName.HeroConfig) local heroBackData = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/ElementRestraintPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/ElementRestraintPopup.lua index 3301329435..2e6e5f271e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/ElementRestraintPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/ElementRestraintPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ElementRestraintPopup = Inherit(BasePanel) local this=ElementRestraintPopup local data=ConfigManager.GetConfigData(ConfigName.GameSetting,1) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/EquipInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/EquipInfoPopup.lua index 8f7abe0d8f..3e7b9f42cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/EquipInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/EquipInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") EquipInfoPopup = Inherit(BasePanel) local this = EquipInfoPopup this.skillConfig=ConfigManager.GetConfig(ConfigName.SkillConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FoodGainPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FoodGainPopup.lua index 63756f1618..12e50049ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FoodGainPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FoodGainPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local FoodGainPopup = Inherit(BasePanel) local this = FoodGainPopup local _StayItemList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua index 65b09414b2..e04f6e5a0f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua @@ -1,4 +1,4 @@ ------ 通用弹窗 ----- +----- 通用弹窗 ----- require("Base/BasePanel") GeneralPopup = Inherit(BasePanel) local this=GeneralPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua index 7b756c3fad..d4b33f4d29 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua @@ -1,4 +1,4 @@ ------ 通用奖励领取弹窗 ----- +----- 通用奖励领取弹窗 ----- require("Base/BasePanel") local GeneralRewardPopup = Inherit(BasePanel) local this = GeneralRewardPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/HelpPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/HelpPopup.lua index ab16580cb4..0802c311f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/HelpPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/HelpPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HelpPopup = Inherit(BasePanel) local this=HelpPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/ItemGetPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/ItemGetPopup.lua index 3b3a6a4c6d..260dfbf0f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/ItemGetPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/ItemGetPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ItemGetPopup = Inherit(BasePanel) local this = ItemGetPopup local ItemDataConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/MapBagPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/MapBagPopup.lua index f2ae67f870..7a5937fa9c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/MapBagPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/MapBagPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MapBagPopup = Inherit(BasePanel) local this = MapBagPopup local itemList={} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/MapFormationInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/MapFormationInfoPopup.lua index ccc403ebe8..da674a4887 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/MapFormationInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/MapFormationInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MapFormationInfoPopup = Inherit(BasePanel) local this = MapFormationInfoPopup local heroListGo={} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/MapNotePopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/MapNotePopup.lua index ab4fe8aaa0..55d78cc024 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/MapNotePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/MapNotePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MapNotePopup = Inherit(BasePanel) local this = MapNotePopup this.notePos = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua index 60b91a8b5a..583b355a25 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MapRoleInfoPopup = Inherit(BasePanel) local this = MapRoleInfoPopup --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/MatchTipPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/MatchTipPopup.lua index 1e8080b65f..185cabf742 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/MatchTipPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/MatchTipPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MatchTipPopup = Inherit(BasePanel) local this = MatchTipPopup local showStr = Language[11488] diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/MonsterInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/MonsterInfoPopup.lua index cb4b209445..5c8bf39fc9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/MonsterInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/MonsterInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MonsterInfoPopup = Inherit(BasePanel) --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/MonsterSkillPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/MonsterSkillPopup.lua index 3de56bf7ea..dee3995f0e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/MonsterSkillPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/MonsterSkillPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MonsterSkillPopup = Inherit(BasePanel) local this = MonsterSkillPopup --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/NameManager.lua b/Assets/ManagedResources/~Lua/Modules/Popup/NameManager.lua index fff36c81fb..6dd2e38d7c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/NameManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/NameManager.lua @@ -1,4 +1,4 @@ -local RandomName = ConfigManager.GetConfig(ConfigName.RandomName) +local RandomName = ConfigManager.GetConfig(ConfigName.RandomName) local this = { roleName = "", roleSex = ROLE_SEX.BOY diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/NextMonsterInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/NextMonsterInfoPopup.lua index ae98c2967d..f101f1e531 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/NextMonsterInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/NextMonsterInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") NextMonsterInfoPopup = Inherit(BasePanel) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local this = NextMonsterInfoPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua index f795faf454..d61f4b5609 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PassGiftPopup = Inherit(BasePanel) local this=PassGiftPopup --local isGo=true diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index bebd220ad6..74c34e3c4a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local PlayerInfoPopup = Inherit(BasePanel) local this = PlayerInfoPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua index 363cf2c368..95db8cb34e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RewardEquipSingleShowPopup = Inherit(BasePanel) local this=RewardEquipSingleShowPopup local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index c48513ffbf..242ffb8f82 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RewardEquipSingleShowPopup2 = Inherit(BasePanel) local this=RewardEquipSingleShowPopup2 local curSuitProGo = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 85e43bdf6e..46b54d1833 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RewardItemPopup = Inherit(BasePanel) local this = RewardItemPopup local userLevelData = ConfigManager.GetConfig(ConfigName.PlayerLevelConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 2b415f3d1d..777a95767c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RewardItemSingleShowPopup = Inherit(BasePanel) local this = RewardItemSingleShowPopup local JumpConfig = ConfigManager.GetConfig(ConfigName.JumpConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua index 0a93c6bd00..e956c66bc4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RewardTalismanSingleShowPopup = Inherit(BasePanel) local type local dId diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua index dc2efd14ca..6cf4058578 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleGetInfoPopup = Inherit(BasePanel) local this=RoleGetInfoPopup local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 63bb09c352..a11d295d6e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -1,4 +1,4 @@ ---- 猎妖师详情弹窗(滚动条版本) --- +--- 猎妖师详情弹窗(滚动条版本) --- require("Base/BasePanel") RoleInfoPopup = Inherit(BasePanel) local this = RoleInfoPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SettingPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SettingPopup.lua index 780dd63880..c30f9b192d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SettingPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SettingPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") SettingPopup = Inherit(BasePanel) local this = SettingPopup local passFight = false diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua index 6b731b2d0f..2ba4dbca58 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Modules/RoleInfo/RoleInfoPanel") SkillInfoPopup = Inherit(BasePanel) local this = SkillInfoPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua index 7891a01930..f490759d43 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua @@ -1,4 +1,4 @@ ------ 魂印弹窗 ----- +----- 魂印弹窗 ----- require("Base/BasePanel") SoulPrintPopUp = Inherit(BasePanel) local this = SoulPrintPopUp diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/StoryOptionPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/StoryOptionPopup.lua index 2d29453328..9929fdaee4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/StoryOptionPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/StoryOptionPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") StoryOptionPopup = Inherit(BasePanel) local this = StoryOptionPopup local curEventId = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua index 7ad516ea3f..c723dc4d76 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") SupremeHeroPopup = Inherit(BasePanel) local this=SupremeHeroPopup local artResConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua index 20c99bb7d2..7db8494c60 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua @@ -1,4 +1,4 @@ ------ 通用弹窗 ----- +----- 通用弹窗 ----- require("Base/BasePanel") TalismanInfoPopup = Inherit(BasePanel) local this=TalismanInfoPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialBossTipPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialBossTipPopup.lua index 4a79a25439..d0b6dfdafe 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialBossTipPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialBossTipPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") TrialBossTipPopup = Inherit(BasePanel) local this = TrialBossTipPopup -- 显示图片类型的枚举 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua index 6dade328bf..8dd1636a8c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua @@ -1,4 +1,4 @@ ------ 试练副本奖励弹窗 ----- +----- 试练副本奖励弹窗 ----- require("Base/BasePanel") local TrialRewardPopup = Inherit(BasePanel) local this = TrialRewardPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/UnlockCheckpointPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/UnlockCheckpointPopup.lua index 4d1c142908..e894ecc9ac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/UnlockCheckpointPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/UnlockCheckpointPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") --解锁关卡弹窗 UnlockCheckpointPopup = Inherit(BasePanel) local this=UnlockCheckpointPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims.lua index 347fbca579..9be1499119 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims.lua @@ -1,4 +1,4 @@ ------ 归元弹窗 ----- +----- 归元弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua index e1d30c9e15..4fc96cd181 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua @@ -1,4 +1,4 @@ ------ 装备批量出售 ----- +----- 装备批量出售 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipCompound.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipCompound.lua index 738975867a..fa400f3307 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipCompound.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipCompound.lua @@ -1,4 +1,4 @@ ------ 献祭弹窗 ----- +----- 献祭弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua index 6fa7669481..acc7592688 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua @@ -1,4 +1,4 @@ ------ 宝器分解弹窗 ----- +----- 宝器分解弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ExpeditionReply.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ExpeditionReply.lua index 6f62cfd137..9dcb44f625 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ExpeditionReply.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ExpeditionReply.lua @@ -1,4 +1,4 @@ ------ 大闹天宫 回复 和 复活节点弹窗 ----- +----- 大闹天宫 回复 和 复活节点弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildAid.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildAid.lua index b039e13d02..962cd62453 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildAid.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildAid.lua @@ -1,4 +1,4 @@ ------ 献祭弹窗 ----- +----- 献祭弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildAidFindBoxReward.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildAidFindBoxReward.lua index 8278c94e42..c1552c9317 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildAidFindBoxReward.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildAidFindBoxReward.lua @@ -1,4 +1,4 @@ ------ 献祭弹窗 ----- +----- 献祭弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua index 464c5ad3cb..385927addf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua @@ -1,4 +1,4 @@ ------ 公会技能重置弹窗 ----- +----- 公会技能重置弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua index 865f24c449..317940eb49 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua @@ -1,4 +1,4 @@ ------ 装备批量出售 ----- +----- 装备批量出售 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua index c30992f168..516ced5967 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua @@ -1,4 +1,4 @@ ------ 灵兽宝阁选择神兽 ----- +----- 灵兽宝阁选择神兽 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua index 91df5c8423..3932b5db69 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua @@ -1,4 +1,4 @@ ------ 献祭弹窗 ----- +----- 献祭弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua index dc754ae978..9506dec6a6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua @@ -1,4 +1,4 @@ ------ 灵兽合成 ----- +----- 灵兽合成 ----- local this = {} --传入父脚本模块 local sortingOrder diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua index 490733e733..3f85a08340 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua @@ -1,4 +1,4 @@ ------ 献祭弹窗 ----- +----- 献祭弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua index 85c6ecd2c0..413ab3c3fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua @@ -1,4 +1,4 @@ ------ 献祭弹窗 ----- +----- 献祭弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonUpZhenAddPro.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonUpZhenAddPro.lua index 6d2838d338..c1571c1570 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonUpZhenAddPro.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonUpZhenAddPro.lua @@ -1,4 +1,4 @@ ------ 灵兽战力加成 ----- +----- 灵兽战力加成 ----- local this = {} --传入父脚本模块 local sortingOrder diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel.lua index c191a315d3..ab8cc81be5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel.lua @@ -1,4 +1,4 @@ ------ 装备批量出售 ----- +----- 装备批量出售 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua index 71829d5266..e63cdcbbe3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua @@ -1,4 +1,4 @@ ------ 点将台抽卡 宝箱弹窗 ----- +----- 点将台抽卡 宝箱弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua index ac4897b622..eb74019dc4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua @@ -1,4 +1,4 @@ ------ 招募二次确认弹窗 ----- +----- 招募二次确认弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua index 6489deef12..478ee9a8a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua @@ -1,4 +1,4 @@ ------ 送神弹窗 ----- +----- 送神弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua index d77c7089de..23f9ed9cd0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua @@ -1,4 +1,4 @@ ------ 宝器分解弹窗 ----- +----- 宝器分解弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua index 9c42f4b877..722a68437f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua @@ -1,4 +1,4 @@ ------ 归元弹窗 ----- +----- 归元弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SheJiCheckGuild.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SheJiCheckGuild.lua index d238db84c0..ee8aeeaafc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SheJiCheckGuild.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SheJiCheckGuild.lua @@ -1,4 +1,4 @@ ------ 社稷大典检查是否加入公会 ----- +----- 社稷大典检查是否加入公会 ----- local this = {} local showType local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua index 2d429fd693..08642d0fdb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua @@ -1,4 +1,4 @@ ------ 归元弹窗 ----- +----- 归元弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TreasureCompound.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TreasureCompound.lua index 24c72ac949..10d07f76c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TreasureCompound.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TreasureCompound.lua @@ -1,4 +1,4 @@ ------ 献祭弹窗 ----- +----- 献祭弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua index 7febabe08c..fe9419c3d8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua @@ -1,4 +1,4 @@ ------ 森罗次元炸弹 ----- +----- 森罗次元炸弹 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua index 2e24ad3ee2..356c8425c5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua @@ -1,4 +1,4 @@ ------ 试练增益弹窗 ----- +----- 试练增益弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialSetting.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialSetting.lua index e0991e3cdc..c42d4248e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialSetting.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialSetting.lua @@ -1,4 +1,4 @@ ------ 试练设置弹窗 ----- +----- 试练设置弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialToNextFloor.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialToNextFloor.lua index 1aeb93f231..740e2f7c9b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialToNextFloor.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialToNextFloor.lua @@ -1,4 +1,4 @@ ------ 试炼进入下一层 ----- +----- 试炼进入下一层 ----- local this = {} local showType local eventId diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua index 80f6ee49d2..831edc2667 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua @@ -1,4 +1,4 @@ ------ 试练性药 ----- +----- 试练性药 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange.lua index 8c20c03840..d82fb05454 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange.lua @@ -1,4 +1,4 @@ ------ 归元弹窗 ----- +----- 归元弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua index 628ab04824..fbae4c770f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua @@ -1,4 +1,4 @@ ------ YiJingBaoKuConfirm二次确认弹窗 ----- +----- YiJingBaoKuConfirm二次确认弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua index d1494de295..910b621bc7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua @@ -1,4 +1,4 @@ ---- 界面专用对象池 +--- 界面专用对象池 local TempPool = {} function TempPool:Init() if not self.MomNode then diff --git a/Assets/ManagedResources/~Lua/Modules/Power/UKnowNothingToThePowerManager.lua b/Assets/ManagedResources/~Lua/Modules/Power/UKnowNothingToThePowerManager.lua index a04c1f8dd0..c22eec8ad5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Power/UKnowNothingToThePowerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Power/UKnowNothingToThePowerManager.lua @@ -1,4 +1,4 @@ -UKnowNothingToThePowerManager = {} +UKnowNothingToThePowerManager = {} local this = UKnowNothingToThePowerManager function this.Initialize() diff --git a/Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua index 5a89e11de9..40f9cb011e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PrayMainPanel = Inherit(BasePanel) local this = PrayMainPanel local blessingConfig = ConfigManager.GetConfig(ConfigName.BlessingConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Pray/PrayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pray/PrayManager.lua index 56b9ff995c..f0daee31eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pray/PrayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pray/PrayManager.lua @@ -1,4 +1,4 @@ -PrayManager = {}; +PrayManager = {}; local this = PrayManager local blessingRewardPool = ConfigManager.GetConfig(ConfigName.BlessingRewardPool) this.patyRewardData = {}--16 个奖励 祈祷用 diff --git a/Assets/ManagedResources/~Lua/Modules/Pray/PrayRewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Pray/PrayRewardItemPopup.lua index 6d1cdea42a..08b0f46299 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pray/PrayRewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pray/PrayRewardItemPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PrayRewardItemPopup = Inherit(BasePanel) local func local itemListPrefab diff --git a/Assets/ManagedResources/~Lua/Modules/Pray/PraySelectRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pray/PraySelectRewardPanel.lua index 3725f32c4e..10c2e47214 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pray/PraySelectRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pray/PraySelectRewardPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") PraySelectRewardPanel = Inherit(BasePanel) local chuanShuoGridList = {} local zhiZunGridList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Questionnaire/QuestionnaireListItem.lua b/Assets/ManagedResources/~Lua/Modules/Questionnaire/QuestionnaireListItem.lua index 5c04467946..8a467721e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Questionnaire/QuestionnaireListItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Questionnaire/QuestionnaireListItem.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName QuestionnaireListItem * @Description 调查问卷Item * @Date 2019/9/4 14:39 diff --git a/Assets/ManagedResources/~Lua/Modules/Questionnaire/QuestionnaireManager.lua b/Assets/ManagedResources/~Lua/Modules/Questionnaire/QuestionnaireManager.lua index 30ce7f2055..f486b1abff 100644 --- a/Assets/ManagedResources/~Lua/Modules/Questionnaire/QuestionnaireManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Questionnaire/QuestionnaireManager.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName QuestionnaireManager * @Description 调查问卷管理类 * @Date 2019/9/3 15:40 diff --git a/Assets/ManagedResources/~Lua/Modules/Questionnaire/QuestionnairePanel.lua b/Assets/ManagedResources/~Lua/Modules/Questionnaire/QuestionnairePanel.lua index 6ddcf1e849..213c9df9e7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Questionnaire/QuestionnairePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Questionnaire/QuestionnairePanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName QuestionnairePanel * @Description 调查问卷面板 * @Date 2019/9/3 15:42 diff --git a/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua b/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua index c4c32c20e1..0bf72503ab 100644 --- a/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua +++ b/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua @@ -1,4 +1,4 @@ - --[[ + --[[ * @ClassName QuickCommonPurchasePart * @Description 这该死的点石成金 * @Date 2020/4/27 18:05 diff --git a/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCommonPurchasePart.lua b/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCommonPurchasePart.lua index 5b36e77558..ea05a9ce68 100644 --- a/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCommonPurchasePart.lua +++ b/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCommonPurchasePart.lua @@ -1,4 +1,4 @@ - --[[ + --[[ * @ClassName QuickCommonPurchasePart * @Description 单项购买 * @Date 2019/5/17 20:29 diff --git a/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickPurchasePanel.lua b/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickPurchasePanel.lua index 694b7d5ed0..09f2d2d401 100644 --- a/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickPurchasePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickPurchasePanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName QuickPurchasePanel * @Description 快捷购买界面 * @Date 2019/5/17 20:25 diff --git a/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickSpecialPurchasePart.lua b/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickSpecialPurchasePart.lua index 93e3e15233..e2cb59383b 100644 --- a/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickSpecialPurchasePart.lua +++ b/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickSpecialPurchasePart.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName QuickSpecialPurchasePart * @Description 双项购买 * @Date 2019/5/17 20:30 diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua index e0c0e8f6d8..a1245e1d5f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RankingListMainPanel = Inherit(BasePanel) local this = RankingListMainPanel local curIndex = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListPanel.lua index 1df5f1c99a..6e38869bc6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RankingListPanel = Inherit(BasePanel) local this = RankingListPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua index 4ce5066f7d..a7f87ee9ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua @@ -1,4 +1,4 @@ -RankingManager = {} +RankingManager = {} local this = RankingManager this.CurPage=0 this.curRankingData={}--战力排行滚动数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index 5de190a40e..db841b7c4c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RankingSingleListPanel = Inherit(BasePanel) local this = RankingSingleListPanel --头像 diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua index 0be4b92b42..7169fac2cb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local MainShopPanel = Inherit(BasePanel) local this = MainShopPanel local oldAccumRecharge = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 2ce887eecc..69d2afc5d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -1,4 +1,4 @@ -local EveryDayGift = {} +local EveryDayGift = {} local rechargeNum = 0 function EveryDayGift:New(gameObject) local b = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua index 67c8bc07cf..6e77c1e185 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua @@ -1,4 +1,4 @@ -GiftPre = {} +GiftPre = {} local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local parent function GiftPre:New(gameObject) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua index 5124fdcff3..49fc1fa229 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua @@ -1,4 +1,4 @@ -local GiftView = quick_class("GiftView") +local GiftView = quick_class("GiftView") local shopItemConfig = ConfigManager.GetConfig(ConfigName.StoreConfig) local rechargeCommodityConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig) local rechargeNum diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeView.lua index 251fed22a6..a84cb30bf1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeView.lua @@ -1,4 +1,4 @@ -local RechargeView = {} +local RechargeView = {} function RechargeView:New(gameObject) local b = {} b.gameObject = gameObject diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua index fba9bb2c80..fb666bd9cb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ElementDrawCardPanel = Inherit(BasePanel) local canDrag=true local i=1 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua index 702c9052c9..39c15240a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HeroPreviewPanel = Inherit(BasePanel) local this=HeroPreviewPanel local roleData={} diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index 3a744f27ea..78195f1f0a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -1,4 +1,4 @@ - + RecruitManager = {} local this = RecruitManager local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua index 37ddb73da8..0a0a37cf19 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RecruitPanel = Inherit(BasePanel) local this = RecruitPanel --local preList diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RewardPreviewPopup.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RewardPreviewPopup.lua index a9f9a07c91..e75e9d3770 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RewardPreviewPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RewardPreviewPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RewardPreviewPopup = Inherit(BasePanel) local this = RewardPreviewPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua index b5085cd866..81f7fcd5f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") SingleRecruitPanel = Inherit(BasePanel) local this=SingleRecruitPanel local heroConfigData = ConfigManager.GetConfig(ConfigName.HeroConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua index 16ac1d8147..41623f7dcc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") TenRecruitPanel = Inherit(BasePanel) local this = TenRecruitPanel local cardList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/RedPoint/RedPoint.lua b/Assets/ManagedResources/~Lua/Modules/RedPoint/RedPoint.lua index 4567a570b1..c148515e43 100644 --- a/Assets/ManagedResources/~Lua/Modules/RedPoint/RedPoint.lua +++ b/Assets/ManagedResources/~Lua/Modules/RedPoint/RedPoint.lua @@ -1,4 +1,4 @@ -RedPointLayer = { +RedPointLayer = { Root = "Root", Main_Hero = "Main_Hero", diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/EquipSellSelectPopup.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/EquipSellSelectPopup.lua index 981b349b4b..6694216328 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/EquipSellSelectPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/EquipSellSelectPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") EquipSellSelectPopup = Inherit(BasePanel) local this = EquipSellSelectPopup local isAllSelectState = false diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua index 485e3d0303..314a26be43 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") HeroAndEquipResolvePanel = Inherit(BasePanel) local this=HeroAndEquipResolvePanel local heroEndBtns={}--英雄筛选所有按钮 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua index 7cb9096a18..63462006dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua @@ -1,4 +1,4 @@ ----献祭坛主面板--- +---献祭坛主面板--- require("Base/BasePanel") ResolvePanel = Inherit(BasePanel) local this = ResolvePanel diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua index 9bcb72e029..46be31ade4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua @@ -1,4 +1,4 @@ ------ 献祭 ----- +----- 献祭 ----- local this = {} local sortingOrder=0 local tabSortType = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua index c0cf9c7a8f..5526e8904a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua @@ -1,4 +1,4 @@ ------ 宝器分解 ----- +----- 宝器分解 ----- local this = {} local sortingOrder=0 local tabSortType = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua index 719fbc8180..efc2b48acc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua @@ -1,4 +1,4 @@ ------ 献祭 ----- +----- 献祭 ----- local this = {} local sortingOrder=0 local tabSortType = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua index 2badd97b0e..459eac74b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua @@ -1,4 +1,4 @@ ------ 回溯 ----- +----- 回溯 ----- local this = {} local sortType=0 local sortingOrder=0 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua index 79c955cebd..c1a6aa48e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua @@ -1,4 +1,4 @@ - + ----- 回溯 ----- local this = {} local sortType=0 diff --git a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua index 9d2c60a9f1..e34ebae328 100644 --- a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local RewardBoxPanel = Inherit(BasePanel) local this = RewardBoxPanel diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua index 9183808514..5f8fb53a86 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua @@ -1,4 +1,4 @@ -require("misc.GSetClass") +require("misc.GSetClass") local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig) local EquipTreasureData = GSetClass("EquipTreasureData") EquipTreasureData.onCreate = function(self,_singleData) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index 1641500cea..3ffb21776a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -1,4 +1,4 @@ -EquipTreasureManager = {} +EquipTreasureManager = {} local this = EquipTreasureManager local allTreasures = {} local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureResonancePanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureResonancePanel.lua index daac5611a5..fdea302fc9 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureResonancePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureResonancePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") EquipTreasureResonancePanel = Inherit(BasePanel) local this = EquipTreasureResonancePanel local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua index e80e667240..2fa435ddf0 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") EquipTreasureStrongPopup = Inherit(BasePanel) local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local jewelConfig=ConfigManager.GetConfig(ConfigName.JewelConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua index 136512b3b8..a75b6b5ee7 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleAwakeLayout = Inherit(BasePanel) local this = RoleAwakeLayout diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua index 8d7a9cf74a..63d3a7cd13 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleAwakeSuccessPanel = Inherit(BasePanel) local this=RoleAwakeSuccessPanel this.skillConfig=ConfigManager.GetConfig(ConfigName.SkillConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua index a18a07022a..05a17b0b70 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleAwakeTalentPopup = Inherit(BasePanel) local this = RoleAwakeTalentPopup local heroConfig diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua index a23e347700..f706e370b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleChooseListPanel = Inherit(BasePanel) local this = RoleChooseListPanel local curSelectHeroList={} diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua index c202c54d6c..dc8b814a65 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleEquipChangePopup = Inherit(BasePanel) local this=RoleEquipChangePopup local type--1 穿装备 2 卸装备 3 替换装备 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 11001054f1..cc86315801 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local spcialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig) local equipConfig = ConfigManager.GetConfig(ConfigName.EquipConfig) RoleEquipPanel = Inherit(BasePanel) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua index fd48b34936..d76a0241c5 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleEquipTreasureChangePopup = Inherit(BasePanel) local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) local spcialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index bb420ddd72..65ad88a61c 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleInfoLayout = Inherit(BasePanel) local this = RoleInfoLayout diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 0a5db8c991..eede27c920 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleInfoPanel = Inherit(BasePanel) local this = RoleInfoPanel local _CurPageIndex = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index e11aa2a947..712d46516a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleListPanel = Inherit(BasePanel) local this = RoleListPanel local sortType = 1 -- 1:品阶 2:等级 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua index 93efef2329..0c43123da1 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua @@ -1,4 +1,4 @@ ------ 角色定位弹窗 ----- +----- 角色定位弹窗 ----- require("Base/BasePanel") local RolePosInfoPopup = Inherit(BasePanel) local this=RolePosInfoPopup diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua index 96286e50e1..0b9ad8d1b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleProInfoPopup = Inherit(BasePanel) local this=RoleProInfoPopup local sDataTable = { diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnListPanel.lua index eb8f430491..e49d18d3af 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleReturnListPanel = Inherit(BasePanel) local this = RoleReturnListPanel local curSelectHeroData diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnPanel.lua index 95238283e8..065042425f 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleReturnPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleReturnPanel = Inherit(BasePanel) local needGrid = {} diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua index 59699d2a2d..f65c71613a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleSkinPanel = Inherit(BasePanel) local this = RoleSkinPanel local porpertyConfigs = ConfigManager.GetConfig(ConfigName.PropertyConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua index 68e46cfd7b..6f3e18e436 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleStoryLayout = Inherit(BasePanel) local this = RoleStoryLayout local curHeroData--当前英雄信息 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua index 514239eadd..55931f1ed7 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleTalentPopup = Inherit(BasePanel) local heroConfig,breakId,upStarId local breakSkillDataList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanChangePopup.lua index 624ada8ed0..3c9c981677 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanChangePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleTalismanChangePopup = Inherit(BasePanel) local this=RoleTalismanChangePopup local type--1 穿装备 2 卸装备 3 替换装备 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua index 1fb2f67503..6f29e00060 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua @@ -1,4 +1,4 @@ ------ 法宝面板 ----- +----- 法宝面板 ----- require("Base/BasePanel") RoleTalismanPanelV2 = Inherit(BasePanel) local this=RoleTalismanPanelV2 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpLvBreakSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpLvBreakSuccessPanel.lua index 8659127e28..08df920fa4 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpLvBreakSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpLvBreakSuccessPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleUpLvBreakSuccessPanel = Inherit(BasePanel) local this=RoleUpLvBreakSuccessPanel --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua index 78060b86be..fdfd70af47 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleUpStarLayout = Inherit(BasePanel) local this = RoleUpStarLayout diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua index 33e62a53f2..d08810cd66 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleUpStarListPanel = Inherit(BasePanel) local this = RoleUpStarListPanel local curSelectHeroList={} diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua index 141da6bf82..6515f6f90d 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RoleUpStarSuccessPanel = Inherit(BasePanel) local this=RoleUpStarSuccessPanel this.skillConfig=ConfigManager.GetConfig(ConfigName.SkillConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua index a0c6c1a2d2..f0e9f7925a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua @@ -1,4 +1,4 @@ ------ 法宝进阶面板 ----- +----- 法宝进阶面板 ----- require("Base/BasePanel") TalismanInfoPanel = Inherit(BasePanel) local this = TalismanInfoPanel diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarSuccessPanel.lua index 81cd80b69e..145dc08932 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarSuccessPanel.lua @@ -1,4 +1,4 @@ ------ 进阶成功面板 ----- +----- 进阶成功面板 ----- require("Base/BasePanel") TalismanUpStarSuccessPanel = Inherit(BasePanel) local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua index 5baef6cef7..bbf3800137 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") SecretBoxBuyOnePanel = Inherit(BasePanel) local this=SecretBoxBuyOnePanel local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua index 6b8524eda7..5c1bde58b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Base/Stack") SecretBoxBuyTenPanel = Inherit(BasePanel) local this=SecretBoxBuyTenPanel diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxManager.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxManager.lua index 605c292b95..ca13a6be30 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxManager.lua @@ -1,4 +1,4 @@ -SecretBoxManager = {}; +SecretBoxManager = {}; local this = SecretBoxManager local DifferDemonsBoxSetting = ConfigManager.GetConfig(ConfigName.DifferDemonsBoxSetting) local PrivilegeTypeConfig = ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxPanel.lua index d09d0e05c0..b32c5a969f 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxPanel.lua @@ -1,4 +1,4 @@ -require("Modules.Battle.Config.PokemonEffectConfig") +require("Modules.Battle.Config.PokemonEffectConfig") require("Base/BasePanel") SecretBoxPanel = Inherit(BasePanel) local this=SecretBoxPanel diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxShowPokemonPanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxShowPokemonPanel.lua index 5e3850eca8..d78c51d57a 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxShowPokemonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxShowPokemonPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") SecretBoxShowPokemonPanel = Inherit(BasePanel) local this = SecretBoxShowPokemonPanel local comonpent3 = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/CDKeyExchangePanel.lua b/Assets/ManagedResources/~Lua/Modules/Setting/CDKeyExchangePanel.lua index 60ddc82f7c..1228a8c61e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/CDKeyExchangePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/CDKeyExchangePanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName CDKeyExchangePanel * @Description CDKey兑换 * @Date 2019/9/17 10:53 diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua index de947e2dcf..02de7510a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local HeadChangePopup = Inherit(BasePanel) local this = HeadChangePopup -- 获取头像框数据, 并排序 diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/PlayerSetTitleRideSkinManager.lua b/Assets/ManagedResources/~Lua/Modules/Setting/PlayerSetTitleRideSkinManager.lua index 6f64adc7dd..ebe5948194 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/PlayerSetTitleRideSkinManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/PlayerSetTitleRideSkinManager.lua @@ -1,4 +1,4 @@ -PlayerSetTitleRideSkinManager = {}; +PlayerSetTitleRideSkinManager = {}; local this = PlayerSetTitleRideSkinManager function this.Initialize() diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua index e30749038d..51ad7d6559 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua @@ -1,4 +1,4 @@ -local SettingInfo = quick_class("SettingInfo") +local SettingInfo = quick_class("SettingInfo") local this = SettingInfo local languageGroup = {Language[11854],Language[11855]} diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingManager.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingManager.lua index 029d27531b..19e6b619e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingManager.lua @@ -1,4 +1,4 @@ -SettingManager = {} +SettingManager = {} local this = SettingManager -- 设置默认值 diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua index 0f780fb3bb..299997514c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local SettingPanel = Inherit(BasePanel) local this = SettingPanel local funIndex = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua index d640cfd685..47848eef4e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua @@ -1,4 +1,4 @@ ---坐骑 +--坐骑 local SettingPlayerRide = quick_class("SettingPlayerRide") local this = SettingPlayerRide local live2dRoot diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua index a2cc631a5d..fa8d484617 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua @@ -1,4 +1,4 @@ ---时装 +--时装 local SettingPlayerSkin = quick_class("SettingPlayerSkin") local this = SettingPlayerSkin function SettingPlayerSkin:ctor(mainPanel, gameObject) diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua index 35f66688d3..0cdf0211de 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua @@ -1,4 +1,4 @@ ---坐骑 +--坐骑 local SettingPlayerTitle = quick_class("SettingPlayerTitle") local this = SettingPlayerTitle local live2dRoot diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalHalfPricePage.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalHalfPricePage.lua index 34ab438d32..52ac6a5bd8 100644 --- a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalHalfPricePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalHalfPricePage.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName SevenDayCarnivalHalfPricePage * @Description 半价抢购 * @Date 2019/7/31 10:01 diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalManager.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalManager.lua index 480ee7cd17..3b9f8476b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalManager.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName SevenDayCarnivalManager * @Description 开服七天乐管理 * @Date 2019/7/30 20:43 diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanel.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanel.lua index 5f60613d50..2f6fbf7bfa 100644 --- a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName SevenDayCarnivalPanel * @Description 开服七天狂欢 * @Date 2019/7/30 20:42 diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua index a83a252a91..cdee901d58 100644 --- a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") SevenDayCarnivalPanelV2 = Inherit(BasePanel) local this = SevenDayCarnivalPanelV2 local treasureTaskConfig = ConfigManager.GetConfig(ConfigName.TreasureTaskConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalTaskItem.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalTaskItem.lua index 8e8a8a721c..105b1449ff 100644 --- a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalTaskItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalTaskItem.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName SevenDayCarnivalTaskItem * @Description 开服七日狂欢任务Item * @Date 2019/7/31 14:45 diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayRewardPreviewPanel.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayRewardPreviewPanel.lua index afb63f29d5..dcbe965453 100644 --- a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayRewardPreviewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayRewardPreviewPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName SevenDayRewardPreviewPanel * @Description 七日奖励预览 * @Date 2019/8/9 15:47 diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua index 168dba2135..d3b2e7d873 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local MainShopPanel = Inherit(BasePanel) local this = MainShopPanel -- Tab管理器 diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/MapShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Shop/MapShopPanel.lua index baee7d73fb..5191f867ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/MapShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/MapShopPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local MapShopPanel = Inherit(BasePanel) local this = MapShopPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua index e8a5a30d75..21bd923537 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ShopBuyPopup = Inherit(BasePanel) local this = ShopBuyPopup local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopConfig.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopConfig.lua index c28ab29f1a..e134ac03cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopConfig.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopConfig.lua @@ -1,4 +1,4 @@ ---- +--- --- 商店界面相关配置 --- 参数配置说明: --- title: 商店标题资源文件名 diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua index 145695a5b4..a7429978d5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ShopExchangePopup = Inherit(BasePanel) local this = ShopExchangePopup diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua index 01d21b82be..02891746ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua @@ -1,4 +1,4 @@ ---- 商店物品管理类 +--- 商店物品管理类 --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/5/8 18:11 diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopPanel.lua index 99625492df..e87313066e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local ShopConfig = require("Modules/Shop/ShopConfig") local ShopPanel = Inherit(BasePanel) local this = ShopPanel diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua index 528be5736b..f6303f03b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") RewardSoulPrintSingleShowPopup = Inherit(BasePanel) local type local sId diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua index 6415ac63c0..c5e55ebe45 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua @@ -1,4 +1,4 @@ ----- 魂印图鉴 ---- +---- 魂印图鉴 ---- require("Base/BasePanel") SoulPrintHandBook = Inherit(BasePanel) local this = SoulPrintHandBook diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua index a3afca813a..dfe6b014ce 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua @@ -1,4 +1,4 @@ -SoulPrintManager = {}; +SoulPrintManager = {}; local this = SoulPrintManager local equipSignSetting = ConfigManager.GetConfig(ConfigName.EquipSignSetting) local equipSign = ConfigManager.GetConfig(ConfigName.EquipSign) diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua index 9fc03f671e..f4e5854bc7 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua @@ -1,4 +1,4 @@ ------ 魂印主面板 ----- +----- 魂印主面板 ----- require("Base/BasePanel") SoulPrintPanel = Inherit(BasePanel) local this = SoulPrintPanel diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua index 44e2185dbf..32050ef00d 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua @@ -1,4 +1,4 @@ ----- 魂印详情与替换弹窗 ---- +---- 魂印详情与替换弹窗 ---- require("Base/BasePanel") SoulPrintPopUpV2 = Inherit(BasePanel) local this=SoulPrintPopUpV2 diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintStoreHousePopUp.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintStoreHousePopUp.lua index c6d31529a9..9fcc4b0cf0 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintStoreHousePopUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintStoreHousePopUp.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") SoulPrintStoreHousePopUp = Inherit(BasePanel) local this = SoulPrintStoreHousePopUp local chooseNum = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintUpLevelSuccessPopUp.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintUpLevelSuccessPopUp.lua index 7b84457d87..1ab1acb426 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintUpLevelSuccessPopUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintUpLevelSuccessPopUp.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") SoulPrintUpLevelSuccessPopUp = Inherit(BasePanel) local this=SoulPrintUpLevelSuccessPopUp local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrintAstrology/SoulPrintAstrologyPanel.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrintAstrology/SoulPrintAstrologyPanel.lua index 87c2f4f946..33b543bd74 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrintAstrology/SoulPrintAstrologyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrintAstrology/SoulPrintAstrologyPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ---魂印占星面板 SoulPrintAstrologyPanel = Inherit(BasePanel) local this=SoulPrintAstrologyPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Story/DialoguePopup.lua b/Assets/ManagedResources/~Lua/Modules/Story/DialoguePopup.lua index 39fc99786e..f93cb9feb6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/DialoguePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/DialoguePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") DialoguePopup = Inherit(BasePanel) local this = DialoguePopup diff --git a/Assets/ManagedResources/~Lua/Modules/Story/SpineControl.lua b/Assets/ManagedResources/~Lua/Modules/Story/SpineControl.lua index 7f62e97450..540a842e42 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/SpineControl.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/SpineControl.lua @@ -1,4 +1,4 @@ ---- 封装一层立绘加载处理方法,在这里扩展立绘处理方法 +--- 封装一层立绘加载处理方法,在这里扩展立绘处理方法 --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by Steven Hawking. --- DateTime: 2019/11/20 14:21 diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua index 7c701606b0..3e15a6853b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") StoryDialoguePanel = Inherit(BasePanel) local this = StoryDialoguePanel local chapterEventPointData = ConfigManager.GetConfig(ConfigName.ChapterEventPointConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua index 89558e1b34..48431c7287 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua @@ -1,4 +1,4 @@ --- 剧情管理类, 包含副本以及关卡剧情 +-- 剧情管理类, 包含副本以及关卡剧情 StoryManager = {}; local this = StoryManager local chapterDataConfig = ConfigManager.GetConfig(ConfigName.ChapterEventPointConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index 8037ef5047..2c05d587bc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName TaskManager * @Description 任务管理系统 * @Date 2019/6/5 10:54 diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua index 9732bb4206..2c36b10344 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua @@ -1,4 +1,4 @@ - + require("Base/BasePanel") local TianShuMiJuanMainPanel = Inherit(BasePanel) local this = TianShuMiJuanMainPanel diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua index 726c7c0d77..5cdd944135 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua @@ -1,4 +1,4 @@ -TianShuMiJuanManger = {} +TianShuMiJuanManger = {} local this = TianShuMiJuanManger local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) --读表 diff --git a/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua b/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua index d616db0680..ed8d2c60af 100644 --- a/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local TimeLimitSkin = Inherit(BasePanel) local this = TimeLimitSkin diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua index 8dddf8986f..bd1efa5b8d 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua @@ -1,4 +1,4 @@ --- local HeavenUnlockExtraRewardPanel = quick_class("HeavenUnlockExtraRewardPanel", BasePanel) +-- local HeavenUnlockExtraRewardPanel = quick_class("HeavenUnlockExtraRewardPanel", BasePanel) require("Base/BasePanel") local HeavenUnlockExtraRewardPanel = Inherit(BasePanel) local this = HeavenUnlockExtraRewardPanel diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua index bc471c7762..826adb2988 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua @@ -1,4 +1,4 @@ -TreasureOfHeavenManger = {} +TreasureOfHeavenManger = {} local this = TreasureOfHeavenManger local ConfigData = ConfigManager.GetConfig(ConfigName.WorldBossTreasureConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua index d0163dd125..12b9a9b580 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local TreasureOfHeavenPanel = Inherit(BasePanel) local this = TreasureOfHeavenPanel -- local curScore = 0--当前分数 diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/BuyTreasureLevelPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/BuyTreasureLevelPanel.lua index b7863a7806..50ba7c732c 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/BuyTreasureLevelPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/BuyTreasureLevelPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName BuyTreasureLevelPanel * @Description 购买宝藏等级 * @Date 2019/9/21 16:02 diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyManagerV2.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyManagerV2.lua index d975721ffd..8b5ab18272 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyManagerV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyManagerV2.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName TreasureOfSomebodyManagerV2 * @Description 戒灵秘宝管理 * @Date 2019/9/24 10:01 diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyPanelV2.lua index bdc69e4e4d..0ea4057b59 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyPanelV2.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName TreasureOfSomebodyPanelV2 * @Description 戒灵秘宝 * @Date 2019/9/20 14:15 diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyRewardPageV2.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyRewardPageV2.lua index d7943d7e42..b1fdc8de65 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyRewardPageV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyRewardPageV2.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName TreasureOfSomebodyRewardPageV2 * @Description 戒灵秘宝奖励Part * @Date 2019/9/21 13:39 diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua index 42ad341bbd..8899152ac7 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName TreasureOfSomebodyScorePageV2 * @Description 戒灵秘宝积分Part * @Date 2019/9/21 11:22 diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/UnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/UnlockExtraRewardPanel.lua index a3c96f26e5..767ae1ca79 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/UnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/UnlockExtraRewardPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName UnlockExtraRewardPanel * @Description 解锁额外奖励 * @Date 2019/9/21 16:01 diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua index d11eb13cc6..fed4c82184 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua @@ -1,4 +1,4 @@ ----- 百宝商会活动弹窗 ---- +---- 百宝商会活动弹窗 ---- require("Base/BasePanel") local TreasureStorePopup = Inherit(BasePanel) local this=TreasureStorePopup diff --git a/Assets/ManagedResources/~Lua/Modules/UIComponent/CommonConfirmPanel.lua b/Assets/ManagedResources/~Lua/Modules/UIComponent/CommonConfirmPanel.lua index fb52a5c926..a2b990fdb9 100644 --- a/Assets/ManagedResources/~Lua/Modules/UIComponent/CommonConfirmPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UIComponent/CommonConfirmPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @Classname CommonConfirmPanel * @Description TODO * @Date 2019/7/25 14:18 diff --git a/Assets/ManagedResources/~Lua/Modules/UIComponent/RewardPreviewPopupPanel.lua b/Assets/ManagedResources/~Lua/Modules/UIComponent/RewardPreviewPopupPanel.lua index 5a7f383e05..ab521f4b3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/UIComponent/RewardPreviewPopupPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UIComponent/RewardPreviewPopupPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName RewardPreviewPopupPanel * @Description 奖励预览界面 * @Date 2019/8/7 10:39 diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 78f92abfa6..1c11c42e52 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local UpGradePackagePanel = Inherit(BasePanel) local this = UpGradePackagePanel diff --git a/Assets/ManagedResources/~Lua/Modules/Update/DownLoadManager.lua b/Assets/ManagedResources/~Lua/Modules/Update/DownLoadManager.lua index 3b65e2810f..d9f90dc72c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Update/DownLoadManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Update/DownLoadManager.lua @@ -1,4 +1,4 @@ -DownLoadManager = {}; +DownLoadManager = {}; local this = DownLoadManager; function this.Initialize() diff --git a/Assets/ManagedResources/~Lua/Modules/Update/DownLoadingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Update/DownLoadingPanel.lua index bb4f946d78..6ed47f6713 100644 --- a/Assets/ManagedResources/~Lua/Modules/Update/DownLoadingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Update/DownLoadingPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") DownLoadingPanel = Inherit(BasePanel) local this = DownLoadingPanel --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua index c746a0e4a8..48a538b518 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName VipManager * @Description 特权等级管理 * @Date 2019/5/22 10:22 diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipPanel.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipPanel.lua index 9ba081a30b..b7c14a7351 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName OperatingPanel * @Description 等级特权面板 * @Date 2019/5/27 11:14 diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua index 71f2893354..f87c8f9382 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName OperatingPanel * @Description 等级特权面板 * @Date 2019/5/27 11:14 diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipTaskListItem.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipTaskListItem.lua index 5987b5ab47..23f617c468 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipTaskListItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipTaskListItem.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName VipTaskListItem * @Description Vip特权任务Item * @Date 2019/5/27 11:11 diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipTipPopup.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipTipPopup.lua index 0f4e65f0b1..a6d7a21acb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipTipPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipTipPopup.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName OperatingPanel * @Description 特权描述二级弹窗 * @Date 2019/5/27 11:14 diff --git a/Assets/ManagedResources/~Lua/Modules/WarPowerChange/WarPowerChangeNotifyPanel.lua b/Assets/ManagedResources/~Lua/Modules/WarPowerChange/WarPowerChangeNotifyPanel.lua index 7d367de916..89785f7302 100644 --- a/Assets/ManagedResources/~Lua/Modules/WarPowerChange/WarPowerChangeNotifyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WarPowerChange/WarPowerChangeNotifyPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @Classname WarPowerChangeNotifyPanel * @Description 战力变化提醒 * @Date 2019/5/10 11:20 diff --git a/Assets/ManagedResources/~Lua/Modules/WarPowerChange/WarPowerChangeNotifyPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/WarPowerChange/WarPowerChangeNotifyPanelV2.lua index 7c731bea3e..48f8eca6db 100644 --- a/Assets/ManagedResources/~Lua/Modules/WarPowerChange/WarPowerChangeNotifyPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/WarPowerChange/WarPowerChangeNotifyPanelV2.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName WarPowerChangeNotifyPanelV2 * @Description 战力升级提醒 * @Date 2019/9/10 9:54 diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua index 6a54b450b9..da16050c1b 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WorkShopArmorOnePanel = Inherit(BasePanel) local this=WorkShopArmorOnePanel local openThisPanel diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorTwoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorTwoPanel.lua index f4e9a57a92..0efd8365ac 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorTwoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorTwoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WorkShopArmorTwoPanel = Inherit(BasePanel) local this=WorkShopArmorTwoPanel local curWorkShopData diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopAttributeAdditionPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopAttributeAdditionPanel.lua index 995d7150e8..d1553421e2 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopAttributeAdditionPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopAttributeAdditionPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WorkShopAttributeAdditionPanel = Inherit(BasePanel) local heroPos = 0 --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopAwardPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopAwardPanel.lua index 1846bc91b6..7019b174a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopAwardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopAwardPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WorkShopAwardPanel = Inherit(BasePanel) local this = WorkShopAwardPanel --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopCastSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopCastSuccessPanel.lua index 8ec54ed383..025c559981 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopCastSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopCastSuccessPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WorkShopCastSuccessPanel = Inherit(BasePanel) local this=WorkShopCastSuccessPanel local curEquipData diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopEquipRebuildListPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopEquipRebuildListPanel.lua index e64ed3975a..aa505ea2d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopEquipRebuildListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopEquipRebuildListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WorkShopEquipRebuildListPanel = Inherit(BasePanel) local this = WorkShopEquipRebuildListPanel local curSelectEquip={} diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopEquipReforgePreviewPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopEquipReforgePreviewPanel.lua index 7811e90dbc..e3f5be0b95 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopEquipReforgePreviewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopEquipReforgePreviewPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @Classname WorkShopEquipReforgePreviewPanel * @Description 装备重铸预览 * @Date 2019/5/8 17:35 diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopLevelUpNotifyPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopLevelUpNotifyPanel.lua index 51fb78b3d7..42c427f19f 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopLevelUpNotifyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopLevelUpNotifyPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @Classname WorkShopLevelUpNotifyPanel * @Description 工坊升级提示界面 * @Date 2019/5/17 11:04 diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopLvUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopLvUpPanel.lua index 75937dc98e..cf705cb066 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopLvUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopLvUpPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WorkShopLvUpPanel = Inherit(BasePanel) local upLvInfo={} local materialList={} diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMadeSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMadeSuccessPanel.lua index 41c7e94bee..2752b30a6e 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMadeSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMadeSuccessPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WorkShopMadeSuccessPanel = Inherit(BasePanel) local this=WorkShopMadeSuccessPanel this.skillConfig=ConfigManager.GetConfig(ConfigName.SkillConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua index 6d4d590cc9..76dc9a1089 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WorkShopMainPanel = Inherit(BasePanel) local this = WorkShopMainPanel local propertyConfig=ConfigManager.GetConfig(ConfigName.PropertyConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopManager.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopManager.lua index 8cfb7188b0..4e36ff0e4f 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopManager.lua @@ -1,4 +1,4 @@ -WorkShopManager = {} +WorkShopManager = {} local this = WorkShopManager local GameSetting=ConfigManager.GetConfig(ConfigName.GameSetting) local WorkShopEquipmentConfig = ConfigManager.GetConfig(ConfigName.WorkShopEquipmentConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMaterialsCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMaterialsCompoundPanel.lua index 76bc5a4d37..716efdce8c 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMaterialsCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMaterialsCompoundPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WorkShopMaterialsCompoundPanel = Inherit(BasePanel) local this = WorkShopMaterialsCompoundPanel local materialPotPutNum=0--材料每次产出数量 diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopRuneListPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopRuneListPanel.lua index dc93d83e06..310f2ca6d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopRuneListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopRuneListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WorkShopRuneListPanel = Inherit(BasePanel) local this = WorkShopRuneListPanel local curSelectEquip={} diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua index 436607a9ef..575288c879 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") WorkShowTechnologPanel = Inherit(BasePanel) local this = WorkShowTechnologPanel local propertyConfig=ConfigManager.GetConfig(ConfigName.PropertyConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua index dd0e775649..2f36c9c79d 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local XiaoYaoEventPanel = Inherit(BasePanel) local this = XiaoYaoEventPanel local triggertype=0 --0:游历成功 大于0:触发仙缘 diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua index 3f20e3bc11..2df7604c15 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local XiaoYaoLuckyBossPopup = Inherit(BasePanel) local this = XiaoYaoLuckyBossPopup local monsterGroup = {} diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyTurnTablePopup.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyTurnTablePopup.lua index 0366cea726..093787e7e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyTurnTablePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyTurnTablePopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") XiaoYaoLuckyTurnTablePopup = Inherit(BasePanel) local this=XiaoYaoLuckyTurnTablePopup diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua index 1bd78535a8..1f54c1be2f 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua @@ -1,4 +1,4 @@ -XiaoYaoManager = {} +XiaoYaoManager = {} local this = XiaoYaoManager this.allMapData={} this.curMapId=0; diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index 98d61f1bd2..21f20898d5 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") XiaoYaoMapPanel = Inherit(BasePanel) local this = XiaoYaoMapPanel local cursortingOrder=0 diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoRewardPreviewPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoRewardPreviewPanel.lua index 0f93b24b81..8572ffdb3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoRewardPreviewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoRewardPreviewPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") XiaoYaoRewardPreviewPanel = Inherit(BasePanel) local this = XiaoYaoRewardPreviewPanel diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua index 5d86e98a6b..2d314abc9e 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") XiaoYaoYouPanel = Inherit(BasePanel) local this = XiaoYaoYouPanel local cursortingOrder diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua index 0ccf2bed42..80d82f41ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") XiaoyaoHeroGetPopup = Inherit(BasePanel) local this=XiaoyaoHeroGetPopup diff --git a/Assets/ManagedResources/~Lua/View/BtView.lua b/Assets/ManagedResources/~Lua/View/BtView.lua index c933bb1d1f..2d15a2bbbd 100644 --- a/Assets/ManagedResources/~Lua/View/BtView.lua +++ b/Assets/ManagedResources/~Lua/View/BtView.lua @@ -1,9 +1,12 @@ -BtView = {} +BtView = {} local this = BtView local bagPanelUI local RoleListPanelUI --- 静态数据 local static_openId = 0 +local _CurPanel = nil + + function BtView:New(gameObject) local b = {} b.gameObject = gameObject @@ -47,10 +50,23 @@ function this:InitComponent() end +function this:CloseCurPanel() + if not _CurPanel then + return + end + if _CurPanel == UIName.FightPointPassMainPanel then + return + end + if UIManager.IsOpen(_CurPanel) then + UIManager.ClosePanel(_CurPanel, true) + end +end + -- 主城 function this:OPenMainCity() if not UIManager.IsOpen(UIName.MainPanel) then UIManager.OpenPanel(UIName.MainPanel) + _CurPanel = UIName.MainPanel end end --打开英雄列表界面 @@ -59,28 +75,33 @@ function this:OpenChengYuan() HeroManager.heroListPanelSortID = 1 HeroManager.heroListPanelProID = 0 RoleListPanelUI = UIManager.OpenPanel(UIName.RoleListPanel) + _CurPanel = UIName.RoleListPanel end end --打开仓库界面 function this:OpenCangKu() if not UIManager.IsOpen(UIName.BagPanel) or (bagPanelUI and bagPanelUI.isFristOpen == false) then bagPanelUI = UIManager.OpenPanel(UIName.BagPanel) + _CurPanel = UIName.BagPanel end end -- 挂机界面 function this:OpenJieling() UIManager.OpenPanel(UIName.FightPointPassMainPanel) + _CurPanel = UIName.FightPointPassMainPanel end -- 打开副本选择界面 function this:OpenCarbon() PlayerManager.carbonType = 1 UIManager.OpenPanel(UIName.CarbonTypePanelV2) + _CurPanel = UIName.CarbonTypePanelV2 end function this:OpenGuild() JumpManager.GoJump(4001) end function this:OpenVIP() UIManager.OpenPanel(UIName.VipPanelV2) + _CurPanel = UIName.VipPanelV2 end --绑定事件(用于子类重写) @@ -125,7 +146,9 @@ end -- } --界面打开时调用(用于子类重写) function this:OnOpen(context) - + -- if not _CurPanel and UIManager.IsOpen(UIName.FightPointPassMainPanel) then + -- _CurPanel = UIName.FightPointPassMainPanel + -- end if context then self:SetOrderStatus(context) self:SetSelectTarget(context) @@ -188,6 +211,9 @@ end function this:OnBtnClick(pt) local isOpen = self:CheckIsOpen(pt) if isOpen then + -- 关闭当前界面 + this:CloseCurPanel() + -- 打开新界面 local btnFunc = self._BtnConfig[pt].clickFunc if btnFunc then btnFunc(self) diff --git a/Assets/ManagedResources/~Lua/View/ChatTipView.lua b/Assets/ManagedResources/~Lua/View/ChatTipView.lua index eef1b2a65a..776c5b2742 100644 --- a/Assets/ManagedResources/~Lua/View/ChatTipView.lua +++ b/Assets/ManagedResources/~Lua/View/ChatTipView.lua @@ -1,4 +1,4 @@ -local ChatTipView = {} +local ChatTipView = {} local SYS_MSG_TYPE = { [0] = {name = Language[10350]}, diff --git a/Assets/ManagedResources/~Lua/View/DragView.lua b/Assets/ManagedResources/~Lua/View/DragView.lua index 5a811a936f..50661fa62e 100644 --- a/Assets/ManagedResources/~Lua/View/DragView.lua +++ b/Assets/ManagedResources/~Lua/View/DragView.lua @@ -1,4 +1,4 @@ -DragView={} +DragView={} local this = DragView local IsScrollMouse=true function DragView:New(gameObject) diff --git a/Assets/ManagedResources/~Lua/View/ElementalResonanceView.lua b/Assets/ManagedResources/~Lua/View/ElementalResonanceView.lua index 4dbafc9176..f1eb4a96e5 100644 --- a/Assets/ManagedResources/~Lua/View/ElementalResonanceView.lua +++ b/Assets/ManagedResources/~Lua/View/ElementalResonanceView.lua @@ -1,4 +1,4 @@ ------ 元素共鸣 ----- +----- 元素共鸣 ----- ElementalResonanceView = {} local this = ElementalResonanceView local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) diff --git a/Assets/ManagedResources/~Lua/View/FetterItem.lua b/Assets/ManagedResources/~Lua/View/FetterItem.lua index df3c835294..8075a3acbc 100644 --- a/Assets/ManagedResources/~Lua/View/FetterItem.lua +++ b/Assets/ManagedResources/~Lua/View/FetterItem.lua @@ -1,4 +1,4 @@ -FetterItem = {} +FetterItem = {} local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local parent function FetterItem:New(gameObject) diff --git a/Assets/ManagedResources/~Lua/View/HarmonyView.lua b/Assets/ManagedResources/~Lua/View/HarmonyView.lua index c252df311a..8159d6c56a 100644 --- a/Assets/ManagedResources/~Lua/View/HarmonyView.lua +++ b/Assets/ManagedResources/~Lua/View/HarmonyView.lua @@ -1,4 +1,4 @@ -HarmonyView={} +HarmonyView={} -- 鸿蒙守卫脚本 function HarmonyView:New(gameObject) local b = {} diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index d3a2c8fc11..a908c247a7 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -1,4 +1,4 @@ -local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) +local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local equipConfig = ConfigManager.GetConfig(ConfigName.EquipConfig) ItemView = {} function ItemView:New(gameObject) diff --git a/Assets/ManagedResources/~Lua/View/JumpView.lua b/Assets/ManagedResources/~Lua/View/JumpView.lua index e61b92dfc9..426f37d70b 100644 --- a/Assets/ManagedResources/~Lua/View/JumpView.lua +++ b/Assets/ManagedResources/~Lua/View/JumpView.lua @@ -1,4 +1,4 @@ -local JumpConfig=ConfigManager.GetConfig(ConfigName.JumpConfig) +local JumpConfig=ConfigManager.GetConfig(ConfigName.JumpConfig) JumpView = {} function JumpView:New(gameObject) local b = {} diff --git a/Assets/ManagedResources/~Lua/View/MoneyNumView.lua b/Assets/ManagedResources/~Lua/View/MoneyNumView.lua index b535722ca6..a1f5020e1b 100644 --- a/Assets/ManagedResources/~Lua/View/MoneyNumView.lua +++ b/Assets/ManagedResources/~Lua/View/MoneyNumView.lua @@ -1,4 +1,4 @@ -MoneyNumView = {} +MoneyNumView = {} local PositionType = { Up_Or_Left = 1, diff --git a/Assets/ManagedResources/~Lua/View/NoteView.lua b/Assets/ManagedResources/~Lua/View/NoteView.lua index 3d14c6ad11..8df1c9a6aa 100644 --- a/Assets/ManagedResources/~Lua/View/NoteView.lua +++ b/Assets/ManagedResources/~Lua/View/NoteView.lua @@ -1,4 +1,4 @@ -NoteView = {}; +NoteView = {}; function NoteView:new() local o={} setmetatable(o,NoteView) diff --git a/Assets/ManagedResources/~Lua/View/NumberView.lua b/Assets/ManagedResources/~Lua/View/NumberView.lua index 9e45dd3be9..e8170417b4 100644 --- a/Assets/ManagedResources/~Lua/View/NumberView.lua +++ b/Assets/ManagedResources/~Lua/View/NumberView.lua @@ -1,4 +1,4 @@ -local NumberViewItem = {} +local NumberViewItem = {} function NumberViewItem:New(obj, item, imagePrefix, num, v2) local o = {} setmetatable(o, {__index = NumberViewItem}) diff --git a/Assets/ManagedResources/~Lua/View/PlayerHeadView.lua b/Assets/ManagedResources/~Lua/View/PlayerHeadView.lua index 1d741fef68..119ece781d 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerHeadView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerHeadView.lua @@ -1,4 +1,4 @@ - + local PlayerHeadView = {} function PlayerHeadView:New(gameObject) diff --git a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua index c614d9fd13..7d251bbc2b 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua @@ -1,4 +1,4 @@ -PlayerInfoView = {} +PlayerInfoView = {} function PlayerInfoView:New(gameObject) local b = {} diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index 018ad29db6..b2bab0f511 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua @@ -1,4 +1,4 @@ -PlayerLiveView = {} +PlayerLiveView = {} local this=PlayerLiveView local mapNpcOp = "PlayerLiveView" -- PlayerLiveViewData = { diff --git a/Assets/ManagedResources/~Lua/View/RewardPanel.lua b/Assets/ManagedResources/~Lua/View/RewardPanel.lua index 067b79a647..fe9a9bee5a 100644 --- a/Assets/ManagedResources/~Lua/View/RewardPanel.lua +++ b/Assets/ManagedResources/~Lua/View/RewardPanel.lua @@ -1,4 +1,4 @@ - + RewardPanel = {} function RewardPanel:New(gameObject) local b = {} diff --git a/Assets/ManagedResources/~Lua/View/RoleItemView.lua b/Assets/ManagedResources/~Lua/View/RoleItemView.lua index 5aff3b868a..8e724d1e75 100644 --- a/Assets/ManagedResources/~Lua/View/RoleItemView.lua +++ b/Assets/ManagedResources/~Lua/View/RoleItemView.lua @@ -1,4 +1,4 @@ -RoleItemView = {} +RoleItemView = {} local this=RoleItemView function RoleItemView:New(gameObject) local b = {} diff --git a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua index 13ca3ccdb1..2d65e49078 100644 --- a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua +++ b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua @@ -1,4 +1,4 @@ -ScrollCycleView = {} +ScrollCycleView = {} local this = ScrollCycleView local reverse = table.reverse diff --git a/Assets/ManagedResources/~Lua/View/ScrollFitterView.lua b/Assets/ManagedResources/~Lua/View/ScrollFitterView.lua index 1a19bd0591..b0306f4c28 100644 --- a/Assets/ManagedResources/~Lua/View/ScrollFitterView.lua +++ b/Assets/ManagedResources/~Lua/View/ScrollFitterView.lua @@ -1,4 +1,4 @@ -ScrollFitterView = {} +ScrollFitterView = {} local this = ScrollFitterView local function SetUpdate(self, index, item) item.isUsed = true diff --git a/Assets/ManagedResources/~Lua/View/ShopItemView.lua b/Assets/ManagedResources/~Lua/View/ShopItemView.lua index de073df8df..1488b01915 100644 --- a/Assets/ManagedResources/~Lua/View/ShopItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopItemView.lua @@ -1,4 +1,4 @@ -ShopItemView = {} +ShopItemView = {} local itemId = 0 local shopType = 0 -- 当前物品的信息 diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index 55e003cd32..4009cac075 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -1,4 +1,4 @@ - + local _ShopTypeConfig = ConfigManager.GetConfig(ConfigName.StoreTypeConfig) -- 通用得商店逻辑 local ShopView = {} diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index 75412e694c..0d9823a638 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -1,4 +1,4 @@ -UpView = {} +UpView = {} local ArenaSetting = ConfigManager.GetConfig(ConfigName.ArenaSetting) local StoreTypeConfig = ConfigManager.GetConfig(ConfigName.StoreTypeConfig) local _ItemMaxNum = 4