diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 13ca73f5d0..7aaa9c0b94 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1,4 +1,4 @@ -Language = { +Language = { [10001] = "没有ActivityTypeDef为%s任务Id为%s的数据", [10002] = "没有ActivityTypeDef为%s任务", [10003] = "活动关闭 ", diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 40eaa19d82..2a54d21347 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/Modules/Achievement/AchievementPanel.lua b/Assets/ManagedResources/~Lua/Modules/Achievement/AchievementPanel.lua index 03e4d61412..b72ea90375 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 645d93c1fe..163d4dfe67 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/CourtesyDressPanel.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/CourtesyDressPanel.lua index 82ac4af6a5..4d21e94d26 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[10005], Language[10006], Language[10007], Language[10008], Language[10009], Language[10010], Language[10011], Language[10012], Language[10013], Language[10014], Language[10015], Language[10016], Language[10017], Language[10018], Language[10019] } diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua index 5438d91dc3..c6f11fdd2b 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 b92c6038fd..354b132eb5 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 5074cbd6c7..908a28241e 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 3fb5af1e1c..223f2b2274 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 2b4962ebf4..9b3f413c55 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 15c5adf818..5f642c2f79 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 9afa59bc95..809cae95a3 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 b4e4d99803..1f4b82ab1a 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 43e76a84df..57887587cb 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 d4007667fd..42b43704cc 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 d9ec685ae0..d1f01f9bfc 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 5ebc078835..53bda544a5 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 e4f05c40cd..1ca5625328 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 7dad2e4ddc..170057301b 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 d594164bc2..f2fa007696 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 1baaf9fdd2..41de9aeaab 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 64adf7169c..73da74b9ba 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 this = ArenaResultPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua index aa4616cc96..f45cefd2bf 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 16dfe0b2e9..54d5f6a897 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 arenaBattleReward = ConfigManager.GetConfig(ConfigName.ArenaBattleReward) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/RankView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/RankView.lua index fce9772ad8..dcc91d6c10 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 aca9dcacae..d4372f3c54 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 4e7b5258f4..b592ab45ea 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 c661da0cd0..3c71664edb 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 911e075c9c..175362124c 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 9a5c5f108a..9ac8032cd8 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 91ddbe6225..b0f3c05d8d 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 35c370e9ac..83d9d890f4 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 c643a5bd43..5c6e767628 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 39885f47ee..36d21e9cf1 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 88d186b230..c8b4f18450 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 dfe410f48a..81d418ae80 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 18f41321bc..2faa559748 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 95f5c9f2f7..5bc2120b75 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 579e1dd2b1..3a1ad9e547 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 bfde7bb0ad..002e5731cf 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 a96cb33522..b53e51a9af 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 0843d657d6..f8d5dcd083 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 74a6caf83f..5a9d7ed033 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 b3bad03d89..4fca6984a3 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 6401593730..1778fa65e7 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 21673a7a0a..093c7708bf 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/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 5a2cf76ad2..1c00279200 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 afeadfa4ef..48e7ea8989 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 84b259bb5b..fe82003eb7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua @@ -1,4 +1,4 @@ -BattleRecordManager = {} +BattleRecordManager = {} local this = BattleRecordManager local BattleRecordList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Config/FightEffectAudioConfig.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Config/FightEffectAudioConfig.lua index e527d8dc60..854bf23757 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 5485649ad8..ec79f9d49c 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.View.RoleView", 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 95778084a4..70523f351b 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 a3e00fefcd..7c42605265 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 026b056515..79200e28d7 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/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index ec8c7b5b5b..df6ecda0b3 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/Base/RoleData.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/RoleData.lua index 433839ecc1..0b3514f937 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/RoleData.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/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/Base/Skill.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua index e088e53956..2e27d7c2d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua @@ -1,4 +1,4 @@ -local effect = require("Modules/Battle/Logic/Base/Effect") +local effect = require("Modules/Battle/Logic/Base/Effect") local floor = math.floor local max = math.max local min = math.min @@ -208,7 +208,7 @@ function Skill:Cast(func) --技能的施法时间计算,根据当前目标id关联的持续时间,取其中时间最长的一个 local duration = self.hitTime + self.continueTime -- 结算时间向后延长0.2秒,避免在效果结算完成前就结束了技能释放 - BattleLogic.WaitForTrigger(duration + 0.2, function() + BattleLogic.WaitForTrigger(duration + 0.4, function() self.owner.Event:DispatchEvent(BattleEventName.SkillCastEnd, self) BattleLogic.Event:DispatchEvent(BattleEventName.SkillCastEnd, self) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogManager.lua index 412fca66ff..97ba1d83d7 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 isLog = false diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua index 60b4b6be11..a5d56c2e15 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 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 99014e5cff..b3aa15bd6b 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 4dacfa3472..2bbf255139 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/HOT.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua index 86b01d6129..210c29270d 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 b8946b60fa..56a8e078f1 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/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 2308c764da..335a842730 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 d7c4e7eb01..29f9dbe5ce 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 c8169a8160..eee6db5d35 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/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/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua index fcf208f852..fe331632ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/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/RoleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleManager.lua index 3bd8896dea..dd455b8fc1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleManager.lua @@ -1,4 +1,4 @@ -RoleManager = {} +RoleManager = {} local this = RoleManager -- 将死之人 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua index 906d811fb7..4850ee293a 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/BattleSetView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleSetView.lua index ae0e97c87e..09b4d18f0c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleSetView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleSetView.lua @@ -1,4 +1,4 @@ - + RoleSetView = {} local MonsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig) -- 初始化角色设置界面 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua index 04766d6f20..045bd5e72a 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/BattleSetView") diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua index 2e3843bcf8..d08d44f9b0 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/BattleEndPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua index 09d88acabc..3fc4c1a85c 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 f3ca3042e8..972dce5d3d 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 cce5a44b2a..c0507931d7 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 d85b7bb6ab..10f3754845 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 28bdc5a45c..9e0e302cfc 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/BuffView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BuffView.lua index d556cfe92d..f084698225 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BuffView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/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/DamageResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua index c116c09cba..ce08b9bd50 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 DamageResultPanel = Inherit(BasePanel) local this = DamageResultPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua index 7c653da3ea..43eb4cfd88 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua @@ -1,4 +1,4 @@ -require("Modules.Battle.Logic.Misc.BattleDefine") +require("Modules.Battle.Logic.Misc.BattleDefine") local FEAConfig = require("Modules/Battle/Config/FightEffectAudioConfig") RoleView = {} RoleView.__index = RoleView diff --git a/Assets/ManagedResources/~Lua/Modules/BindPhone/BindPhoneNumberManager.lua b/Assets/ManagedResources/~Lua/Modules/BindPhone/BindPhoneNumberManager.lua index 3df4d59f53..074f92af58 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 4e536e1f2e..d793ecc177 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 ffd6d1b866..28c9fdd5d1 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 8cd5db4534..a1a9589006 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 6eba6fac7f..e469ff0fcd 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 c4587385ad..7717dc3270 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 fb4533007d..7c6fa51b1f 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 ef24e11ea9..57cbd574e6 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 81ec245354..28d08a0042 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 d3880e6026..70539803d3 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 c440aa03fb..11279ea4a6 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 0dcff04b6c..e5ae4ec056 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 06230a508e..d1231176db 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 68c167a8a3..6c491a31d2 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 e805bae5c4..1e8e6deb07 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 c2ee633909..81c964e30f 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 1744bf1041..7fb05eeffd 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 a5d29e250d..3992c63768 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 4ccad8bd8e..af6b2045f6 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 = ConfigManager.GetConfig(ConfigName.RaceTowerConfig) local raceTowerRewardConfig = ConfigManager.GetConfig(ConfigName.RaceTowerRewardConfig) local this = XuanYuanMirrorManager diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua index f18898025c..ac0ee2c932 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 this = XuanYuanMirrorPanel local hasFresh = false diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua index 638700ad4f..a008d27042 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 this = XuanYuanMirrorPanelList local hasFresh = false diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua index da497c54d1..58f907eb04 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 c36ece34d2..8c654ed0ad 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 56c4b0f1e4..fcbef504e6 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 6dbc352369..f2d79a2fba 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 9ae041df37..6f90aed827 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/Pool/CommonPool.lua b/Assets/ManagedResources/~Lua/Modules/Common/Pool/CommonPool.lua index 2bb91f19ac..0682fc3c9f 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 69ee8b544c..3187f9d0b1 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 b3234c0fab..7fe47f20ab 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 a0107e2f1a..d6106bfc75 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 900623b156..eef3cd083a 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 3d5a5b8a4c..9a72413b5d 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 525654e934..9621c172a0 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 670a3e29cb..5e5e53e37a 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/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 f3f5bef0af..9aa2d2a7db 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/DataCenterManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/DataCenterManager.lua index 4230711ba2..f3130a9fea 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 ebf0c19d02..e3e2f60948 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/DiffMonster/DemonActivatePanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua index 863af271d4..1c4a88e898 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 dad6087ec7..6fff555590 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 9c333820be..f069d76eaa 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 764be4a528..89153c1347 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 9b5fbfe018..a16b4d1d96 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 1fc4203a35..cbbef0b079 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 21fbbb8651..c9f6e1c141 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 709da3f810..1318e362f4 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 b8c578cfb5..77bad482ca 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 27d6937465..1f63cc9515 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 289893af55..d36ea8a049 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/EightDay/EightDayGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua index 3fdb9b2885..cb2633d648 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 00639e6357..5fd123b7ef 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[10005],Language[10006],Language[10007],Language[10008],Language[10009],Language[10010],Language[10011],Language[10012]} 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 4c6d278531..bb58e1e19a 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 58c317116e..73b2f333a6 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 300954f0fc..46b56d7526 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 b078194859..dc6e3cff48 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 88c8cba764..05caa50675 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", selectImg = "l_lieyaozhilu_chuanshuo1"}, diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua index 718937aea7..e9539d1633 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 269f3d01c2..b6811c1949 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 029e0a2822..78a74530ab 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 8390233793..5d35460a09 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 6e9aa90a0b..0a806dc7fe 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 486a3c9fb4..26c5b4762e 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 144c57c984..98051edd7b 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 99f70ac272..036a18bc90 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 3365c19687..1be2b6cac7 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 a197df56de..56f91652c0 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 5958c82343..bfb7d24e6a 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/ExChange.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua index 28b54c4a3f..ba2f63dc12 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 204bcff955..1469e5bc57 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 d6f53303d9..bdcbb33679 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 de24efa9b5..fcd0a2c082 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 0c58710d6e..d99a316866 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 6cff6e245e..7d64ae2955 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 83ca11dd81..2dab2ce73f 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 edc0e546d7..eea21b54b2 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 2e5a33655e..467ec08e78 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 35060f1d3e..f129961022 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 b0849a4803..150cf39206 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 b11e3f0049..c0a90efff1 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/Fight/FastExploreInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua index 6479839b49..2a20e0aa4c 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 e055c0be69..8616a2aac1 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 6915ad77c3..5d5ec46f18 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 e29b0a15e3..c0130c4e94 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 041e580727..0eba4bc10c 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 af82a0b2d1..ba5a013d9c 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 395c16e876..82ed521625 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 beb1beb4e7..be91cb35aa 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 ba3ba9454d..3e41a324df 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 92cb8e7f3c..73a0cd8540 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 238edddf49..67778acf22 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 312f1224a2..79feb7ceed 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 6f8fa96196..5fbb657825 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 d4c6c346f1..58c87d1e80 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 aa878da91d..4a79fe47a7 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 cb9469f7b9..0e83f4f97e 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 4833407bd1..fe5bf2b4eb 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 719f959333..41f59c9df8 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 17aee94769..8a64f45257 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 1462305726..1e535f11aa 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 1a258e51a1..1a37551ec3 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 2447bf980d..e2efe2d3fb 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 a04e8746bd..035185ca5d 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 d3722cf460..4ed78b24c7 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 3c9e524a4e..0ca58f7e9d 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 8625b0212a..b2fd7611c3 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 9901c5775b..3dc50b1711 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 b655789249..6e24b5c5dc 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) --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/DayRewardItem.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/DayRewardItem.lua index f2cfadf520..6cbc574f2f 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 605d817804..babd72b315 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 59381266b7..6882008215 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 5e7367e533..aa865258af 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 d316ed5630..c9fe25cd5c 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 4692620495..923e0de4b6 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 313eeed3b3..e8b363e061 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 f63dfbfec0..1421f62875 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 ab452fd3a6..2b51912e06 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 da8515d7f8..92923e4c7b 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 36260e618c..9b6b683e7d 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 8c0772a5b0..00f92129a8 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 613718b4aa..a7476238ef 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 86d749d088..66ca81cc74 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 6f6689e0d5..9eeca95512 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 b117a44471..72b96c918a 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 5544a1d64d..c3c1c3de1d 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 e0a0196b4d..8cf26dba4d 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 c3d684c385..e6318f0a41 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 a2dfb7152c..43906df246 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 908c512974..aea7fc2ddd 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 6260f4e134..b538840978 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 9173b725db..61afc4dec7 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 d7b5969aac..f80ae9a9d2 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 61bc77709f..3a37874e05 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 3ac235228d..54bab09a46 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 080d6d808f..3756446ed2 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 14175977cc..3340a6f3a0 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 5291d13ddb..88609ca017 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/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 132fce6ed6..7c9a71bd8a 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 d83760c6ed..904bde06bc 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 a0274e8286..6ddca0f675 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 dd0fc00cb7..3cd12a970f 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 2dc0ee488f..018cdefb0e 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 diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua index c8974db868..bde7ceab81 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 96d21a7e76..39cf82fe61 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 d07c617455..ee4e755790 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 9923da520b..9b9a2cae98 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 7bf24eecde..7839360578 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 ff80c5fca7..00cb718a01 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 ad6cb60b85..3e47f403f1 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 5e40ba44fd..ebaed99071 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 40bdbf0d09..5bf66b44c0 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 fe303b4c93..904a524b66 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 90bd46b8b0..601a4c52b8 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 3bdcadcfb2..53e4d3d1ba 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 fd99f5eee4..277c7427d6 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 1b7727c7c8..f3df64596f 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 a7e0675bd2..29a4402380 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 7b9686bf97..0eb351bc69 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 1688ad4f0d..e5612b7309 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 9a058157b4..4122beac52 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 c5197e47c8..ce07bdac1c 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 a196563e02..edd64a355f 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 c96d339ec6..f64ec861f8 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 53ea769d9f..4ebd5807cf 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 d32af947ae..1afcdfd16d 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 b7161f57b6..34710a0b24 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 7b39f0b65e..d43a6e4d2e 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 0ea97c0332..2bc494aef8 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 c23c90428a..43637ca947 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 f64a3388a6..5949ec79a5 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 4fee585b81..13a767da11 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 163812b4c1..b3c696e1ad 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 e603949e17..668a020171 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 0529931a78..cd0bcb3367 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 0765a1d89f..9c6ed22f0f 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 a2b17b0296..98a3596521 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 9f2f25f3f2..f0705d4529 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 e40ca7f3db..440b2ef9c7 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 53435994e1..25b1e73c4d 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 5cc10477b0..6c9a35b909 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 7e42e41902..e59e7c2d3c 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 450314c7c8..eccc3dbdd6 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 a5bb6f3b04..dbe1bbcc82 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 f35f618d27..f0415455fa 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 10f991b74f..b075f805cb 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 c7bf518dc9..d1ad693878 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 20d0df369c..c9b813d329 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 70c2124de5..bb6e2f63fb 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 c2f98680cd..41756a2e39 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 72abc16e59..28bfc5ce3b 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 18ac641740..9944fcc305 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 3bfd976157..5b0fe196d3 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/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 e55c694764..18b53953e3 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 8e451abb11..d9255d3cab 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 37ef8b0488..c0141687dc 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 03ebfa1ea8..369f203bad 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 local heroConFigData 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/HandBookTalismanInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookTalismanInfoPanel.lua index 8d061f482c..163130d2c8 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/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index a3c048a04c..a1789e8906 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 heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua index a40458e0b6..e073770848 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 abc2521d23..d0e7a93005 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 diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPopup.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPopup.lua index 60b7be52f1..343f241bd3 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 e6b1885c65..0665b80463 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 local LoginRoot_Url = VersionManager:GetVersionInfo("serverUrl") diff --git a/Assets/ManagedResources/~Lua/Modules/Login/RegistPopup.lua b/Assets/ManagedResources/~Lua/Modules/Login/RegistPopup.lua index 0b232d717a..6e3bb9ef46 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 9e98ef6817..edd966183e 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 46ac2abdf1..fcf0d65184 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 f1e65c821b..b7c92fe4ff 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 82e2aaa7a8..3382a6a359 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 8b9f93a33e..1627eb1222 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 fe7c1d52fa..17407ab6de 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 131ca678c3..37eb596965 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 64a05287f1..1dd7295def 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 f07c0574f1..51dc1a1a80 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/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index fae061b4e2..9c43c62801 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GMPanel = Inherit(BasePanel) local this = MainPanel local chooseID diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 75de779b7d..3d2515551c 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("Base/BasePanel") require("Modules/Main/View/MainPlayerView") MainPanel = Inherit(BasePanel) local this = MainPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua index daf59453fc..4168985156 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 4a79c54588..678f20e6c8 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 1a345907f2..4c1324d099 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 a50d3ba365..f273396405 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 0672543fa6..dc9026d2a9 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 7919d6f45f..7e696c0490 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 5e842da29d..e5872a676d 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 497454fff8..7158d23d9a 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 a6d8aa51eb..6d7a0e5333 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 2e841f0fbe..598c7b1e3e 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 91b7eedbba..4f00959398 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 6393cf6dca..c6fccd52ea 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 93f99ac9d3..f44ba7b3e7 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 d07d7aae1c..2748045cf4 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 940ddbabd7..94b620f90b 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 ee4859c582..08a961918c 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 3fbf32da1a..6be0867be9 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 97fb844009..9867c22a4b 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 b15df204da..d36a12adf3 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 1dfc805707..f58a01a788 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 0b2c77e0c6..79da4a5eb4 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 e63c869ccd..613570c5cc 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 1b34872ba1..04eb340175 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 b7f7cf5797..6e0af543fa 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 f6f1f66012..c7ac74d4e2 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 f0ab2b65cc..64ff541019 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 4d466622e9..fbaf3ba106 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 4d0bd22c02..cf9caab017 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 660d309b33..0e44737c5f 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 955c031baf..638446b8e8 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 5c84dc524f..a1f78005f1 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 8f107bbb4f..f724a91027 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 da99c3562f..05c53faa38 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 63b4845d4f..d6a538de1a 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 8eb2320cee..69708d2161 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 72439f954b..c027b1148a 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 701eb5effa..ef2d4e4c79 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 70e969b355..b03029b9b2 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 1a9d6b1c53..3a5ac2ce6c 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 06f756bb33..b578ac421f 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 f418b46922..88755c2887 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 --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua index 89f1b9ad6b..32a7552ffd 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/NotEnoughPopup.lua b/Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua index add1cf7be5..cfd3a6bb6b 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 d929263021..1c7b7effe1 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 223b944127..37172ac17f 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/WidelyCallPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/WidelyCallPanel.lua index be5964af93..faab2ff255 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 9dca3fd1b8..f769ee1a29 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 52fd9271c6..65d75945f5 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 7f69ed2407..8526a16705 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 e813015063..cda9458489 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 18f3ef5bdf..769ef70be8 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 fd770572eb..7efdce7915 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/MissionManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua index ffc7b1a3d7..f36bbb5d3b 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 e13bc5f0e1..0cc75e402f 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/SecondaryMissionManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/SecondaryMissionManager.lua index e984d35f6d..80923b509e 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 c81a41880d..a65e52b3ad 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 25dd961602..a60bb6f991 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 a66f2743db..c4e5292c88 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 e459d0766a..c3c2965f8e 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/OnlineReward/OnlineRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/OnlineReward/OnlineRewardPanel.lua index c62f094568..b414ad5692 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/ActivityDetail.lua b/Assets/ManagedResources/~Lua/Modules/Operating/ActivityDetail.lua index 69a4edc116..5a9e919e3f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/ActivityDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/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/Operating/AttentionGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/AttentionGiftPage.lua index 570eff9fcf..a64ac35fb0 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 2101d84d1f..2ef4bdb856 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 54fe9aff04..6546bc7a66 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 a257468ae6..98dc5d3178 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName CumulativeSignInPage * @Description 累计签到 * @Date 2019/8/1 20:07 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua index 8bcdc85fb7..1be8113cb2 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 1ad488115b..b4c6bcca61 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua @@ -1,4 +1,4 @@ -local GrowthGiftPage = quick_class("GrowthGiftPage") +local GrowthGiftPage = quick_class("GrowthGiftPage") local curGiftsId--当前礼包Id local actRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)--读取礼包任务信息 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 b190e466bc..538b8c29ad 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/MonthCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua index 5598900959..3e91b37075 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua @@ -1,4 +1,4 @@ -local MonthCardPage = quick_class("MonthCardPage") +local MonthCardPage = quick_class("MonthCardPage") local addTimeNum = 30 * 24 * 60 * 60 local monthCardConFig = ConfigManager.GetConfig(ConfigName.MonthcardConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthRewardPreviewPopup.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthRewardPreviewPopup.lua index 779a6ee036..e7b3014808 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 2938d23a1a..b971baf90c 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 59ff52ba83..4289857a76 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/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua index 6b4b28893c..cf32d19d48 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua @@ -1,4 +1,4 @@ -local QianKunBox = quick_class("QianKunBox") +local QianKunBox = quick_class("QianKunBox") local ActivityDetail = require("Modules/Operating/ActivityDetail")--活动详情 local iconsData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardConfig,"Pool",4401) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyOnePanel.lua index 18d4f834b6..a72cb1b67f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/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/Operating/QianKunBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyTenPanel.lua index 5214f3c85b..d6b2856496 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/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/Operating/RewardPreview.lua b/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua index 105e14b415..d3b3cd8850 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/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/Operating/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua index d7ef1b4b95..5a24de5633 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua @@ -1,4 +1,4 @@ -local TimeLimitedCall= quick_class("TimeLimitedCall") +local TimeLimitedCall= quick_class("TimeLimitedCall") local ActivityDetail = require("Modules/Operating/ActivityDetail")--活动详情 local RewardPreview = require("Modules/Operating/RewardPreview")--奖励预览 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 8c53f71d47..2a29e32cf1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -1,4 +1,4 @@ ---- 什么又饿吧的鸡精 +--- 什么又饿吧的鸡精 UpperMonthCard = {} 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 ff7106b792..dca6f936f8 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 5fc112e49f..9229444de5 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 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua index 19268912be..1a37b6b95a 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 --- 注册物品及其获取恢复时间的方法 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua index b275fb5c9f..ee5ae2cd12 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 eee62e14a5..3c6fea66ad 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 6257d2a145..af03177a9c 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 b2daccf33f..73670b7e81 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 73cbd2dfb5..eb57160a34 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 1d567876f6..8e4a75d659 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 d403c7eb36..3ca0aece59 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/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index 4e6970f3f6..fbe2975a57 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 555556249b..5c66d27fd3 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 9e74e2f14a..453315d34f 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 c0d9ee4e9d..3dfd1e20e1 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 3f6a519857..207a6cc7e1 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 f1ee60f3f9..fd2dbdd632 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 54374a72a6..79a37d7f02 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 a5d53cc415..3d0fe1fb79 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 e76b57975f..ab8f5e0ca8 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 65a064895d..ec185870fc 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 ff7899af35..a54d76263d 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 7492c87a3b..a01d63bec7 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/HelpPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/HelpPopup.lua index 88a5c8bd87..5aee74127c 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 38dd76ec60..ef9ee1fbf9 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 9376559a11..ee6849b218 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 1e4bbaf26a..a6ff9a7824 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 7679d305ae..04fce8245d 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 20bb76d140..868ccfa8e1 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[11572] 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 5d6f3c0002..34d84d57c2 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 577aa76a23..98e65178ce 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 6d78a1636d..5b9d5a2a8d 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 a40750ce22..f00f7b827f 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 58ce76069f..7544c5e5bc 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 17c29143d6..9651415485 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 38964945a0..5af1f27b33 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 a815e053ab..8f0bdf4a9f 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 a2cb1a853c..e8262fcfcd 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 203c7a42b3..f4c51fbcf3 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 6036e1848f..798ee1c222 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 733f0b56c8..361b97a3f9 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 1c3385b4d1..9e9c1317ae 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 4707b3c086..c88433a80e 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 31fec047a2..306967b3de 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 d018f2661e..73cd4384ef 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 29eccafd9a..69c0c0c949 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 77176ee69e..87f4c7d9c8 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_EquipBatchSell.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua index a5aeb13dd0..ebf05238d8 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 c3f45af858..8a4ddee92a 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 8775026c4c..47771e9fa5 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 a5483af6c8..fc7a811cd4 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 6a82038ae0..afd20e2039 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 2549e3e1a7..401fb3c753 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_Onhook.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua index 64f8b41129..3c8ebd0060 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_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua index fb0b5775c4..a3b823c035 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 863ea4890f..df9009a639 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 c492aaa391..dbd2495c69 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 bc4214dcfd..6aa7ff68d9 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 2eeae2ac4d..09e443f048 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_TreasureCompound.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TreasureCompound.lua index 2b3ae3f46b..b1cb373dc9 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 50742a44cd..3a0fddbc48 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 397042736b..70bbdd1a23 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 117b386b85..9cb101a824 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 fa75bd25bd..50e8c723bc 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/Power/GiveMePowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua index 063d17c3c1..08f14faabf 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 a289e4fbeb..d32ea8ac4a 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 b3b82e9949..daba09aae9 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 3e93c89664..7aeefc698b 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 a5e04c5481..d95b58e8ec 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 ca5555f8d1..2665936518 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 1ea56666a5..51dcad2901 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 a52834b922..a72918eee3 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 e735df6a99..149d059c74 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 a7593a8b1b..5fc9987ec6 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 114def0d52..b145004fa9 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 814111220e..fd625b50b5 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 e825b35799..052f71efc4 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 7c308b7c83..64c5c01772 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 33e79cb34c..8abce36026 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 --需要显示的排行 diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index a314b05128..26a5c0e0e5 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 ea2eb73e1d..27992751d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua @@ -1,4 +1,4 @@ - + diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua index fdea1f5929..2830c9feb3 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 e4d8183234..d7d3bbb490 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 = quick_class("RechargeView") +local RechargeView = quick_class("RechargeView") function RechargeView:ctor(rootView, gameObject) self.rootView = rootView self.gameObject = gameObject diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua index c32bb09046..7710f6619c 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 5c95de60a0..2f09058ec8 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 390d2e78bb..a7e64fa79c 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 e1ec28c72a..390cc08d9a 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 67e6545d34..c398adb49b 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 386ffdcb6e..5424fe0f2a 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 1dfe218ff7..c6fa357caf 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 992ea992cb..bebcbfca3b 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 16840b32ce..3b4f925f7b 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 85199f50c8..0a9b9800a6 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 792d97e19c..00d9558c9e 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 627fb15b78..a2747d6788 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_Recall.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua index 7b04d6d082..a6b2beedf6 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/RewardBox/RewardBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua index 51cc6e1c72..8431c6dacf 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/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index 6384e23302..ef4db96613 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 44d77fbfd2..48cc3beefd 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 37ce21315a..1b1d17d812 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/RoleEquipChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua index 4a3208c1f1..e5e9a0f86e 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 0fb3503539..a1e18b559b 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 a74650fd6b..3f32d8ba02 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/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index d517415673..1279c3a421 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 --升级升星 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index 9a7e905788..e09cab5821 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 1c1f161389..3019ff3dd0 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 a9dadd6f43..5e3eb17cff 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 da617862a9..f549f468f8 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 e38168c64d..4555244415 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/RoleTalentPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua index 0c62865e38..873e87faa0 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 5a08c722b9..b0a446a3ab 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 a0fdca76b5..84405255f2 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 014aa87988..cfb9e3d14d 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/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua index 4ac755ce39..e50cf6face 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 0a3db532fe..16b9822410 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 7f69010c92..9aad30da2c 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/TalismanUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua index f54993be44..f9d23bdc18 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") TalismanUpStarListPanel = Inherit(BasePanel) local this = TalismanUpStarListPanel local curSelectHeroList={} diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarSuccessPanel.lua index 7322baa190..be774e8498 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 936965d3e5..7a52985f1d 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 71c1bbfeb6..982e8a72f8 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 e5bbcc4a6e..104c5f71a1 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 54d3890c5d..01e229ddf6 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 1548e1c751..eedb20ff2d 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 197437944f..756b77542f 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 1db48cc23d..a9083f8765 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 function SettingInfo:ctor(mainPanel, gameObject) self.mainPanel = mainPanel 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 0a9f260edb..7ac8b751c2 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 6c6b752bd3..26fa6b34f1 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 SettingPlayerRide = quick_class("SettingPlayerRide") local this = SettingPlayerRide local playerRideConFig --= ConfigManager.GetAllConfigsDataByKey(ConfigName.ItemConfig, "ItemType", ItemType.Ride) local proList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua index 9cde86f63a..2583823ded 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 SettingPlayerSkin = quick_class("SettingPlayerSkin") local this = SettingPlayerSkin local playerSkinConFig --= ConfigManager.GetAllConfigsDataByKey(ConfigName.ItemConfig, "ItemType", ItemType.Skin) local proList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua index d84a81739f..9e69227753 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 SettingPlayerTitle = quick_class("SettingPlayerTitle") local this = SettingPlayerTitle local playerTitleConFig --= ConfigManager.GetAllConfigsDataByKey(ConfigName.ItemConfig, "ItemType", ItemType.Title) local proList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalHalfPricePage.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalHalfPricePage.lua index 79a59ac172..c0b7f69668 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 060d3b932c..a567665a6a 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 7a45f1d3e5..94abfb3c1b 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 1810e5f516..5de5c5b699 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 ee8a705f05..5a1109c240 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 82d674c4df..5e90e41d6f 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 0c4c5b56e1..d094dfeccc 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 9cbc8dcd96..06a83a4b23 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 e4aad62add..7b0857e542 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 9affae3d59..c6554f9395 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 32313cdd46..1cacde5552 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 cb7009e019..fd968e914c 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 84c6f22cee..baac42a67a 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 b5f3ebdd2f..e5e9c0bd48 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 09d1ce00ca..1112cade13 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 2dabf6da82..a832785083 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 28ff4ed3cc..dbf8456038 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 03fed2ee0c..2610b1866d 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 ac8988ea84..754b7b7e55 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 5f644cb35b..0b11ddfa87 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 b1c5784df6..c99ac78caf 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 997a06d3da..7bc88fb800 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/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua index f511adf11d..7c62a1a2e6 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 f6a5be6a3c..ddc71e3f83 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 WorldBossTreasureConfig = ConfigManager.GetConfig(ConfigName.WorldBossTreasureConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua index 1721c9d923..79452dc460 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/TreasureOfHeaven/TreasureOfHeavenRewardPage.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenRewardPage.lua index 5f282702bb..e69de29bb2 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenRewardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenRewardPage.lua @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenScorePage.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenScorePage.lua index 5f282702bb..e69de29bb2 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenScorePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenScorePage.lua @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/BuyTreasureLevelPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/BuyTreasureLevelPanel.lua index ad0ad048be..cc41e8722c 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 b2d7359701..8772c3b362 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 6bd6f39ad5..821f08c4cc 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 0c977766af..3d3c9a83d1 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 542fb8e079..40d69fc377 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 52fca37f5d..4f9b5be383 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 4c02c15f83..41c18ef153 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 971ba3cd71..27afd5c0b5 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 bdfda1f2f7..a722ff8574 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 ea9dd20998..f951879bf5 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 ead7ef539b..0037652654 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 017bab748f..b4ee1255c9 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 3af2471b6f..ccbc83b3a3 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 6d804fb493..883cbbd840 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 2c1f5a18f0..29ef058de1 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 b93464ddbe..f133f7409c 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 c2fcb2682b..db1c63af5e 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 2e3a6457e8..01050d8a55 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 f8798c5819..d41b10882d 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 02c5f3b005..cbbdf8240f 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 3d7c811c26..fb7e400ab3 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 00e999dd47..2401af281c 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 1e69d25262..d926c6b9d3 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 5f63415714..a06421bced 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 6a150a501e..fe5e7f72a3 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 e622d70e5b..678bc7e01d 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 8daca9ef2a..c90aa5c597 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 9fbe8f1dd1..346466fa1a 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 1622b5c7f0..b10098a3bb 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/View/BtView.lua b/Assets/ManagedResources/~Lua/View/BtView.lua index afe5a8791c..3cb57e63e3 100644 --- a/Assets/ManagedResources/~Lua/View/BtView.lua +++ b/Assets/ManagedResources/~Lua/View/BtView.lua @@ -1,4 +1,4 @@ -BtView = {} +BtView = {} local this = BtView local bagPanelUI local RoleListPanelUI diff --git a/Assets/ManagedResources/~Lua/View/ChatTipView.lua b/Assets/ManagedResources/~Lua/View/ChatTipView.lua index be437a4cdb..f124885198 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[10384]}, 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 efdc795280..74c39a34b9 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/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index 8a0113aecf..f5ff8c8fb4 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 998f15cccc..601b532f33 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/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 282f34e59d..55830147e8 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/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index 67aae0664c..abfb331e47 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 rideLive diff --git a/Assets/ManagedResources/~Lua/View/RoleItemView.lua b/Assets/ManagedResources/~Lua/View/RoleItemView.lua index 9c5c02606c..5c45f0f14c 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 d3014a3a8f..bf69dcd278 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 c3df7bce60..075548e0fd 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 c9c25940fa..a9ec3e5003 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 f573f80722..b1727ce52f 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 e0012439a9..69ebd08c98 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 diff --git a/Assets/Scripts/Editor/convertutf8.cs b/Assets/Scripts/Editor/convertutf8.cs new file mode 100644 index 0000000000..ce955f80c9 --- /dev/null +++ b/Assets/Scripts/Editor/convertutf8.cs @@ -0,0 +1,263 @@ + +using UnityEngine; + +using UnityEditor; + +using System.IO; + +using System.Text; + + + +/// + +/// 这个是讲lua文件转化为UTF-8格式的工具 + +/// + + + +public class SetLuaToUTF8 : EditorWindow + +{ + + // 常量 // + + private const string EDITOR_VERSION = "v0.01"; // 这个编辑器的版本号 // + + // gui 相关 // + + private Vector2 m_scrollPos; // 记录 gui 界面的滚动 // + + + + private string m_luaPath = "ManagedResources/~Lua/"; // 文件路径 + + private string m_fileSuffix = ".lua"; // 文件后缀 + + + + /// + + /// 数据目录 + + /// + + static string AppDataPath + + { + + get { return Application.dataPath.ToLower(); } + + } + + + + [MenuItem("Lua/File to UTF-8 Encoding")] + + static void Init() + + { + + Debug.Log("初始化转化lua文件为UTF-8格式"); + + // Get existing open window or if none, make a new one: + + SetLuaToUTF8 window = (SetLuaToUTF8)EditorWindow.GetWindow(typeof(SetLuaToUTF8)); + + } + + + + // UI 按钮显示 // + + void OnGUI() + + { + + m_scrollPos = GUILayout.BeginScrollView(m_scrollPos, GUILayout.Width(Screen.width), GUILayout.Height(Screen.height)); + + GUILayout.BeginVertical(); // begin + + + + //-------------- 调试按钮 --------------// + + // 导出 UI 路径 // + + GUILayout.Label("==========================="); + + + + GUILayout.BeginHorizontal(); + + GUILayout.Label("要转化的路径: "); // + + m_luaPath = GUILayout.TextField(m_luaPath, 64); + + GUILayout.EndHorizontal(); + + GUILayout.BeginHorizontal(); + + GUILayout.Label("文件后缀: "); // + + m_fileSuffix = GUILayout.TextField(m_fileSuffix, 64); + + GUILayout.EndHorizontal(); + + if (GUILayout.Button("\n 文件转utf-8格式 \n")) // + + { + + this.Conversion(); + + } + + + + //-------------- end 调试按钮 --------------// + + GUILayout.Space(5); + + GUILayout.Label("工具版本号: " + EDITOR_VERSION); // + + GUILayout.EndVertical(); // end + + GUILayout.EndScrollView(); + + } + + + + // 开始转化 + + private void Conversion() + + { + + if (m_luaPath.Equals(string.Empty)) + + { + + return; + + } + + + + if (!IsFolderExists(m_luaPath)) + { + + Debug.LogError("找不到文件夹路径!"); + + return; + + } + + + + string path = AppDataPath + "/" + m_luaPath; + + string[] files = Directory.GetFiles(path, "*", SearchOption.AllDirectories); + + foreach (string file in files) + + { + + if (!file.EndsWith(m_fileSuffix)) continue; + + string strTempPath = file.Replace(@"\", "/"); + + Debug.Log("文件路径:" + strTempPath); + + ConvertFileEncoding(strTempPath, null, new UTF8Encoding(false)); + + } + + + + AssetDatabase.Refresh(); + + Debug.Log("格式转换完成!"); + + } + + + + /// 检测是否存在文件夹 + + private static bool IsFolderExists(string folderPath) + + { + + if (folderPath.Equals(string.Empty)) + + { + + return false; + + } + + + + return Directory.Exists(GetFullPath(folderPath)); + + } + + + + /// 返回Application.dataPath下完整目录 + + private static string GetFullPath(string srcName) + + { + + if (srcName.Equals(string.Empty)) + + { + + return Application.dataPath; + + } + + + + if (srcName[0].Equals('/')) + + { + + srcName.Remove(0, 1); + + } + + + + return Application.dataPath + "/" + srcName; + + } + + + + /// + + /// 文件编码转换 + + /// + + /// 源文件 + + /// 目标文件,如果为空,则覆盖源文件 + + /// 目标编码 + + private static void ConvertFileEncoding(string sourceFile, string destFile, Encoding targetEncoding) + + { + + destFile = string.IsNullOrEmpty(destFile) ? sourceFile : destFile; + + File.WriteAllText(destFile, File.ReadAllText(sourceFile, Encoding.UTF8), targetEncoding); + + } + +} diff --git a/Assets/Scripts/Editor/convertutf8.cs.meta b/Assets/Scripts/Editor/convertutf8.cs.meta new file mode 100644 index 0000000000..2ea1382f13 --- /dev/null +++ b/Assets/Scripts/Editor/convertutf8.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 861c974ba4188214bbef6c8b3dc18efc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: