From 4d19e7ce987ba983a9030708ff987ccfc707bb8a Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 25 Aug 2020 15:46:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=96=87=E8=A1=A8=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 6 +- .../ManagedResources/~Lua/Common/Language.lua | 99 ++++++++++++++++++- .../~Lua/Common/functions.lua | 4 +- .../Modules/Achievement/AchievementPanel.lua | 2 +- .../ActivityGift/ActivityGiftManager.lua | 2 +- .../ActivityGift/CourtesyDressPanel.lua | 2 +- .../ActivityGift/OpenSeverWelfarePanel.lua | 2 +- .../ActivityGift/View/SevenDayGift.lua | 2 +- .../ActivityGift/WarPowerSortPanel.lua | 2 +- .../Adventure/AdventureAlianInvasionPanel.lua | 2 +- .../Adventure/AdventureExploreRewardPanel.lua | 2 +- .../Adventure/AdventureGetRewardPopup.lua | 2 +- .../Modules/Adventure/AdventureMainPanel.lua | 2 +- .../Modules/Adventure/AdventureManager.lua | 2 +- .../Adventure/AdventureRewardDetailPopup.lua | 2 +- .../Adventure/AdventureUpLevelPanel.lua | 2 +- .../Modules/Adventure/View/AdventureView.lua | 2 +- .../~Lua/Modules/Alien/AlienMainPanel.lua | 2 +- .../Modules/Alien/AlienRankRewardPopup.lua | 2 +- .../~Lua/Modules/Arena/ArenaMainPanel.lua | 2 +- .../~Lua/Modules/Arena/ArenaManager.lua | 2 +- .../~Lua/Modules/Arena/ArenaRecordPopup.lua | 2 +- .../~Lua/Modules/Arena/ArenaResultPopup.lua | 2 +- .../~Lua/Modules/Arena/ArenaTypePanel.lua | 2 +- .../~Lua/Modules/Arena/View/ArenaView.lua | 2 +- .../~Lua/Modules/Arena/View/RankView.lua | 2 +- .../~Lua/Modules/Arena/View/RewardView.lua | 2 +- .../ArenaTopMatch/ATMMyGuessHistoryPopup.lua | 2 +- .../ArenaTopMatch/ATMTeamRankPopup.lua | 2 +- .../ArenaTopMatchGuessTipViewPopup.lua | 2 +- .../ArenaTopMatch/ArenaTopMatchManager.lua | 2 +- .../ArenaTopMatch/ArenaTopMatchPanel.lua | 2 +- .../Modules/ArenaTopMatch/DoGuessPopup.lua | 2 +- .../ArenaTopMatch/GuessCoinDropPopup.lua | 2 +- .../Modules/ArenaTopMatch/RecordPopup.lua | 2 +- .../TopMatchPlayBattleAinSelectPopup.lua | 2 +- .../ArenaTopMatch/View/ATM_CommonInfo.lua | 2 +- .../View/ATM_EliminationView.lua | 2 +- .../ArenaTopMatch/View/ATM_GuessTipView.lua | 2 +- .../ArenaTopMatch/View/ATM_GuessView.lua | 2 +- .../ArenaTopMatch/View/ATM_MainMatchView.lua | 2 +- .../ArenaTopMatch/View/ATM_RankView.lua | 2 +- .../ArenaTopMatch/View/ATM_RewardView.lua | 2 +- .../Modules/ArenaTopMatch/View/ATM_Title.lua | 2 +- .../~Lua/Modules/Bag/BagManager.lua | 2 +- .../~Lua/Modules/Bag/BagPanel.lua | 2 +- .../Modules/Bag/BagResolveAnCompoundPanel.lua | 2 +- .../~Lua/Modules/Battle/BattleManager.lua | 2 +- .../~Lua/Modules/Battle/BattlePool.lua | 2 +- .../Modules/Battle/BattleRecordManager.lua | 6 +- .../Battle/Config/FightEffectAudioConfig.lua | 2 +- .../Modules/Battle/Config/LuaFileConfig.lua | 2 +- .../Battle/Config/PokemonEffectConfig.lua | 2 +- .../Modules/Battle/Logic/Base/BattleEvent.lua | 2 +- .../~Lua/Modules/Battle/Logic/Base/Buff.lua | 2 +- .../Modules/Battle/Logic/Base/Passivity.lua | 2 +- .../~Lua/Modules/Battle/Logic/Base/Random.lua | 2 +- .../Modules/Battle/Logic/Base/RoleData.lua | 2 +- .../~Lua/Modules/Battle/Logic/Base/Skill.lua | 2 +- .../Modules/Battle/Logic/BattleLogManager.lua | 2 +- .../~Lua/Modules/Battle/Logic/BattleLogic.lua | 2 +- .../~Lua/Modules/Battle/Logic/Buff/Aura.lua | 2 +- .../~Lua/Modules/Battle/Logic/Buff/Brand.lua | 2 +- .../Modules/Battle/Logic/Buff/Control.lua | 2 +- .../~Lua/Modules/Battle/Logic/Buff/Curse.lua | 2 +- .../~Lua/Modules/Battle/Logic/Buff/DOT.lua | 2 +- .../~Lua/Modules/Battle/Logic/Buff/HOT.lua | 2 +- .../~Lua/Modules/Battle/Logic/Buff/Immune.lua | 2 +- .../~Lua/Modules/Battle/Logic/Buff/NoDead.lua | 2 +- .../Battle/Logic/Buff/PropertyChange.lua | 2 +- .../~Lua/Modules/Battle/Logic/Buff/Shield.lua | 2 +- .../Battle/Logic/Misc/BattleDefine.lua | 2 +- .../Battle/Logic/Misc/BattleDictionary.lua | 2 +- .../Modules/Battle/Logic/Misc/BattleList.lua | 2 +- .../Battle/Logic/Misc/BattleObjectPool.lua | 2 +- .../Modules/Battle/Logic/Misc/BattleQueue.lua | 2 +- .../Modules/Battle/Logic/Misc/BattleUtil.lua | 2 +- .../Modules/Battle/Logic/OutDataManager.lua | 2 +- .../~Lua/Modules/Battle/Logic/RoleLogic.lua | 2 +- .../~Lua/Modules/Battle/Logic/RoleManager.lua | 2 +- .../Modules/Battle/Logic/SkillManager.lua | 2 +- .../Modules/Battle/Test/BattleSetView.lua | 2 +- .../Modules/Battle/Test/BattleTestPanel.lua | 2 +- .../Modules/Battle/View/BattleBestPopup.lua | 2 +- .../Modules/Battle/View/BattleEndPanel.lua | 2 +- .../~Lua/Modules/Battle/View/BattlePanel.lua | 2 +- .../Battle/View/BattleRoleShowView.lua | 2 +- .../Battle/View/BattleStageTipPopup.lua | 2 +- .../~Lua/Modules/Battle/View/BattleView.lua | 2 +- .../~Lua/Modules/Battle/View/BuffView.lua | 2 +- .../Modules/Battle/View/DamageResultPanel.lua | 2 +- .../~Lua/Modules/Battle/View/RoleView.lua | 2 +- .../BindPhone/BindPhoneNumberManager.lua | 2 +- .../Modules/BindPhone/ConfirmBindPanel.lua | 2 +- .../~Lua/Modules/Carbon/CarbonManager.lua | 2 +- .../Modules/Carbon/CarbonMopUpEndPanel.lua | 2 +- .../Modules/Carbon/CarbonScoreSortPanel.lua | 2 +- .../~Lua/Modules/Carbon/CarbonTypePanel.lua | 2 +- .../~Lua/Modules/Carbon/CarbonTypePanelV2.lua | 8 +- .../~Lua/Modules/Carbon/CarbonTypePanelV3.lua | 2 +- .../~Lua/Modules/Carbon/DailyCarbonPanel.lua | 2 +- .../Carbon/EliteCarbonAchievePanel.lua | 2 +- .../~Lua/Modules/Carbon/EliteCarbonPanel.lua | 2 +- .../Modules/Carbon/EndLessCarbonPanel.lua | 2 +- .../~Lua/Modules/Carbon/MapLeavePanel.lua | 2 +- .../~Lua/Modules/Carbon/MapStatsPanel.lua | 2 +- .../~Lua/Modules/Carbon/MinMapPopup.lua | 2 +- .../~Lua/Modules/Carbon/PlotCarbonPanel.lua | 2 +- .../Modules/Carbon/PlotRewardPreviewPupop.lua | 2 +- .../~Lua/Modules/Carbon/TrialCarbonPanel.lua | 2 +- .../~Lua/Modules/Carbon/TrialResetPopup.lua | 2 +- .../Modules/Carbon/XuanYuanMirrorManager.lua | 2 +- .../Modules/Carbon/XuanYuanMirrorPanel.lua | 24 ++--- .../Carbon/XuanYuanMirrorPanelList.lua | 18 ++-- .../Carbon/XuanYuanMirrorRankPopup.lua | 2 +- .../Carbon/XuanYuanMirrorRewardSortPopup.lua | 2 +- .../~Lua/Modules/Chat/ChatManager.lua | 4 +- .../~Lua/Modules/Chat/ChatPanel.lua | 2 +- .../~Lua/Modules/Chat/FriendChatManager.lua | 2 +- .../~Lua/Modules/Chat/FriendChatPanel.lua | 2 +- .../~Lua/Modules/Chat/HorseRaceManager.lua | 2 +- .../~Lua/Modules/Common/CountDownTimer.lua | 2 +- .../LimitScrollView/LimitNodeController.lua | 2 +- .../LimitScrollView/LimitScrollView.lua | 2 +- .../~Lua/Modules/Common/MoneyUtil.lua | 4 +- .../~Lua/Modules/Common/Pool/CommonPool.lua | 2 +- .../Modules/Common/Pool/Item/PlayerHead.lua | 2 +- .../~Lua/Modules/Common/Pool/PoolItemBase.lua | 2 +- .../~Lua/Modules/Common/TabBox.lua | 2 +- .../~Lua/Modules/Compound/CompoundPanel.lua | 2 +- .../Compound/CompoundSelectListPopup.lua | 2 +- .../Compound/view/CompoundPanel_Equip.lua | 2 +- .../Compound/view/CompoundPanel_SoulPrint.lua | 2 +- .../Compound/view/CompoundPanel_Talisman.lua | 2 +- .../Compound/view/CompoundPanel_Treasure.lua | 2 +- .../CompoundHero/CompoundHeroPanel.lua | 6 +- .../view/CompoundHero_Compound.lua | 2 +- .../view/CompoundHero_Replace.lua | 10 +- .../DailyRecharge/DailyRechargeManager.lua | 2 +- .../DailyRecharge/DailyRechargePanel.lua | 2 +- .../DataCenterService/BuglyManager.lua | 2 +- .../DataCenterService/CustomEventManager.lua | 2 +- .../DataCenterService/DataCenterManager.lua | 2 +- .../DataCenterService/TapDBManager.lua | 2 +- .../ThinkingAnalyticsManager.lua | 2 +- .../DiffMonster/DemonActivatePanel.lua | 2 +- .../Modules/DiffMonster/DemonInfoPanel.lua | 2 +- .../DemonPartsActiveSuccessPanel.lua | 2 +- .../DiffMonster/DemonPartsUpStarPanel.lua | 2 +- .../DemonPartsUpStarSuccessPanel.lua | 2 +- .../Modules/DiffMonster/DemonUpGradePanel.lua | 2 +- .../DiffMonsterAttributeAdditionPanel.lua | 2 +- .../DiffMonster/DiffMonsterManager.lua | 2 +- .../Modules/DiffMonster/DiffMonsterPanel.lua | 2 +- .../DiffMonster/DiffMonsterPreviewPanel.lua | 2 +- .../DiffMonsterPreviewSecretBoxPanel.lua | 2 +- .../DiffMonsterUpGradSuccessPanel.lua | 2 +- .../DynamicActivity/ActivityDetail.lua | 2 +- .../DynamicActivity/DynamicActivityPanel.lua | 2 +- .../DynamicActivity/LeiJiChongZhiPage.lua | 16 +-- .../DynamicActivity/PoZhenZhuXianPage.lua | 22 ++--- .../Modules/DynamicActivity/QianKunBox.lua | 2 +- .../DynamicActivity/QianKunBoxBuyOnePanel.lua | 2 +- .../DynamicActivity/QianKunBoxBuyTenPanel.lua | 2 +- .../Modules/DynamicActivity/RewardPreview.lua | 2 +- .../DynamicActivity/TimeLimitedCall.lua | 4 +- .../DynamicActivity/XianShiShangShi.lua | 6 +- .../DynamicActivity/ZhenQiYiBaoPage.lua | 6 +- .../Modules/EightDay/EightDayGiftPanel.lua | 2 +- .../Modules/EightDay/EightDayRewardItem.lua | 2 +- .../EliteMonster/EliteMonsterManager.lua | 2 +- .../EliteMonster/EliteMonsterPanel.lua | 2 +- .../Modules/EliteMonster/MonsterShowPanel.lua | 2 +- .../~Lua/Modules/Equip/EquipManager.lua | 2 +- .../~Lua/Modules/Equip/TalismanManager.lua | 2 +- .../Expedition/ExpeditionHalidomPanel.lua | 2 +- .../ExpeditionHeroListInfoPopup.lua | 2 +- .../ExpeditionHeroListResurgencePopup.lua | 2 +- .../Expedition/ExpeditionMainPanel.lua | 2 +- .../Modules/Expedition/ExpeditionManager.lua | 2 +- .../Expedition/ExpeditionMonsterInfoPopup.lua | 2 +- .../Modules/Expedition/ExpeditionPreView.lua | 2 +- .../ExpeditionSelectHalidomPanel.lua | 2 +- .../View/ExpeditionMonsterInfo_Greed.lua | 2 +- .../View/ExpeditionMonsterInfo_Monster.lua | 2 +- .../View/ExpeditionMonsterInfo_Recruit.lua | 2 +- .../View/ExpeditionMonsterInfo_Shop.lua | 2 +- .../View/ExpeditionMonsterInfo_Trail.lua | 2 +- .../~Lua/Modules/Expert/DiffMonsterBuy.lua | 2 +- .../~Lua/Modules/Expert/ExChange.lua | 2 +- .../~Lua/Modules/Expert/Expert.lua | 2 +- .../~Lua/Modules/Expert/ExpertPanel.lua | 2 +- .../Modules/Expert/ExpertRewardSortPanel.lua | 2 +- .../~Lua/Modules/Expert/Expert_UpLv.lua | 2 +- .../~Lua/Modules/Expert/GiftBuy.lua | 2 +- .../~Lua/Modules/Expert/HeroStarFeedPage.lua | 2 +- .../~Lua/Modules/Expert/PatFace.lua | 2 +- .../Expert/PatFaceDiffMonsterInfoPanel.lua | 2 +- .../~Lua/Modules/Expert/PatFaceFindFairy.lua | 2 +- .../~Lua/Modules/Expert/PatFaceManager.lua | 2 +- .../~Lua/Modules/Expert/PatFacePanel.lua | 2 +- .../~Lua/Modules/Expert/WeekCard.lua | 2 +- .../Modules/Fight/FastExploreInfoPopup.lua | 2 +- .../Fight/FightAreaRewardFullPopup.lua | 2 +- .../Modules/Fight/FightAreaRewardPopup.lua | 2 +- .../~Lua/Modules/Fight/FightEndLvUpPanel.lua | 2 +- .../Modules/Fight/FightLevelSwitchPopup.lua | 2 +- .../~Lua/Modules/Fight/FightManager.lua | 2 +- .../Modules/Fight/FightMiddleChoosePanel.lua | 2 +- .../~Lua/Modules/Fight/FightMopUpEndPanel.lua | 2 +- .../Modules/Fight/FightPointPassMainPanel.lua | 2 +- .../Modules/Fight/FightPointPassManager.lua | 2 +- .../Modules/Fight/FightPointPassRankPopup.lua | 2 +- .../Fight/FightSelectAreaShowMopUpPanel.lua | 2 +- .../Modules/Fight/FightSmallChoosePanel.lua | 2 +- .../Fight/View/FightMapIconShowView.lua | 2 +- .../Fight/View/FightMiddleChooseMapView.lua | 2 +- .../Modules/Fight/View/FightPointMapView.lua | 2 +- .../Modules/Fight/View/InvadeMonsterView.lua | 2 +- .../~Lua/Modules/Fight/View/RoleShowView.lua | 2 +- .../Modules/FindFairy/FindFairyManager.lua | 2 +- .../~Lua/Modules/FindFairy/FindFairyPanel.lua | 2 +- .../~Lua/Modules/FindFairy/FindFairyPopup.lua | 2 +- .../FindFairy/View/FindFairy_GiftFiveView.lua | 2 +- .../FindFairy/View/FindFairy_GiftFourView.lua | 2 +- .../FindFairy/View/FindFairy_GiftOneView.lua | 2 +- .../View/FindFairy_GiftThreeView.lua | 2 +- .../FindFairy/View/FindFairy_GiftTwoView.lua | 2 +- .../FindFairy/View/FindFairy_MainView.lua | 2 +- .../FindTreasureDispatchPanel.lua | 2 +- .../FindTreasure/FindTreasureMainPanel.lua | 2 +- .../FindTreasure/FindTreasureManager.lua | 2 +- .../FindTreasure/FindTreasureVipPopup.lua | 2 +- .../Modules/FirstRecharge/DayRewardItem.lua | 2 +- .../FirstRecharge/FirstRechargeManager.lua | 2 +- .../FirstRecharge/FirstRechargePanel.lua | 2 +- .../FormFightMatch/FightMatchPanel.lua | 2 +- .../FormFightMatch/MapFightBuyExtraPopup.lua | 2 +- .../FormFightMatch/MapFightRewardPanel.lua | 2 +- .../FormFightMatch/MatchDataManager.lua | 2 +- .../Modules/FormFightMatch/MatchFight.lua | 2 +- .../Modules/FormFightMatch/MatchingPopup.lua | 2 +- .../Modules/FormFightMatch/RankInfoView.lua | 2 +- .../Modules/FormFightMatch/RewardView.lua | 2 +- .../~Lua/Modules/Formation/ElementPopup.lua | 2 +- .../Modules/Formation/FormationEditPopup.lua | 4 +- .../Formation/FormationExamplePopup.lua | 2 +- .../Modules/Formation/FormationManager.lua | 2 +- .../~Lua/Modules/Formation/FormationPanel.lua | 2 +- .../Modules/Formation/FormationPanelV2.lua | 2 +- .../Modules/Formation/FormationSetPanel.lua | 2 +- .../Formation/View/AdventureBossFormation.lua | 2 +- .../Formation/View/AdventureFormation.lua | 2 +- .../Formation/View/ArenaAttackFormation.lua | 2 +- .../Formation/View/ArenaDefendFormation.lua | 2 +- .../Formation/View/ArenaTopMatchFormation.lua | 2 +- .../Formation/View/CarbonFormation.lua | 2 +- .../Formation/View/EliteMonsterFormation.lua | 2 +- .../Formation/View/ExpeditionFormation.lua | 2 +- .../Formation/View/FormFightFormation.lua | 2 +- .../Formation/View/GuildBossFormation.lua | 2 +- .../View/GuildCarDeleayFormation.lua | 2 +- .../Formation/View/GuildDeathPosFormation.lua | 2 +- .../View/GuildFightAttackFormation.lua | 2 +- .../View/GuildFightDefendFormation.lua | 2 +- .../View/GuildTranscriptFormation.lua | 2 +- .../Modules/Formation/View/MainFormation.lua | 2 +- .../Formation/View/MonsterCampFormation.lua | 2 +- .../Formation/View/PlayWithSBFormation.lua | 2 +- .../Modules/Formation/View/SaveFormation.lua | 2 +- .../Modules/Formation/View/StoryFormation.lua | 2 +- .../View/XuanYuanMirrorFormation.lua | 6 +- .../GlobalActTimeCtrl/ActTimeCtrlManager.lua | 2 +- .../GlobalActTimeCtrl/FuncOpenClass.lua | 2 +- .../FunctionOpenMananger.lua | 2 +- .../GoodFriend/GoodFriendMainPanel.lua | 2 +- .../Modules/GoodFriend/GoodFriendManager.lua | 2 +- .../~Lua/Modules/Guide/GuidePanel.lua | 2 +- .../Modules/Guild/Aid/GuildAidMainPopup.lua | 2 +- .../Modules/Guild/Aid/GuildAidManager.lua | 2 +- .../Modules/Guild/Aid/GuildAid_AidRecord.lua | 2 +- .../Modules/Guild/Aid/GuildAid_GuildAid.lua | 2 +- .../~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua | 2 +- .../Guild/Boss/GuildBossFightResultPopup.lua | 2 +- .../Modules/Guild/Boss/GuildBossLogPopup.lua | 2 +- .../Modules/Guild/Boss/GuildBossManager.lua | 2 +- .../Modules/Guild/Boss/GuildBossPanel.lua | 2 +- .../Modules/Guild/Boss/GuildBossTipPopup.lua | 2 +- .../CarDelay/GuildCarDelayFindBossPopup.lua | 2 +- .../Guild/CarDelay/GuildCarDelayLootPopup.lua | 2 +- .../CarDelay/GuildCarDelayLootRecordPopup.lua | 2 +- .../Guild/CarDelay/GuildCarDelayMainPanel.lua | 2 +- .../Guild/CarDelay/GuildCarDelayManager.lua | 2 +- .../CarDelay/GuildCarDelayRewardSortPopup.lua | 2 +- .../Guild/DeathPos/DeathPosInfoPanel.lua | 2 +- .../Guild/DeathPos/DeathPosManager.lua | 2 +- .../Modules/Guild/DeathPos/DeathPosPanel.lua | 2 +- .../Guild/DeathPos/DeathPosRankPopup.lua | 2 +- .../Guild/DeathPos/DeathPosRewardPopup.lua | 2 +- .../~Lua/Modules/Guild/GuildChangePopup.lua | 2 +- .../~Lua/Modules/Guild/GuildCreatePopup.lua | 2 +- .../~Lua/Modules/Guild/GuildFetePopup.lua | 2 +- .../Guild/GuildFightAttackInfoPopup.lua | 2 +- .../Guild/GuildFightAttackLogPopup.lua | 2 +- .../Guild/GuildFightAttackTipPopup.lua | 2 +- .../Guild/GuildFightDefendInfoPopup.lua | 2 +- .../~Lua/Modules/Guild/GuildFightManager.lua | 2 +- .../Guild/GuildFightMatchSuccessPopup.lua | 2 +- .../Modules/Guild/GuildFightMatchingPopup.lua | 2 +- .../~Lua/Modules/Guild/GuildFightPopup.lua | 2 +- .../Modules/Guild/GuildFightResultPopup.lua | 2 +- .../~Lua/Modules/Guild/GuildFindPopup.lua | 2 +- .../~Lua/Modules/Guild/GuildGetStarPopup.lua | 2 +- .../~Lua/Modules/Guild/GuildInfoPopup.lua | 2 +- .../~Lua/Modules/Guild/GuildLogoPopup.lua | 2 +- .../~Lua/Modules/Guild/GuildMainCityPanel.lua | 2 +- .../~Lua/Modules/Guild/GuildManager.lua | 2 +- .../Modules/Guild/GuildMemberInfoPopup.lua | 2 +- .../~Lua/Modules/Guild/MyGuildManager.lua | 2 +- .../RedPacketView/GuildRedPacketManager.lua | 2 +- .../Guild/RedPacketView/RedPacketPanel.lua | 2 +- .../Guild/RedPacketView/RedPacketPopup.lua | 2 +- .../Guild/RedPacketView/RedPacket_GetView.lua | 2 +- .../RedPacketView/RedPacket_RankView.lua | 2 +- .../RedPacketView/RedPacket_SendView.lua | 2 +- .../Modules/Guild/Skill/GuildSkillManager.lua | 2 +- .../Guild/Skill/GuildSkillUpLvPopup.lua | 2 +- .../Transcript/GuildTranscriptMainPopup.lua | 60 +++++------ .../Transcript/GuildTranscriptManager.lua | 6 +- .../GuildTranscriptRewardSortPanel.lua | 2 +- .../Modules/Guild/View/GuildMemberView.lua | 2 +- .../Modules/Guild/View/GuildSceneView.lua | 2 +- .../HandBook/HandBookEquipInfoPanel.lua | 2 +- .../HandBookHeroAndEquipListPanel.lua | 2 +- .../HandBook/HandBookHeroInfoPanel.lua | 2 +- .../Modules/HandBook/HandBookMainPanel.lua | 2 +- .../HandBook/HandBookTalismanInfoPanel.lua | 2 +- .../~Lua/Modules/Hero/HeroManager.lua | 2 +- .../~Lua/Modules/Login/LoginManager.lua | 2 +- .../~Lua/Modules/Login/LoginPanel.lua | 2 +- .../~Lua/Modules/Login/LoginPopup.lua | 2 +- .../~Lua/Modules/Login/NoticePopup.lua | 2 +- .../~Lua/Modules/Login/RegistPopup.lua | 2 +- .../~Lua/Modules/Login/ServerListItem.lua | 2 +- .../Modules/Login/ServerListSelectPanel.lua | 2 +- .../~Lua/Modules/LuckyCat/LuckyCatManager.lua | 2 +- .../~Lua/Modules/LuckyCat/LuckyCatPanel.lua | 4 +- .../~Lua/Modules/LuckyCat/View/LuckyCat.lua | 2 +- .../LuckyTurnTable/LuckyTurnTableManager.lua | 2 +- .../LuckyTurnTable/LuckyTurnTablePanel.lua | 6 +- .../~Lua/Modules/Mail/MailMainPanel.lua | 2 +- .../~Lua/Modules/Mail/MailManager.lua | 2 +- .../~Lua/Modules/Mail/MainSingleInfoPanel.lua | 2 +- .../~Lua/Modules/Main/GMPanel.lua | 2 +- .../~Lua/Modules/Main/MainPanel.lua | 4 +- .../~Lua/Modules/Main/View/MainPlayerView.lua | 2 +- .../~Lua/Modules/Map/BuffChoosePanel.lua | 2 +- .../~Lua/Modules/Map/BuffOptionPanel.lua | 2 +- .../~Lua/Modules/Map/Config/MapConfig.lua | 2 +- .../~Lua/Modules/Map/EndLessMapManager.lua | 2 +- .../Map/FoodBuff/Buff/ExploreFunc/f1.lua | 2 +- .../Map/FoodBuff/Buff/ExploreFunc/f2.lua | 2 +- .../Map/FoodBuff/Buff/ExploreFunc/f3.lua | 2 +- .../Map/FoodBuff/Buff/ExploreFunc/f4.lua | 2 +- .../Map/FoodBuff/Buff/ExploreFunc/f5.lua | 2 +- .../Map/FoodBuff/Buff/ExploreFunc/f6.lua | 2 +- .../Map/FoodBuff/Buff/foodbuff_fight.lua | 2 +- .../Map/FoodBuff/Buff/foodbuff_map.lua | 2 +- .../~Lua/Modules/Map/FoodBuff/FoodBuff.lua | 2 +- .../~Lua/Modules/Map/FoodBuffManager.lua | 2 +- .../Modules/Map/Logic/TileMapController.lua | 2 +- .../~Lua/Modules/Map/Logic/TileMapData.lua | 2 +- .../~Lua/Modules/Map/Logic/TileMapView.lua | 2 +- .../~Lua/Modules/Map/MapAwardPanel.lua | 2 +- .../~Lua/Modules/Map/MapManager.lua | 2 +- .../~Lua/Modules/Map/MapOptionPanel.lua | 2 +- .../~Lua/Modules/Map/MapPanel.lua | 2 +- .../~Lua/Modules/Map/MapTrialManager.lua | 2 +- .../~Lua/Modules/Map/ShowEnemyInfoPanel.lua | 2 +- .../~Lua/Modules/Map/TrialMapPanel.lua | 2 +- .../Map/TrialMiniGame/Logic/Game_13.lua | 2 +- .../Map/TrialMiniGame/Logic/Game_14.lua | 2 +- .../Map/TrialMiniGame/Logic/Game_15.lua | 2 +- .../Map/TrialMiniGame/Logic/Game_16.lua | 2 +- .../Map/TrialMiniGame/Logic/Game_17.lua | 2 +- .../Map/TrialMiniGame/Logic/Game_18.lua | 2 +- .../TrialMiniGame/TrialMiniGameManager.lua | 2 +- .../Map/TrialMiniGame/TrialMiniGamePanel.lua | 2 +- .../~Lua/Modules/Map/TrialOpPanel.lua | 2 +- .../Map/View/CarbonMissionTypeView.lua | 2 +- .../~Lua/Modules/Map/View/EndLessMapView.lua | 2 +- .../~Lua/Modules/Map/View/IconShowView.lua | 2 +- .../~Lua/Modules/Map/View/MapControllView.lua | 2 +- .../~Lua/Modules/Map/View/MapMissionView.lua | 2 +- .../~Lua/Modules/Map/View/MapPlayerView.lua | 2 +- .../~Lua/Modules/Map/View/MapPointView.lua | 2 +- .../~Lua/Modules/Map/View/PointHandleView.lua | 2 +- .../~Lua/Modules/MapFight/FightUIManager.lua | 2 +- .../~Lua/Modules/MapFight/MapFightManager.lua | 2 +- .../~Lua/Modules/MapFight/MapFightPanel.lua | 2 +- .../Modules/MapFight/MapFightResultPopup.lua | 2 +- .../~Lua/Modules/MapFight/RoomManager.lua | 2 +- .../~Lua/Modules/MapFight/View/MapActor.lua | 2 +- .../~Lua/Modules/MapFight/View/MapAgent.lua | 2 +- .../MapFight/View/MapFightControllView.lua | 2 +- .../Modules/MapFight/View/MapPointMineral.lua | 2 +- .../~Lua/Modules/MapFight/View/UICtrlView.lua | 2 +- .../~Lua/Modules/Message/CurlingTipPanel.lua | 2 +- .../~Lua/Modules/Message/GongGaoPanel.lua | 2 +- .../Modules/Message/HorseRaceLampView.lua | 2 +- .../~Lua/Modules/Message/LoadingPanel.lua | 2 +- .../Modules/Message/MissionDailyTipPanel.lua | 2 +- .../~Lua/Modules/Message/MsgPanel.lua | 2 +- .../~Lua/Modules/Message/NotEnoughPopup.lua | 2 +- .../~Lua/Modules/Message/PopupTipPanel.lua | 2 +- .../~Lua/Modules/Message/RequestPanel.lua | 2 +- .../~Lua/Modules/Message/SwitchPanel.lua | 2 +- .../~Lua/Modules/Message/WidelyCallPanel.lua | 2 +- .../~Lua/Modules/Mission/BHController.lua | 2 +- .../Modules/Mission/Behaviour/BHBattle.lua | 2 +- .../~Lua/Modules/Mission/Behaviour/BHBuff.lua | 2 +- .../Mission/Behaviour/BHCheckMission.lua | 2 +- .../Mission/Behaviour/BHDeletePoint.lua | 2 +- .../Mission/Behaviour/BHMapProgressChange.lua | 2 +- .../Modules/Mission/Behaviour/BHMoveTo.lua | 2 +- .../Modules/Mission/Behaviour/BHNewPoint.lua | 2 +- .../Mission/Behaviour/BHParseMission.lua | 2 +- .../Mission/Behaviour/BHShowProgress.lua | 2 +- .../Mission/Behaviour/BHShowReward.lua | 2 +- .../Mission/Behaviour/BHSpendGoods.lua | 2 +- .../Modules/Mission/MissionDailyPanel.lua | 12 +-- .../Mission/MissionDailyPanel_Achievement.lua | 2 +- .../Mission/MissionDailyPanel_Daily.lua | 2 +- ...ssionDailyPanel_QingLongSecretTreasure.lua | 28 +++--- .../MissionDailyPanel_SecretTreasureTrail.lua | 22 ++--- .../~Lua/Modules/Mission/MissionManager.lua | 2 +- .../Mission/OptionBehaviourManager.lua | 2 +- .../~Lua/Modules/Mission/ProgressPanel.lua | 2 +- .../Mission/QinglongSerectTreasureManager.lua | 4 +- .../Mission/SecondaryMissionManager.lua | 2 +- .../MonsterCamp/MonsterCampManager.lua | 2 +- .../Modules/MonsterCamp/MonsterCampPanel.lua | 2 +- .../~Lua/Modules/Net/IndicationManager.lua | 2 +- .../~Lua/Modules/Net/NetManager.lua | 2 +- .../OnlineReward/OnlineRewardPanel.lua | 2 +- .../Modules/Operating/AttentionGiftPage.lua | 2 +- .../Operating/ContinuityRechargeItem.lua | 2 +- .../Operating/ContinuityRechargePage.lua | 2 +- .../Operating/CumulativeSignInPage.lua | 6 +- .../~Lua/Modules/Operating/GiftPackPage.lua | 2 +- .../~Lua/Modules/Operating/GrowthGiftPage.lua | 2 +- .../Modules/Operating/GrowthGiftTaskItem.lua | 2 +- .../~Lua/Modules/Operating/MonthCardPage.lua | 6 +- .../Operating/MonthRewardPreviewPopup.lua | 2 +- .../Modules/Operating/OperatingManager.lua | 2 +- .../~Lua/Modules/Operating/OperatingPanel.lua | 2 +- .../Modules/Operating/UppperMonthCard.lua | 2 +- .../Operating/WeekMonthGiftPackPage.lua | 2 +- .../~Lua/Modules/Pay/PayManager.lua | 2 +- .../Modules/Player/AutoRecoverManager.lua | 2 +- .../~Lua/Modules/Player/HeadManager.lua | 2 +- .../~Lua/Modules/Player/JumpManager.lua | 2 +- .../~Lua/Modules/Player/PlayerManager.lua | 2 +- .../~Lua/Modules/Player/PrivilegeManager.lua | 2 +- .../~Lua/Modules/Player/RedPointData.lua | 2 +- .../~Lua/Modules/Player/RedPointManager.lua | 2 +- .../~Lua/Modules/Player/RedpotManager.lua | 2 +- .../~Lua/Modules/Player/StateManager.lua | 2 +- .../~Lua/Modules/Popup/BattleFailPopup.lua | 2 +- .../~Lua/Modules/Popup/BattleWinPopup.lua | 2 +- .../~Lua/Modules/Popup/BazzarPopup.lua | 2 +- .../~Lua/Modules/Popup/BoxRewardShowPopup.lua | 2 +- .../Modules/Popup/CarbonBuyCountPopup.lua | 2 +- .../~Lua/Modules/Popup/CarbonMissionPopup.lua | 2 +- .../~Lua/Modules/Popup/CostConfirmPopup.lua | 2 +- .../~Lua/Modules/Popup/CreateNamePopup.lua | 2 +- .../Modules/Popup/DiffmonsterEditPopup.lua | 2 +- .../Popup/DropGetPlayerDecorateShopPanel.lua | 2 +- .../Modules/Popup/DropGetSSRHeroShopPanel.lua | 2 +- .../Modules/Popup/ElementRestraintPopup.lua | 2 +- .../~Lua/Modules/Popup/EquipInfoPopup.lua | 2 +- .../~Lua/Modules/Popup/FoodGainPopup.lua | 2 +- .../~Lua/Modules/Popup/GeneralPopup.lua | 2 +- .../~Lua/Modules/Popup/HelpPopup.lua | 2 +- .../~Lua/Modules/Popup/ItemGetPopup.lua | 2 +- .../~Lua/Modules/Popup/MapBagPopup.lua | 2 +- .../Modules/Popup/MapFormationInfoPopup.lua | 2 +- .../~Lua/Modules/Popup/MapNotePopup.lua | 2 +- .../~Lua/Modules/Popup/MapRoleInfoPopup.lua | 2 +- .../~Lua/Modules/Popup/MatchTipPopup.lua | 2 +- .../~Lua/Modules/Popup/MonsterInfoPopup.lua | 2 +- .../~Lua/Modules/Popup/MonsterSkillPopup.lua | 2 +- .../~Lua/Modules/Popup/NameManager.lua | 2 +- .../Modules/Popup/NextMonsterInfoPopup.lua | 2 +- .../~Lua/Modules/Popup/PassGiftPopup.lua | 2 +- .../~Lua/Modules/Popup/PlayerInfoPopup.lua | 2 +- .../Popup/RewardEquipSingleShowPopup.lua | 2 +- .../Popup/RewardEquipSingleShowPopup2.lua | 2 +- .../~Lua/Modules/Popup/RewardItemPopup.lua | 2 +- .../Popup/RewardItemSingleShowPopup.lua | 2 +- .../Popup/RewardTalismanSingleShowPopup.lua | 2 +- .../~Lua/Modules/Popup/RoleGetInfoPopup.lua | 2 +- .../~Lua/Modules/Popup/RoleInfoPopup.lua | 2 +- .../~Lua/Modules/Popup/SettingPopup.lua | 2 +- .../~Lua/Modules/Popup/SkillInfoPopup.lua | 2 +- .../~Lua/Modules/Popup/SoulPrintPopUp.lua | 2 +- .../~Lua/Modules/Popup/StoryOptionPopup.lua | 2 +- .../~Lua/Modules/Popup/SupremeHeroPopup.lua | 2 +- .../~Lua/Modules/Popup/TalismanInfoPopup.lua | 2 +- .../~Lua/Modules/Popup/TrialBossTipPopup.lua | 2 +- .../~Lua/Modules/Popup/TrialRewardPopup.lua | 2 +- .../Modules/Popup/UnlockCheckpointPopup.lua | 2 +- .../GeneralPopup_BuyXuanYuanMirrorTims.lua | 4 +- .../View/GeneralPopup_EquipBatchSell.lua | 2 +- .../Popup/View/GeneralPopup_EquipCompound.lua | 2 +- .../View/GeneralPopup_EquipSingleSell.lua | 2 +- .../View/GeneralPopup_ExpeditionReply.lua | 2 +- .../Popup/View/GeneralPopup_GuildAid.lua | 2 +- .../GeneralPopup_GuildAidFindBoxReward.lua | 2 +- .../View/GeneralPopup_GuildSkillReset.lua | 2 +- ...eralPopup_HeavenUnlockExtraRewardPanel.lua | 10 +- .../Popup/View/GeneralPopup_Onhook.lua | 2 +- ...alPopup_QinglongSerectTreasureBuyLevel.lua | 8 +- .../Popup/View/GeneralPopup_RecruitBox.lua | 4 +- .../View/GeneralPopup_RecruitConfirm.lua | 14 +-- .../View/GeneralPopup_ResolveDismantle.lua | 2 +- .../GeneralPopup_ResolveEquipTreasure.lua | 2 +- .../Popup/View/GeneralPopup_ResolveRecall.lua | 2 +- .../View/GeneralPopup_TreasureCompound.lua | 2 +- .../Popup/View/GeneralPopup_TrialBomb.lua | 6 +- .../Popup/View/GeneralPopup_TrialGain.lua | 2 +- .../Popup/View/GeneralPopup_TrialSetting.lua | 2 +- .../View/GeneralPopup_TrialToNextFloor.lua | 2 +- .../Popup/View/GeneralPopup_TrialXingYao.lua | 2 +- .../~Lua/Modules/Power/GiveMePowerPanel.lua | 2 +- .../Power/UKnowNothingToThePowerManager.lua | 2 +- .../~Lua/Modules/Pray/PrayMainPanel.lua | 2 +- .../~Lua/Modules/Pray/PrayManager.lua | 2 +- .../~Lua/Modules/Pray/PrayRewardItemPopup.lua | 2 +- .../Modules/Pray/PraySelectRewardPanel.lua | 2 +- .../Questionnaire/QuestionnaireListItem.lua | 2 +- .../Questionnaire/QuestionnaireManager.lua | 2 +- .../Questionnaire/QuestionnairePanel.lua | 2 +- .../QuickPurchase/QuickCoinPurchasePart.lua | 2 +- .../QuickPurchase/QuickCommonPurchasePart.lua | 2 +- .../QuickPurchase/QuickPurchasePanel.lua | 2 +- .../QuickSpecialPurchasePart.lua | 2 +- .../Modules/Ranking/RankingListMainPanel.lua | 2 +- .../~Lua/Modules/Ranking/RankingListPanel.lua | 2 +- .../~Lua/Modules/Ranking/RankingManager.lua | 2 +- .../Ranking/RankingSingleListPanel.lua | 6 +- .../Modules/Recharge/MainRechargePanel.lua | 2 +- .../~Lua/Modules/Recharge/View/GiftView.lua | 2 +- .../Modules/Recharge/View/RechargeView.lua | 2 +- .../Modules/Recruit/ElementDrawCardPanel.lua | 2 +- .../~Lua/Modules/Recruit/HeroPreviewPanel.lua | 2 +- .../~Lua/Modules/Recruit/RecruitManager.lua | 2 +- .../~Lua/Modules/Recruit/RecruitPanel.lua | 2 +- .../Modules/Recruit/RewardPreviewPopup.lua | 2 +- .../Modules/Recruit/SingleRecruitPanel.lua | 2 +- .../~Lua/Modules/Recruit/TenRecruitPanel.lua | 2 +- .../~Lua/Modules/RedPoint/RedPoint.lua | 2 +- .../Modules/Resolve/EquipSellSelectPopup.lua | 2 +- .../Resolve/HeroAndEquipResolvePanel.lua | 2 +- .../~Lua/Modules/Resolve/ResolvePanel.lua | 4 +- .../Resolve/View/Resolve_Dismantle.lua | 2 +- .../Resolve/View/Resolve_EquipTreasure.lua | 2 +- .../Modules/Resolve/View/Resolve_Recall.lua | 2 +- .../~Lua/Modules/RewardBox/RewardBoxPanel.lua | 2 +- .../Modules/RoleInfo/EquipTreasureManager.lua | 2 +- .../RoleInfo/EquipTreasureResonancePanel.lua | 2 +- .../RoleInfo/EquipTreasureStrongPopup.lua | 2 +- .../Modules/RoleInfo/RoleEquipChangePopup.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 2 +- .../RoleInfo/RoleEquipTreasureChangePopup.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleListPanel.lua | 2 +- .../Modules/RoleInfo/RolePosInfoPopup.lua | 2 +- .../Modules/RoleInfo/RoleProInfoPopup.lua | 2 +- .../Modules/RoleInfo/RoleReturnListPanel.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleReturnPanel.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleTalentPopup.lua | 2 +- .../RoleInfo/RoleTalismanChangePopup.lua | 2 +- .../Modules/RoleInfo/RoleTalismanPanelV2.lua | 2 +- .../RoleInfo/RoleUpLvBreakSuccessPanel.lua | 2 +- .../Modules/RoleInfo/RoleUpStarListPanel.lua | 2 +- .../RoleInfo/RoleUpStarSuccessPanel.lua | 2 +- .../Modules/RoleInfo/TalismanInfoPanel.lua | 2 +- .../RoleInfo/TalismanUpStarListPanel.lua | 2 +- .../RoleInfo/TalismanUpStarSuccessPanel.lua | 2 +- .../SecretBox/SecretBoxBuyOnePanel.lua | 2 +- .../SecretBox/SecretBoxBuyTenPanel.lua | 2 +- .../Modules/SecretBox/SecretBoxManager.lua | 2 +- .../~Lua/Modules/SecretBox/SecretBoxPanel.lua | 2 +- .../SecretBox/SecretBoxShowPokemonPanel.lua | 2 +- .../Modules/Setting/CDKeyExchangePanel.lua | 2 +- .../~Lua/Modules/Setting/HeadChangePopup.lua | 2 +- .../Setting/PlayerSetTitleRideSkinManager.lua | 2 +- .../~Lua/Modules/Setting/SettingInfo.lua | 2 +- .../~Lua/Modules/Setting/SettingManager.lua | 2 +- .../~Lua/Modules/Setting/SettingPanel.lua | 2 +- .../Modules/Setting/SettingPlayerRide.lua | 2 +- .../Modules/Setting/SettingPlayerSkin.lua | 2 +- .../Modules/Setting/SettingPlayerTitle.lua | 2 +- .../SevenDayCarnivalHalfPricePage.lua | 2 +- .../SevenDayCarnivalManager.lua | 2 +- .../SevenDayCarnivalPanel.lua | 2 +- .../SevenDayCarnivalPanelV2.lua | 2 +- .../SevenDayCarnivalTaskItem.lua | 2 +- .../SevenDayRewardPreviewPanel.lua | 2 +- .../~Lua/Modules/Shop/MainShopPanel.lua | 2 +- .../~Lua/Modules/Shop/MapShopPanel.lua | 2 +- .../~Lua/Modules/Shop/ShopBuyPopup.lua | 2 +- .../~Lua/Modules/Shop/ShopConfig.lua | 2 +- .../~Lua/Modules/Shop/ShopExchangePopup.lua | 2 +- .../~Lua/Modules/Shop/ShopManager.lua | 2 +- .../~Lua/Modules/Shop/ShopPanel.lua | 2 +- .../RewardSoulPrintSingleShowPopup.lua | 2 +- .../Modules/SoulPrint/SoulPrintHandBook.lua | 2 +- .../Modules/SoulPrint/SoulPrintManager.lua | 2 +- .../~Lua/Modules/SoulPrint/SoulPrintPanel.lua | 2 +- .../Modules/SoulPrint/SoulPrintPopUpV2.lua | 2 +- .../SoulPrint/SoulPrintStoreHousePopUp.lua | 2 +- .../SoulPrintUpLevelSuccessPopUp.lua | 2 +- .../SoulPrintAstrologyPanel.lua | 2 +- .../~Lua/Modules/Story/DialoguePopup.lua | 2 +- .../~Lua/Modules/Story/SpineControl.lua | 2 +- .../~Lua/Modules/Story/StoryDialoguePanel.lua | 2 +- .../~Lua/Modules/Story/StoryManager.lua | 3 +- .../~Lua/Modules/Task/TaskManager.lua | 2 +- .../HeavenUnlockExtraRewardPanel.lua | 6 +- .../TreasureOfHeavenManager.lua | 2 +- .../TreasureOfHeavenPanel.lua | 2 +- .../BuyTreasureLevelPanel.lua | 2 +- .../TreasureOfSomebodyManagerV2.lua | 2 +- .../TreasureOfSomebodyPanelV2.lua | 2 +- .../TreasureOfSomebodyRewardPageV2.lua | 2 +- .../TreasureOfSomebodyScorePageV2.lua | 2 +- .../UnlockExtraRewardPanel.lua | 2 +- .../TreasureStore/TreasureStorePopup.lua | 2 +- .../UIComponent/CommonConfirmPanel.lua | 2 +- .../UIComponent/RewardPreviewPopupPanel.lua | 2 +- .../UpGradePackage/UpGradePackagePanel.lua | 6 +- .../~Lua/Modules/Update/DownLoadManager.lua | 2 +- .../~Lua/Modules/Update/DownLoadingPanel.lua | 2 +- .../~Lua/Modules/Vip/VipManager.lua | 2 +- .../~Lua/Modules/Vip/VipPanel.lua | 2 +- .../~Lua/Modules/Vip/VipPanelV2.lua | 2 +- .../~Lua/Modules/Vip/VipTaskListItem.lua | 2 +- .../~Lua/Modules/Vip/VipTipPopup.lua | 2 +- .../WarPowerChangeNotifyPanel.lua | 2 +- .../WarPowerChangeNotifyPanelV2.lua | 2 +- .../WorkShop/WorkShopArmorOnePanel.lua | 2 +- .../WorkShop/WorkShopArmorTwoPanel.lua | 2 +- .../WorkShopAttributeAdditionPanel.lua | 2 +- .../Modules/WorkShop/WorkShopAwardPanel.lua | 2 +- .../WorkShop/WorkShopCastSuccessPanel.lua | 2 +- .../WorkShopEquipRebuildListPanel.lua | 2 +- .../WorkShopEquipReforgePreviewPanel.lua | 2 +- .../WorkShop/WorkShopLevelUpNotifyPanel.lua | 2 +- .../Modules/WorkShop/WorkShopLvUpPanel.lua | 2 +- .../WorkShop/WorkShopMadeSuccessPanel.lua | 2 +- .../Modules/WorkShop/WorkShopMainPanel.lua | 2 +- .../~Lua/Modules/WorkShop/WorkShopManager.lua | 2 +- .../WorkShopMaterialsCompoundPanel.lua | 2 +- .../WorkShop/WorkShopRuneListPanel.lua | 2 +- .../WorkShop/WorkShowTechnologPanel.lua | 2 +- Assets/ManagedResources/~Lua/View/BtView.lua | 2 +- .../~Lua/View/ChatTipView.lua | 2 +- .../ManagedResources/~Lua/View/DragView.lua | 2 +- .../~Lua/View/ElementalResonanceView.lua | 2 +- .../ManagedResources/~Lua/View/ItemView.lua | 2 +- .../ManagedResources/~Lua/View/JumpView.lua | 2 +- .../ManagedResources/~Lua/View/NoteView.lua | 2 +- .../ManagedResources/~Lua/View/NumberView.lua | 2 +- .../~Lua/View/PlayerHeadView.lua | 2 +- .../~Lua/View/PlayerLiveView.lua | 2 +- .../~Lua/View/RoleItemView.lua | 2 +- .../~Lua/View/ScrollCycleView.lua | 2 +- .../~Lua/View/ScrollFitterView.lua | 2 +- .../~Lua/View/ShopItemView.lua | 2 +- .../ManagedResources/~Lua/View/ShopView.lua | 2 +- Assets/ManagedResources/~Lua/View/UpView.lua | 2 +- data_execl/Language_data/LanguageLua.csv | 97 +++++++++++++++++- 684 files changed, 1025 insertions(+), 840 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index a0e7cb6a22..6e7f5ab622 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName GlobalDefine * @Description 全局变量 * @Date 2019/5/9 13:56 @@ -2044,8 +2044,8 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[1 [4] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12167] ,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = true}, [5] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12168] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper,isRankingMainPanelShow = false}, [6] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12240] ,rankType = RANK_TYPE.ARENA_RANK,activiteId = 0,isRankingMainPanelShow = false}, - [7] = { bgImage = "r_zjm_paihangbang_banner01", name = "极速排名" ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.FastExplore,isRankingMainPanelShow = false}, - [8] = { bgImage = "r_zjm_paihangbang_banner01", name = "军团副本" ,rankType = RANK_TYPE.GUILDTRANSCRIPT,activiteId = 0,isRankingMainPanelShow = false}, + [7] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12386] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.FastExplore,isRankingMainPanelShow = false}, + [8] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12387] ,rankType = RANK_TYPE.GUILDTRANSCRIPT,activiteId = 0,isRankingMainPanelShow = false}, } SoulPrintSpriteByQuantity={ diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index ccfdf2254a..18eb532720 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] = "活动关闭 ", @@ -2286,11 +2286,104 @@ Language = { [12285] = "无可归元的法宝!", [12286] = "法宝归元成功!", [12287] = "确定归元", - [12288] = "%s的法宝会重置为1,并返还进阶时消耗的金币和陨铁,是否确认归元?\n\n\t\t\t\t\t\t\t归元后获得:", - [12289] = "请选择一个需要归元的法宝神将!", + [12288] = "%s的法宝会重置为1阶,并返还进阶时消耗的金币和陨铁,是否确认归元?\n\n\t\t\t\t\t\t\t归元后获得:", + [12289] = "请选择一个需要归元法宝的神将!", [12290] = "前往化虚坛", [12291] = "请选择需要合成的神将", [12292] = "%s星同阵营神将", [12293] = "完成上方任务即可免费领取神将", [12294] = ",若宝物已强化或精炼,分解后将清空强化和精炼等级,并100%返还养成材料。", + [12295] = "暂无可上报的日志!", + [12296] = "日志上报成功,感谢您的支持!", + [12297] = "玩家等级达到%s级开启", + [12298] = "森罗幻境重置前5分钟无法进入", + [12299] = "人杰宝境", + [12300] = "佛禅宝境", + [12301] = "妖灵宝境", + [12302] = "道玄宝境", + [12303] = "日", + [12304] = "、周", + [12305] = "周", + [12306] = "未开启!", + [12307] = "后关闭", + [12308] = "寂灭", + [12309] = "已重置!", + [12310] = "已关闭!", + [12311] = "%s发起了集结号角,请全体公会成员前往挑战副本首领!", + [12312] = "%s元", + [12313] = "神将合成", + [12314] = "神将置换", + [12315] = "请选择想要置换的神将!", + [12316] = "置换玉不足!", + [12317] = "该神将在", + [12318] = "中已上阵", + [12319] = "目标神将已被锁定,无法置换!", + [12320] = "活动已结束", + [12321] = "剩余时间:", + [12322] = "奖励已全部领取", + [12323] = "编队不能为空", + [12324] = "公会副本", + [12325] = "还未有人挑战过此首领", + [12326] = "今日已无剩余次数!", + [12327] = "是否花费%s%s购买1次挑战次数并发起挑战?", + [12328] = "成功购买1次挑战次数!", + [12329] = "是否花费%s%s购买1次扫荡次数,本次扫荡伤害为%s?", + [12330] = "成功购买1次扫荡次数!", + [12331] = "确定以上次挑战的%s伤害进行扫荡吗?", + [12332] = "是否花费%s%s购买1次挑战次数?", + [12333] = "只有会长和副会长才可使用此功能!", + [12334] = "该首领已被击败!", + [12335] = "%s后才可再次使用此功能!", + [12336] = "强攻效果已到达最高!", + [12337] = "是否消耗%s%s购买一次强攻效果?购买后攻击力加成提升至%s", + [12338] = "强攻效果已到达最高", + [12339] = "击败前一个首领方可解锁!", + [12340] = "已通关", + [12341] = "剩余次数:", + [12342] = "剩余购买次数:", + [12343] = "全公会成员攻击力+0%(未激活) ", + [12344] = "全公会成员攻击力+ %s ", + [12345] = "(%s:%s:%s:后失效)", + [12346] = "已击败【%s】!", + [12347] = "即可再抽取", + [12348] = "青龙秘宝", + [12349] = "秘宝试炼", + [12350] = "完成日常任务和秘宝试炼以提升秘宝等级,领取对应奖励,解锁秘宝可领取额外奖励", + [12351] = "最大等级", + [12352] = "解锁秘宝", + [12353] = "已解锁", + [12354] = "购买等级", + [12355] = "成功领取额外积分包", + [12356] = "再次领取", + [12357] = "/次", + [12358] = "成功领取", + [12359] = "年", + [12360] = "月", + [12361] = "连续签到", + [12362] = "天获得:", + [12363] = "即可激活30天月卡", + [12364] = "是否消耗%s%s购买一次挑战次数?", + [12365] = "天宫秘宝", + [12366] = "解锁秘宝,可以领取额外专属奖励,并直接获得200积分", + [12367] = "解锁高阶战令,激活进阶专属奖励+直升15级", + [12368] = "等级购买成功", + [12369] = "购买%s级,升至%s级", + [12370] = "升至%s级,可立即解锁%s件奖励", + [12371] = "需要充值", + [12372] = "以上才可打开", + [12373] = "确认花费%s妖晶进行1次神将召唤?", + [12374] = "确认花费%s妖晶抽取1次乾坤宝盒?", + [12375] = "确认花费%s妖晶进行1次限时召唤?", + [12376] = "确认花费%s妖晶进行10次神将召唤?", + [12377] = "确认花费%s妖晶抽取10次乾坤宝盒?", + [12378] = "确认花费%s妖晶进行10次限时召唤?", + [12379] = "奖励层不可使用炸弹~", + [12380] = "炸弹使用已达最大次数~", + [12381] = "点金次数", + [12382] = "极速次数", + [12383] = "法宝归元", + [12384] = "等级礼包", + [12385] = "五星成长礼", + [12386] = "极速排名", + [12387] = "军团副本", } diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 7c7f3fff80..7e34be73bf 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 {} @@ -1150,7 +1150,7 @@ function TimeToH(second) local minute = math.floor(second / 60) % 60 local sec = second % 60 local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) - return string.format("%02d时", hour) + return string.format(Language[11751], hour) end --- 将一段时间转换为时分秒 diff --git a/Assets/ManagedResources/~Lua/Modules/Achievement/AchievementPanel.lua b/Assets/ManagedResources/~Lua/Modules/Achievement/AchievementPanel.lua index b72ea90375..03e4d61412 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 87d4555acb..509b546ae5 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 4d21e94d26..82ac4af6a5 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 c6f11fdd2b..5438d91dc3 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 354b132eb5..b92c6038fd 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 908a28241e..5074cbd6c7 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 223f2b2274..3fb5af1e1c 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 9b3f413c55..2b4962ebf4 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 5f642c2f79..15c5adf818 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 809cae95a3..9afa59bc95 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 1f4b82ab1a..b4e4d99803 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 57887587cb..43e76a84df 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 42b43704cc..d4007667fd 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 d1f01f9bfc..d9ec685ae0 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 53bda544a5..5ebc078835 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 1ca5625328..e4f05c40cd 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 170057301b..7dad2e4ddc 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 f2fa007696..d594164bc2 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 41de9aeaab..1baaf9fdd2 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 73da74b9ba..64adf7169c 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 f45cefd2bf..aa4616cc96 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 54d5f6a897..16dfe0b2e9 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 dcc91d6c10..fce9772ad8 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 d4372f3c54..aca9dcacae 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 b592ab45ea..4e7b5258f4 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 3c71664edb..c661da0cd0 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 055c47fae1..b4560ca2ec 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 9ac8032cd8..9a5c5f108a 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 b0f3c05d8d..91ddbe6225 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 83d9d890f4..35c370e9ac 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 5c6e767628..c643a5bd43 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 36d21e9cf1..39885f47ee 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 c8b4f18450..88d186b230 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 81d418ae80..dfe410f48a 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 2faa559748..18f41321bc 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 5bc2120b75..95f5c9f2f7 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 3a1ad9e547..579e1dd2b1 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 002e5731cf..bfde7bb0ad 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 b53e51a9af..a96cb33522 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 f8d5dcd083..0843d657d6 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 5a9d7ed033..74a6caf83f 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 3e1667427b..8ea8d878d1 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 1778fa65e7..6401593730 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 093c7708bf..21673a7a0a 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 7dc35b1466..7b69ddb6ef 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 48e7ea8989..afeadfa4ef 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 fe82003eb7..9bf3ff9a97 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 = {} @@ -177,7 +177,7 @@ end -- 上报战斗日志 function this.SubmitBattleRecord() if not this.isSubmit then - PopupTipPanel.ShowTip("暂无可上报的日志!") + PopupTipPanel.ShowTip(Language[12295]) return end local _, rcd = this.isHaveRecord() @@ -185,7 +185,7 @@ function this.SubmitBattleRecord() NetManager.GMEvent("//"..rcd.seed.."|"..rcd.fightMaxRound.."|"..BattleManager.PrintBattleTable(rcd.fightData)) end this.isSubmit = false - PopupTipPanel.ShowTip("日志上报成功,感谢您的支持!") + PopupTipPanel.ShowTip(Language[12296]) end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Config/FightEffectAudioConfig.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Config/FightEffectAudioConfig.lua index 854bf23757..e527d8dc60 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 ec79f9d49c..5485649ad8 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 27bc006f0e..67b0c0520f 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 70523f351b..95778084a4 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 7c42605265..a3e00fefcd 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/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 1e21e411b6..f0237f2965 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 c9d64a3b5f..9d32f100e6 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 0b3514f937..433839ecc1 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 2e27d7c2d4..acc32617a6 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 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogManager.lua index 97ba1d83d7..412fca66ff 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 6da01285fb..55b8c08afe 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 9ae283f9a3..63c43cbb54 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 4932db0bed..0efa4954d6 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 b3aa15bd6b..99014e5cff 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 2bbf255139..4dacfa3472 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 a1e36a0b1f..8e89bfd470 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 210c29270d..86b01d6129 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 56a8e078f1..b8946b60fa 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 058d3a16ed..512d04eba2 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 520ccb9efb..b99922318f 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 335a842730..2308c764da 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 da529dcc08..4b4eacf692 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 e7a17f9db8..324b172f63 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 0e512ea12e..608be66ee8 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 8b151091c2..a3d0690e6d 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 f9f50dfec9..9b6d8c1e6e 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 b0c7fc4f6f..c85556dc3d 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 3ae6b3fe84..be347bb37b 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 c054e1f111..f8f6abdd3a 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 dd455b8fc1..3bd8896dea 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 4850ee293a..906d811fb7 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 09b4d18f0c..ae0e97c87e 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 045bd5e72a..04766d6f20 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 d08d44f9b0..2e3843bcf8 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 8a29107c7d..768909e605 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 02933ac674..06c09bdba6 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 c0507931d7..cce5a44b2a 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 10f3754845..d85b7bb6ab 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 9e0e302cfc..28bdc5a45c 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 f084698225..d556cfe92d 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 ce08b9bd50..c116c09cba 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 c0b4b5f7c8..e8d73390df 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 074f92af58..3df4d59f53 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 d793ecc177..4e536e1f2e 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 f5fa229df3..a460272f62 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 a1a9589006..8cd5db4534 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 e469ff0fcd..6eba6fac7f 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 7717dc3270..c4587385ad 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 c7bdaaba79..f8da4dc073 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 @@ -381,9 +381,9 @@ function this.BtnClick(id) else if not ActTimeCtrlManager.IsQualifiled(id) then local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.TRIAL) - PopupTipPanel.ShowTip(string.format("玩家等级达到%s级开启",config.OpenRules[2])) + PopupTipPanel.ShowTip(string.format(Language[12297],config.OpenRules[2])) else - PopupTipPanel.ShowTip("森罗幻境重置前5分钟无法进入") + PopupTipPanel.ShowTip(Language[12298]) end end @@ -392,7 +392,7 @@ function this.BtnClick(id) UIManager.OpenPanel(UIName.XuanYuanMirrorPanel) else local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.PEOPLE_MIRROR) - PopupTipPanel.ShowTip(string.format("玩家等级达到%s级开启",config.OpenRules[2])) + PopupTipPanel.ShowTip(string.format(Language[12297],config.OpenRules[2])) end elseif id == FUNCTION_OPEN_TYPE.ENDLESS then MapManager.curCarbonType = CarBonTypeId.ENDLESS diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV3.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV3.lua index 57cbd574e6..ef24e11ea9 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 ae9a10c837..2a6411fa8a 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 70539803d3..d3880e6026 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 11279ea4a6..c440aa03fb 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 1cad41bc90..eb180ce590 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 d1231176db..06230a508e 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 c6182c7e7b..07c9791b6c 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 1e8e6deb07..e805bae5c4 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 81c964e30f..c2ee633909 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 2e645163b4..cbdeee00f1 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 7fb05eeffd..1744bf1041 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 3992c63768..a5d29e250d 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 23bc31f3c9..0ecfcbac85 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua @@ -1,4 +1,4 @@ -XuanYuanMirrorManager = {}; +XuanYuanMirrorManager = {}; local raceTowerConfig local raceTowerRewardConfig local this = XuanYuanMirrorManager diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua index 58113b6ca4..9f4b8415cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") XuanYuanMirrorPanel = Inherit(BasePanel) local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig) local this = XuanYuanMirrorPanel @@ -8,27 +8,27 @@ local orginLayer = 0 local type = { [1] = { bg = "ui_fb_btn_jy", - name = "人杰宝境", + name = Language[12299], gameObject = "btnRoot/circle/root/renjiebaojing" , }, [2] = { bg = "ui_fb_btn_gh", - name = "佛禅宝境", + name = Language[12300], gameObject = "btnRoot/circle/root/fuochanbaojing" , }, [3] = { bg = "ui_fb_btn_sl", - name = "妖灵宝境", + name = Language[12301], gameObject = "btnRoot/circle/root/yaolingbaojing" , }, [4] = { bg = "ui_fb_btn_jq", - name = "道玄宝境", + name = Language[12302], gameObject = "btnRoot/circle/root/daoxuanbaojing" , }, } -local NumConvertWeek = {[1]="一",[2]="二",[3]="三",[4]="四",[5]="五",[6]="六",[7]="日"} +local NumConvertWeek = {[1]=Language[10005],[2]=Language[10006],[3]=Language[10007],[4]=Language[10008],[5]=Language[10009],[6]=Language[10010],[7]=Language[12303]} --初始化组件(用于子类重写) function this:InitComponent() this.btnHelp = Util.GetGameObject(self.gameObject, "btnRoot/btnhelp") @@ -103,9 +103,9 @@ function this:GetOpenTime(id) else if isFunction then if str then - str =str.. "、周"..NumConvertWeek[tonumber(m)] + str =str.. Language[12304]..NumConvertWeek[tonumber(m)] else - str = "周"..NumConvertWeek[tonumber(m)] + str = Language[12305]..NumConvertWeek[tonumber(m)] end end end @@ -134,7 +134,7 @@ this.UpdateCarbonContent = function(...) local state = XuanYuanMirrorManager.GetMirrorState(k) == 1 if not state then local timeStr = this:GetOpenTime(k) - Util.GetGameObject(go, "timeBg/Text"):GetComponent("Text").text = timeStr.."开启" + Util.GetGameObject(go, "timeBg/Text"):GetComponent("Text").text = timeStr..Language[10357] Util.GetGameObject(go, "redPoint").gameObject:SetActive(false) else openFunctions[k] = {} @@ -150,7 +150,7 @@ this.UpdateCarbonContent = function(...) if state then UIManager.OpenPanel(UIName.XuanYuanMirrorPanelList,k) else - PopupTipPanel.ShowTip(type[k].name.."未开启!") + PopupTipPanel.ShowTip(type[k].name..Language[12306]) end end) end @@ -215,13 +215,13 @@ function this:TimeCountDown(_openFunctions) end for k,v in pairs(_openFunctions) do v.remainTime = XuanYuanMirrorManager.GetMirrorEndTime(k) - PlayerManager.serverTime - v.timeComp.text = TimeToHMS(v.remainTime).."后关闭" + v.timeComp.text = TimeToHMS(v.remainTime)..Language[12307] end self.timer = Timer.New(function() for k,v in pairs(_openFunctions) do v.remainTime = v.remainTime - 1 if v.remainTime > 0 then - v.timeComp.text = TimeToHMS(v.remainTime).."后关闭" + v.timeComp.text = TimeToHMS(v.remainTime)..Language[12307] else this:UpdateCarbonContent(1) end diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua index 3a1ce88760..76b34a2913 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") XuanYuanMirrorPanelList = Inherit(BasePanel) local raceTowerConfig = ConfigManager.GetConfig(ConfigName.RaceTowerConfig) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) @@ -10,22 +10,22 @@ local costNum = 0 local storeData = {} local mirrors = { [1] = { - id = "人杰宝境", --人杰 + id = Language[12299], --人杰 bg = "x_xianyuan_renjietu01", tip = string.format("%s", specialConfig[71].Value) }, [2] = { - id = "佛禅宝境", --佛禅 + id = Language[12300], --佛禅 bg = "x_xianyuan_fochantu01", tip = string.format("%s", specialConfig[72].Value) }, [3] = { - id = "妖灵宝境", --妖灵 + id = Language[12301], --妖灵 bg = "x_xianyuan_yaolingtu01", tip = string.format("%s", specialConfig[73].Value) }, [4] = { - id = "道玄宝境", --道玄 + id = Language[12302], --道玄 bg = "x_xianyuan_daoxuantu01", tip = string.format("%s", specialConfig[74].Value) } @@ -49,7 +49,7 @@ local difficult = { [7] = Language[12251], [8] = Language[12252], [9] = Language[12253], - [10] = "寂灭" + [10] = Language[12308] }, sprite = { [1] = "x_xb_tiao_05", @@ -116,9 +116,9 @@ this.RefreshPanel = function() local data = XuanYuanMirrorManager.GetMirroData(curType) if data.passId == 0 or XuanYuanMirrorManager.GetMirrorState(curType) ~= 1 then if data.passId == 0 then - PopupTipPanel.ShowTip(mirrors[curType].id .. "已重置!") + PopupTipPanel.ShowTip(mirrors[curType].id .. Language[12309]) elseif XuanYuanMirrorManager.GetMirrorState(curType) ~= 1 then - PopupTipPanel.ShowTip(mirrors[curType].id .. "已关闭!") + PopupTipPanel.ShowTip(mirrors[curType].id .. Language[12310]) end this:OnClose() UIManager.OpenPanel(UIName.XuanYuanMirrorPanel) @@ -364,4 +364,4 @@ function this:OnDestroy() this.ScrollView = nil end -return XuanYuanMirrorPanelList +return XuanYuanMirrorPanelList \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua index 11b6790ed5..cf59e3c30a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua @@ -1,4 +1,4 @@ ------ 公会十绝阵排行弹窗 ----- +----- 公会十绝阵排行弹窗 ----- require("Base/BasePanel") local XuanYuanMirrorRankPopup = Inherit(BasePanel) local this = XuanYuanMirrorRankPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRewardSortPopup.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRewardSortPopup.lua index 6c597fa09e..26e7a07369 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRewardSortPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRewardSortPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") XuanYuanMirrorRewardSortPopup = Inherit(BasePanel) local this = XuanYuanMirrorRewardSortPopup local rewardList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua index 8b8e943a9b..bf4be70d1a 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 @@ -443,7 +443,7 @@ function this.RequestSendGuildTranscript(func) -- 构建字符串 local channel = CHAT_CHANNEL.FAMILY local guildData = MyGuildManager.GetMyGuildInfo() - local content = string.format("%s发起了集结号角,请全体公会成员前往挑战副本首领!",PlayerManager.nickName) + local content = string.format(Language[12311],PlayerManager.nickName) this.RequestSendChatMsg(channel, content, function() end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index 8c654ed0ad..c36ece34d2 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 fcbef504e6..56c4b0f1e4 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 f2d79a2fba..6dbc352369 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 09f1f60c9e..95744fc0ff 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 7d29cba18b..e47983e9b4 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 6f90aed827..9ae041df37 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 2892ca944c..f25bcbe52f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/LimitScrollView/LimitScrollView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/LimitScrollView/LimitScrollView.lua @@ -1,4 +1,4 @@ -local LimitScrollView = {} +local LimitScrollView = {} function LimitScrollView.New() local o = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua index 38f204d1f3..58495f9551 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua @@ -1,4 +1,4 @@ -MoneyUtil = {} +MoneyUtil = {} local this = MoneyUtil @@ -50,7 +50,7 @@ end -- 获取货币单位名称 local _t2n = { - [1] = "%s元", + [1] = Language[12312], [2] = "$%s", } function this.GetMoneyUnitName(mt) diff --git a/Assets/ManagedResources/~Lua/Modules/Common/Pool/CommonPool.lua b/Assets/ManagedResources/~Lua/Modules/Common/Pool/CommonPool.lua index 0682fc3c9f..2bb91f19ac 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 3187f9d0b1..69ee8b544c 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 a29fddbbfa..73a9730921 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 7fe47f20ab..b3234c0fab 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 d6106bfc75..a0107e2f1a 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 eef3cd083a..900623b156 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 9a72413b5d..3d5a5b8a4c 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 9621c172a0..525654e934 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 658a0db3b2..1c42837131 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 47410df2d2..0e671f68db 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua @@ -1,4 +1,4 @@ ------ 寶物合成 ----- +----- 寶物合成 ----- local this = {} local sortingOrder=0 local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua index 73118a2d38..1ae54238af 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua @@ -1,9 +1,9 @@ -require("Base/BasePanel") +require("Base/BasePanel") CompoundHeroPanel = Inherit(BasePanel) local this = CompoundHeroPanel local TabBox = require("Modules/Common/TabBox") -local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神将合成" }, - [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神将置换" }, +local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12313] }, + [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12314] }, } local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua index 95ac0122cf..eee4d49e2f 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua @@ -1,4 +1,4 @@ ------ 神将合成 ----- +----- 神将合成 ----- local this = {} local sortingOrder=0 local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua index 6d7c224f07..553c572627 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua @@ -1,4 +1,4 @@ ------ 神将置换 ----- +----- 神将置换 ----- local this = {} local sortingOrder=0 local tabs={} @@ -50,9 +50,9 @@ function this:BindEvent() Util.AddClick(this.replaceBtn,function() if not curSelectHero.id then - PopupTipPanel.ShowTip("请选择想要置换的神将!") + PopupTipPanel.ShowTip(Language[12315]) elseif curSelectHero.id and (t>BagManager.GetTotalItemNum(tonumber(replaceItemIdConfig.Value))) then - PopupTipPanel.ShowTip("置换玉不足!") + PopupTipPanel.ShowTip(Language[12316]) else NetManager.SaveHeroChangeRequest(curSelectHero.dynamicId,function (msg) HeroManager.ResetHeroChangeId(curSelectHero.dynamicId,msg.heroTempId)--改变英雄changeId @@ -327,13 +327,13 @@ function this.SingleHeroDataShow(_go,_heroData) if LengthOfTable(heroData.formationList) ~= 0 then local text = "" for key, value in pairs(heroData.formationList) do - text = "该神将在"..HeroManager.GetHeroFormationStr2(key).."中已上阵" + text = Language[12317]..HeroManager.GetHeroFormationStr2(key)..Language[12318] end PopupTipPanel.ShowTip(text) return end if heroData.lockState == 1 then - PopupTipPanel.ShowTip("目标神将已被锁定,无法置换!") + PopupTipPanel.ShowTip(Language[12319]) return end end) diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua index f4622e8620..862a39be84 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 9aa2d2a7db..f3f5bef0af 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName DailyRechargePanel * @Description 每日首充 * @Date 2019/8/1 19:28 diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/BuglyManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/BuglyManager.lua index 4fb3cc3fda..ebd8c84305 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/BuglyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/BuglyManager.lua @@ -1,4 +1,4 @@ -BuglyManager = {} +BuglyManager = {} local this = BuglyManager function this.Initialize() if AppConst.isSDK then diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua index 0c4e3812fb..9f8c2e1167 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua @@ -1,4 +1,4 @@ -CustomEventManager = {} +CustomEventManager = {} local this = CustomEventManager local customEventConfig = ConfigManager.GetConfig(ConfigName.CustomEventConfig) function this.SetisFirstLogVal(isDayFirst) diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/DataCenterManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/DataCenterManager.lua index f3130a9fea..4230711ba2 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 12d7cae043..726e9b8439 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 e3e2f60948..ebf0c19d02 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 1c4a88e898..863af271d4 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 6fff555590..dad6087ec7 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 f069d76eaa..9c333820be 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 89153c1347..764be4a528 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 a16b4d1d96..9b5fbfe018 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 cbbef0b079..1fc4203a35 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 c9f6e1c141..21fbbb8651 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 4cecc3f4b3..f141fb6c75 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 1318e362f4..709da3f810 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 77bad482ca..b8c578cfb5 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 1f63cc9515..27d6937465 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 d36ea8a049..289893af55 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterUpGradSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DiffMonsterUpGradSuccessPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName DiffMonsterUpGradSuccessPanel * @Description 异妖升阶成功界面 * @Date 2019/5/16 10:30 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua index 5a9e919e3f..69a4edc116 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua @@ -1,4 +1,4 @@ -local ActivityDetail= quick_class("ActivityDetail") +local ActivityDetail= quick_class("ActivityDetail") local sortingOrder = 0 local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local listUpPre={} --限时召唤 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index 5212f81329..8b9cce233f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local DynamicActivityPanel = Inherit(BasePanel) local this = DynamicActivityPanel -- Tab管理器 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua index 1895343a93..151efd1d1a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua @@ -1,4 +1,4 @@ -local LeiJiChongZhiPage = quick_class("LeiJiChongZhiPage") +local LeiJiChongZhiPage = quick_class("LeiJiChongZhiPage") local allData={} local itemsGrid = {}--item重复利用 local this=LeiJiChongZhiPage @@ -61,14 +61,14 @@ function LeiJiChongZhiPage:SetTime() self.timer = nil end local timeDown = endtime - GetTimeStamp() - this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + this.time.text = Language[10028]..TimeToDHMS(timeDown) self.timer = Timer.New(function() timeDown = timeDown - 1 if timeDown < 1 then parent:ClosePanel() return end - this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + this.time.text = Language[10028]..TimeToDHMS(timeDown) end, 1, -1, true) self.timer:Start() end @@ -83,7 +83,7 @@ function LeiJiChongZhiPage:OnShowData() end) else parent.OnPageTabChange(1) - PopupTipPanel.ShowTip("活动已结束") + PopupTipPanel.ShowTip(Language[12320]) return end @@ -106,9 +106,9 @@ function LeiJiChongZhiPage:SortData() end) end local type={ - [0]={sprite = "s_slbz_1anniuhuangse",text = "前往"}, - [1]={sprite = "s_slbz_1anniuhuise",text = "已领取"}, - [2]={sprite = "s_slbz_1anniuongse",text = "领取"}, + [0]={sprite = "s_slbz_1anniuhuangse",text = Language[10023]}, + [1]={sprite = "s_slbz_1anniuhuise",text = Language[10350]}, + [2]={sprite = "s_slbz_1anniuongse",text = Language[10022]}, } --刷新每一条的显示数据 function this.SingleDataShow(pre,value) @@ -124,7 +124,7 @@ function this.SingleDataShow(pre,value) this:NumToNum(num,sConFigData.value) -- num.text = sConFigData.value local progress = Util.GetGameObject(activityRewardGo, "context/progress"):GetComponent("Text") - progress.text ="可领取".."("..(sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress) .."/"..sConFigData.value..")" + progress.text =Language[10471].."("..(sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress) .."/"..sConFigData.value..")" local reward = Util.GetGameObject(activityRewardGo.gameObject, "scrollView/grid") if (not itemsGrid) then diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua index 78134e48db..e00d9c8aed 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua @@ -1,4 +1,4 @@ -local PoZhenZhuXianPage = quick_class("PoZhenZhuXianPage") +local PoZhenZhuXianPage = quick_class("PoZhenZhuXianPage") local allData={} local itemsGrid = {}--item重复利用 local singleTaskPre = {} @@ -68,12 +68,12 @@ function PoZhenZhuXianPage:SetTime() for k,v in pairs(singleTaskPre) do -- v.com.gameObject:SetActive(true) if v and v.data.type == 1 then - v.com:GetComponent("Text").text = "剩余:"..TimeToH(five_timeDown) + v.com:GetComponent("Text").text = Language[10561]..TimeToH(five_timeDown) else - v.com:GetComponent("Text").text = "剩余:"..TimeToDH(week_timeDown) + v.com:GetComponent("Text").text = Language[10561]..TimeToDH(week_timeDown) end end - this.time.text = "剩余时间:"..TimeToDHMS(week_timeDown) + this.time.text = Language[12321]..TimeToDHMS(week_timeDown) self.timer = Timer.New(function() five_timeDown = five_timeDown - 1 week_timeDown = week_timeDown - 1 @@ -88,12 +88,12 @@ function PoZhenZhuXianPage:SetTime() for k,v in pairs(singleTaskPre) do -- v.com.gameObject:SetActive(true) if v and v.data.type == 1 then - v.com:GetComponent("Text").text = "剩余:"..TimeToH(five_timeDown) + v.com:GetComponent("Text").text = Language[10561]..TimeToH(five_timeDown) else - v.com:GetComponent("Text").text = "剩余:"..TimeToDH(week_timeDown) + v.com:GetComponent("Text").text = Language[10561]..TimeToDH(week_timeDown) end end - this.time.text = "剩余时间:"..TimeToDHMS(week_timeDown) + this.time.text = Language[12321]..TimeToDHMS(week_timeDown) end, 1, -1, true) self.timer:Start() end @@ -112,7 +112,7 @@ function PoZhenZhuXianPage:OnShowData() end) else parent.OnPageTabChange(1) - PopupTipPanel.ShowTip("活动已结束") + PopupTipPanel.ShowTip(Language[12320]) return end @@ -139,9 +139,9 @@ function PoZhenZhuXianPage:SortData() end) end local type={ - [0]={sprite = "s_slbz_1anniuhuangse",text = "前往"}, - [1]={sprite = "s_slbz_1anniuongse",text = "领取"}, - [2]={sprite = "s_slbz_1anniuhuise",text = "已领取"}, + [0]={sprite = "s_slbz_1anniuhuangse",text = Language[10023]}, + [1]={sprite = "s_slbz_1anniuongse",text = Language[10022]}, + [2]={sprite = "s_slbz_1anniuhuise",text = Language[10350]}, } --刷新每一条的显示数据 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index d78a81b641..ce0eb76c9a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -1,4 +1,4 @@ -local QianKunBox = quick_class("QianKunBox") +local QianKunBox = quick_class("QianKunBox") local ActivityDetail = require("Modules/DynamicActivity/ActivityDetail")--活动详情 local iconsData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardConfig,"Pool",4401) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua index a72cb1b67f..18d4f834b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") QianKunBoxBuyOnePanel = Inherit(BasePanel) local this=QianKunBoxBuyOnePanel local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua index d6b2856496..5214f3c85b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Base/Stack") QianKunBoxBuyTenPanel = Inherit(BasePanel) local this=QianKunBoxBuyTenPanel diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/RewardPreview.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/RewardPreview.lua index d3b3cd8850..105e14b415 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/RewardPreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/RewardPreview.lua @@ -1,4 +1,4 @@ -local RewardPreview = quick_class("RewardPreview") +local RewardPreview = quick_class("RewardPreview") local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting) local data = {} local listPre = {} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index 527e842f68..165bce0c75 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -1,4 +1,4 @@ -local TimeLimitedCall= quick_class("TimeLimitedCall") +local TimeLimitedCall= quick_class("TimeLimitedCall") local ActivityDetail = require("Modules/DynamicActivity/ActivityDetail")--活动详情 local RewardPreview = require("Modules/DynamicActivity/RewardPreview")--奖励预览 @@ -188,7 +188,7 @@ function TimeLimitedCall:RefreshNextLevelReward() -- self.sliderText.gameObject:SetActive(false) self.slider.value=1 Util.GetGameObject(self.slider.gameObject,"Text"):GetComponent("Text").text="300/300" - self.sliderText.text="奖励已全部领取" + self.sliderText.text=Language[12322] Util.AddOnceClick(self.getBtn,function() RewardPreview.new(self.reward) end) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua index 4e19c83b82..beeb012fa1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua @@ -1,4 +1,4 @@ -local XianShiShangShi = quick_class("XianShiShangShi") +local XianShiShangShi = quick_class("XianShiShangShi") local allData={} local itemsGrid = {}--item重复利用 local this=XianShiShangShi @@ -67,13 +67,13 @@ function XianShiShangShi:SetTime() end local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_TimeLimitShop) local timeDown = endTime - GetTimeStamp() - this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + this.time.text = Language[12321]..TimeToDHMS(timeDown) self.timer = Timer.New(function() timeDown = timeDown - 1 if timeDown < 1 then parent:ClosePanel() end - this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + this.time.text = Language[12321]..TimeToDHMS(timeDown) end, 1, -1, true) self.timer:Start() end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua index 4d26e18820..89e8b6272b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua @@ -1,4 +1,4 @@ -local ZhenQiYiBaoPage = quick_class("ZhenQiYiBaoPage") +local ZhenQiYiBaoPage = quick_class("ZhenQiYiBaoPage") local allData={} local itemsGrid = {}--item重复利用 local this=ZhenQiYiBaoPage @@ -66,13 +66,13 @@ function ZhenQiYiBaoPage:SetTime() end local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_Treasure) local timeDown = endTime - GetTimeStamp() - this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + this.time.text = Language[12321]..TimeToDHMS(timeDown) self.timer = Timer.New(function() timeDown = timeDown - 1 if timeDown < 1 then parent:ClosePanel() end - this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + this.time.text = Language[12321]..TimeToDHMS(timeDown) end, 1, -1, true) self.timer:Start() end diff --git a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua index ac8f02e084..394af0f642 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 5fd123b7ef..00639e6357 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 b3f22eea71..4932dd1282 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 bb58e1e19a..4c6d278531 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 73b2f333a6..58c317116e 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 46b56d7526..300954f0fc 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 dc6e3cff48..b078194859 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 05caa50675..88c8cba764 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 e9539d1633..718937aea7 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 b6811c1949..269f3d01c2 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 53450703eb..147cdfe3f5 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 5d35460a09..8390233793 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 4a393cc613..eb301ebe20 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 8c002aec68..21b538240d 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 0a806dc7fe..6e9aa90a0b 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 26c5b4762e..486a3c9fb4 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 98051edd7b..144c57c984 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 036a18bc90..99f70ac272 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 1be2b6cac7..3365c19687 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 56f91652c0..a197df56de 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 bfb7d24e6a..5958c82343 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 ba2f63dc12..28b54c4a3f 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 5307f88791..f29fe67cf1 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 fbdd19e500..441f9aa8cd 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 e03966986c..b285bc199a 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 d99a316866..0c58710d6e 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 101aebee05..662ca5ca6f 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 24b3a25dbd..fb2770b17e 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 67a616505f..9142de9721 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 eea21b54b2..edc0e546d7 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 467ec08e78..2e5a33655e 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 f2e6f14ff7..a9a1404b62 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 f66d58e832..8252cb934a 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 c0a90efff1..b11e3f0049 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 0ef135a26d..d9d1147687 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 8616a2aac1..e055c0be69 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 5d5ec46f18..6915ad77c3 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 c0130c4e94..e29b0a15e3 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 0eba4bc10c..041e580727 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 ba5a013d9c..af82a0b2d1 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 82ed521625..395c16e876 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 be91cb35aa..beb1beb4e7 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 5c9e737b7f..e6f910f3ff 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 73a0cd8540..92cb8e7f3c 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 67778acf22..238edddf49 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 79feb7ceed..312f1224a2 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 5fbb657825..6f8fa96196 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 58c87d1e80..d4c6c346f1 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 4a79fe47a7..aa878da91d 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 24fc16692e..fd77d2a177 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 fe5bf2b4eb..4833407bd1 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 dbd22908e3..6a7d127453 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 41f59c9df8..719f959333 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 11cb988448..e13306119d 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 8a64f45257..17aee94769 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 42226b2472..acda3a68a8 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 1a37551ec3..1a258e51a1 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 a9c0b6894a..47c1bcda58 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 035185ca5d..a04e8746bd 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 d1663349a4..3d6a684a29 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 0ca58f7e9d..3c9e524a4e 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 b2fd7611c3..8625b0212a 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 3dc50b1711..9901c5775b 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 280f94affa..ccee1ec939 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 6e24b5c5dc..b655789249 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 ac8c7bc71a..fd19b0345d 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 f0e7e875ba..eac227010d 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 bb1779731d..2136f099dd 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 8e9da0caed..03917a3176 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 aa865258af..5e7367e533 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 c9fe25cd5c..d316ed5630 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 923e0de4b6..4692620495 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 e8b363e061..313eeed3b3 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 88443ee706..705d3dca50 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 1421f62875..f63dfbfec0 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 2b51912e06..ab452fd3a6 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 92923e4c7b..da8515d7f8 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 601d7abbc7..4ae383879b 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 @@ -76,7 +76,7 @@ function FormationEditPopup:BindEvent() self:ClosePanel() end) else - PopupTipPanel.ShowTip("编队不能为空") + PopupTipPanel.ShowTip(Language[12323]) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationExamplePopup.lua index 00f92129a8..8c0772a5b0 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 63a8f211c8..9ff51f4b17 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 66ca81cc74..86d749d088 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 f5ae71d0c2..0563c23c75 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 72b96c918a..b117a44471 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 c3c1c3de1d..5544a1d64d 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 8cf26dba4d..e0a0196b4d 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 e6318f0a41..c3d684c385 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 43906df246..a2dfb7152c 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 aea7fc2ddd..908c512974 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 a1673c1573..1c27781d23 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 61afc4dec7..9173b725db 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 f80ae9a9d2..d7b5969aac 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 5760c6a1ad..62cefd8ebc 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 3a37874e05..61bc77709f 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 54bab09a46..3ac235228d 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 3756446ed2..080d6d808f 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 3340a6f3a0..14175977cc 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 88609ca017..5291d13ddb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildFightDefendFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildFightDefendFormation.lua @@ -1,4 +1,4 @@ -local GuildFightDefendFormation = {} +local GuildFightDefendFormation = {} local this = GuildFightDefendFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildTranscriptFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildTranscriptFormation.lua index 178b50adca..0ab8cab666 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildTranscriptFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildTranscriptFormation.lua @@ -1,4 +1,4 @@ ------ g公会副本 ----- +----- g公会副本 ----- local GuildTranscriptFormation = {} local this = GuildTranscriptFormation --- 是否需要切换编队的功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/MainFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/MainFormation.lua index 6bc3b44aa7..22d5de38e3 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 7c9a71bd8a..132fce6ed6 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 904bde06bc..d83760c6ed 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 6ddca0f675..a0274e8286 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 3cd12a970f..dd0fc00cb7 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 2aea7ac2ed..764512f114 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua @@ -1,4 +1,4 @@ ------ 副本 ----- +----- 副本 ----- local XuanYuanMirrorFormation = {} local this = XuanYuanMirrorFormation local curType = 0 @@ -23,7 +23,7 @@ function this.InitView() this.root.bg:SetActive(true) this.root.btn_1:SetActive(false) this.root.btn_2:SetActive(true) - this.root.btn_2_lab.text = "开始挑战" + this.root.btn_2_lab.text = Language[10709] this.root.tip:SetActive(true) this.root.exampleBtn:SetActive(false) this.root.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main}) @@ -83,4 +83,4 @@ function this.OnCloseBtnClick() this.root:ClosePanel() end -return this +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua index bde7ceab81..c8974db868 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 24cf7ed9d6..26e4376475 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 b9346a695c..d81dbce148 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 ee4e755790..d07c617455 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 9b9a2cae98..9923da520b 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/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua index 00cb718a01..ff80c5fca7 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 3e47f403f1..ad6cb60b85 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 7a689d213e..c9f0c3970b 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 ebaed99071..5e40ba44fd 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 5bf66b44c0..40bdbf0d09 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 904a524b66..fe303b4c93 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 601a4c52b8..90bd46b8b0 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 53e4d3d1ba..3bdcadcfb2 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 277c7427d6..fd99f5eee4 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 f3df64596f..1b7727c7c8 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 29a4402380..a7e0675bd2 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 0eb351bc69..7b9686bf97 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 e5612b7309..1688ad4f0d 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 4122beac52..9a058157b4 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 ce07bdac1c..c5197e47c8 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 edd64a355f..a196563e02 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 f64ec861f8..c96d339ec6 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 28452e7c50..7f94031529 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 1afcdfd16d..d32af947ae 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 34710a0b24..b7161f57b6 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 d43a6e4d2e..7b39f0b65e 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 2bc494aef8..0ea97c0332 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 43637ca947..c23c90428a 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 5949ec79a5..f64a3388a6 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 13a767da11..4fee585b81 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 b3c696e1ad..163812b4c1 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 668a020171..e603949e17 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 cd0bcb3367..0529931a78 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 9c6ed22f0f..0765a1d89f 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 98a3596521..a2b17b0296 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 163859a5c1..0dbf5f5456 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 947d85133e..a8e313aa9f 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 f0705d4529..9f2f25f3f2 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 440b2ef9c7..e40ca7f3db 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 25b1e73c4d..53435994e1 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 7ab3cf76a6..0f83802544 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 6c9a35b909..5cc10477b0 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 e59e7c2d3c..7e42e41902 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 b76d6d3a32..6ed9acfd5f 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 dbe1bbcc82..a5bb6f3b04 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 f0415455fa..f35f618d27 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 b075f805cb..10f991b74f 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 c02006e4a1..5ccdf6054f 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 d1ad693878..c7bf518dc9 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 c9b813d329..20d0df369c 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 bb6e2f63fb..70c2124de5 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 41756a2e39..c2f98680cd 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 136216dddf..6c949f5951 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 9944fcc305..18ac641740 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 5b0fe196d3..3bfd976157 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuildSkillUpLvPopup = Inherit(BasePanel) local this = GuildSkillUpLvPopup local TabBox = require("Modules/Common/TabBox") diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua index 4ee8dbbe43..55e54b2faf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuildTranscriptMainPopup = Inherit(BasePanel) local this = GuildTranscriptMainPopup local guildCheckpointConfig = ConfigManager.GetConfig(ConfigName.GuildCheckpointConfig) @@ -23,7 +23,7 @@ function GuildTranscriptMainPopup:InitComponent() this.endNumBtn = Util.GetGameObject(self.gameObject,"middleGo/endNumBtn") --text this.name = Util.GetGameObject(self.gameObject,"name"):GetComponent("Text")--军团副本 - this.name.text = "公会副本" + this.name.text = Language[12324] this.rewardGoText1 = Util.GetGameObject(self.gameObject,"middleGo/rewardGo/tip/Text1"):GetComponent("Text")--单次奖励 this.rewardGoText2 = Util.GetGameObject(self.gameObject,"middleGo/rewardGo/tip/Text2"):GetComponent("Text")--击杀奖励 @@ -51,7 +51,7 @@ function GuildTranscriptMainPopup:InitComponent() this.reward1 = Util.GetGameObject(self.gameObject, "middleGo/rewardGo/reward1") this.reward2 = Util.GetGameObject(self.gameObject, "middleGo/rewardGo/reward2") this.Empty = Util.GetGameObject(self.gameObject, "endGo/Empty") - Util.GetGameObject(self.gameObject, "endGo/Empty/Bg/Text"):GetComponent("Text").text = "还未有人挑战过此首领" + Util.GetGameObject(self.gameObject, "endGo/Empty/Bg/Text"):GetComponent("Text").text = Language[12325] --rank local v2New = Util.GetGameObject(self.gameObject, "endGo/rankList"):GetComponent("RectTransform").rect @@ -71,18 +71,18 @@ function GuildTranscriptMainPopup:BindEvent() Util.AddClick(this.warbtn,function() if GuildTranscriptManager.GetCanBattleCount() <=0 then --今日已无剩余次数! if GuildTranscriptManager.GetCanBuyBattleCount() <= 0 then - PopupTipPanel.ShowTip("今日已无剩余次数!") + PopupTipPanel.ShowTip(Language[12326]) else--是否花费XX妖晶购买1次挑战次数并发起挑战? local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP, GuildTranscriptManager.shopGoodId, 1) local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name if finalNum > BagManager.GetItemCountById(costId) then - PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) ) + PopupTipPanel.ShowTip(string.format(Language[11652],itemName) ) return end - MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次挑战次数并发起挑战?",finalNum,itemName), nil, function() + MsgPanel.ShowTwo(string.format( Language[12327],finalNum,itemName), nil, function() --买东西 ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function() - PopupTipPanel.ShowTip("成功购买1次挑战次数!") + PopupTipPanel.ShowTip(Language[12328]) UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.GUILD_TRANSCRIPT) PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM, 1)--更新特权 this.ShowEndNumInfo() @@ -96,19 +96,19 @@ function GuildTranscriptMainPopup:BindEvent() Util.AddClick(this.quickWarbtn,function() if GuildTranscriptManager.GetCanBattleCount() <=0 then --今日已无剩余次数! if GuildTranscriptManager.GetCanBuyBattleCount() <= 0 then - PopupTipPanel.ShowTip("今日已无剩余次数!") + PopupTipPanel.ShowTip(Language[12326]) else--是否花费XX妖晶购买1次挑战次数并发起挑战? local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP, GuildTranscriptManager.shopGoodId, 1) local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name if finalNum > BagManager.GetItemCountById(costId) then - PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) ) + PopupTipPanel.ShowTip(string.format(Language[11652],itemName) ) return end --是否花费XX妖晶购买1次扫荡次数,本次扫荡伤害为XXXXXX - MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次扫荡次数,本次扫荡伤害为%s?",finalNum,itemName,GuildTranscriptManager.damage), nil, function() + MsgPanel.ShowTwo(string.format( Language[12329],finalNum,itemName,GuildTranscriptManager.damage), nil, function() --买东西 ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function() - PopupTipPanel.ShowTip("成功购买1次扫荡次数!") + PopupTipPanel.ShowTip(Language[12330]) PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM, 1)--更新特权 this.QuickWar() this.ShowEndNumInfo() @@ -116,7 +116,7 @@ function GuildTranscriptMainPopup:BindEvent() end) end else - MsgPanel.ShowTwo(string.format( "确定以上次挑战的%s伤害进行扫荡吗?",GuildTranscriptManager.damage), nil, function() + MsgPanel.ShowTwo(string.format( Language[12331],GuildTranscriptManager.damage), nil, function() this.QuickWar() end) end @@ -125,17 +125,17 @@ function GuildTranscriptMainPopup:BindEvent() local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP, GuildTranscriptManager.shopGoodId, 1) local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name if finalNum > BagManager.GetItemCountById(costId) then - PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) ) + PopupTipPanel.ShowTip(string.format(Language[11652],itemName) ) return end if GuildTranscriptManager.GetCanBuyBattleCount() <= 0 then PopupTipPanel.ShowTip(Language[11705]) return end - MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次挑战次数?",finalNum,itemName), nil, function() + MsgPanel.ShowTwo(string.format( Language[12332],finalNum,itemName), nil, function() --买东西 ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function() - PopupTipPanel.ShowTip("成功购买1次挑战次数!") + PopupTipPanel.ShowTip(Language[12328]) PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM, 1)--更新特权 this.ShowEndNumInfo() end) @@ -149,11 +149,11 @@ function GuildTranscriptMainPopup:BindEvent() local pos = MyGuildManager.GetMyPositionInGuild() LogGreen("pos "..pos) if pos == GUILD_GRANT.MEMBER then - PopupTipPanel.ShowTip("只有会长和副会长才可使用此功能!") + PopupTipPanel.ShowTip(Language[12333]) return end if cutOpenIndex ~= GuildTranscriptManager.GetCurBoss() then - PopupTipPanel.ShowTip("该首领已被击败!") + PopupTipPanel.ShowTip(Language[12334]) return end NetManager.GuildChallengeMessageResponse(function (msg) @@ -168,8 +168,8 @@ function GuildTranscriptMainPopup:BindEvent() local minute = math.floor(second / 60) % 60 local sec = math.floor(second % 60) local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) - local timeStr = string.format("%s分%s秒", minute, sec) - PopupTipPanel.ShowTip(string.format("%s后才可再次使用此功能!",timeStr)) + local timeStr = string.format(Language[12231], minute, sec) + PopupTipPanel.ShowTip(string.format(Language[12335],timeStr)) end end) end) @@ -180,21 +180,21 @@ function GuildTranscriptMainPopup:BindEvent() local buyNum = curguildCheckpointConfig.AttributePromotePrice[2][nextBuyIndex] local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name if not buyNum then - PopupTipPanel.ShowTip("强攻效果已到达最高!") + PopupTipPanel.ShowTip(Language[12336]) return end if buyNum > BagManager.GetItemCountById(itemId) then - PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) ) + PopupTipPanel.ShowTip(string.format(Language[11652],itemName) ) return end if curguildCheckpointConfig.AttributePromotePrice[2][nextBuyIndex] then local addNum = ConfigManager.GetConfigData(ConfigName.FoodsConfig,curguildCheckpointConfig.AttributePromote[nextBuyIndex]).EffectPara - MsgPanel.ShowTwo(string.format("是否消耗%s%s购买一次强攻效果?购买后攻击力加成提升至%s",buyNum,itemName,math.floor(addNum[1][2]/100) ).."%", nil, function() + MsgPanel.ShowTwo(string.format(Language[12337],buyNum,itemName,math.floor(addNum[1][2]/100) ).."%", nil, function() --买东西 NetManager.GuildChallengeBuyBuffRequest() end) else - PopupTipPanel.ShowTip("强攻效果已到达最高") + PopupTipPanel.ShowTip(Language[12338]) end end) end @@ -283,7 +283,7 @@ function this.SingleChapterDataShow(go,data) end Util.AddOnceClick(Util.GetGameObject(go,"click"),function() if data.Id > GuildTranscriptManager.GetCurBoss() then - return PopupTipPanel.ShowTip("击败前一个首领方可解锁!") + return PopupTipPanel.ShowTip(Language[12339]) end this.ShowPanelInfo(data.Id) this.SetSelectImagePos(go) @@ -359,7 +359,7 @@ function this.ShowBossInfo() this.bossHerohpPass.fillAmount = GuildTranscriptManager.GetBlood()/10000 this.bossHerohpPassText.text = GuildTranscriptManager.GetBlood()/100 .."%" if cutOpenIndex < GuildTranscriptManager.GetCurBoss() then - this.bossHerohpPassText.text = "已通关" + this.bossHerohpPassText.text = Language[12340] end local liveName = GetResourcePath(curheroConfig.Live) local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, curheroConfig.Id) @@ -430,8 +430,8 @@ function this.GetMonsterConfigDataById(MonsterId) return monsterData end function this.ShowEndNumInfo() - this.endNumText.text = "剩余次数:" .. GuildTranscriptManager.GetCanBattleCount() - this.endNumBuyText.text = "剩余购买次数:" .. GuildTranscriptManager.GetCanBuyBattleCount() + this.endNumText.text = Language[12341] .. GuildTranscriptManager.GetCanBattleCount() + this.endNumBuyText.text = Language[12342] .. GuildTranscriptManager.GetCanBuyBattleCount() end function this.QuickWar() GuildTranscriptManager.GuildChallengeRequest(1,function() @@ -453,9 +453,9 @@ function this.ShowBuffData() local GetbuffTime = GuildTranscriptManager.GetbuffTime() > 0 and GuildTranscriptManager.GetbuffTime() - PlayerManager.serverTime or 0 if attackBuffNum == 0 then --%s - this.attackInfoText.text = "全公会成员攻击力+0%(未激活) " + this.attackInfoText.text = Language[12343] else - this.attackInfoText.text = string.format("全公会成员攻击力+ %s ",attackBuffNum).."%" + this.attackInfoText.text = string.format(Language[12344],attackBuffNum).."%" end this.RemainTimeDown(this.attackInfoTime, GetbuffTime) end @@ -503,7 +503,7 @@ function this.TimeStampToDateString(second) local minute = math.floor(second / 60) % 60 local sec = math.floor( second % 60) local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) - return string.format("(%s:%s:%s:后失效)",hour, minute, sec) + return string.format(Language[12345],hour, minute, sec) end function this.SetSelectImagePos(parent) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua index a5419a6faf..33c1fdf57a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua @@ -1,4 +1,4 @@ -GuildTranscriptManager = {}; +GuildTranscriptManager = {}; local this = GuildTranscriptManager local guildCheckpointConfig = ConfigManager.GetConfig(ConfigName.GuildCheckpointConfig) local allChapterConfigData = {} @@ -71,7 +71,7 @@ function this.RefreshGuildTranscriptInfo(msg) isKillShowTip = true if attackTypeShotTime == 1 then local monsterData = this.GetMonsterConfigDataById(oldBossId) - PopupTipPanel.ShowTip( string.format("已击败【%s】!",monsterData.ReadingName) ) + PopupTipPanel.ShowTip( string.format(Language[12346],monsterData.ReadingName) ) end end if oldBossId ~= curBoss then--前后ID不等认为是击杀 @@ -88,7 +88,7 @@ end function this.IsKillShowTip() if isKillShowTip and attackTypeShotTime == 0 then local monsterData = this.GetMonsterConfigDataById(oldBossId) - PopupTipPanel.ShowTip( string.format("已击败【%s】!",monsterData.ReadingName) ) + PopupTipPanel.ShowTip( string.format(Language[12346],monsterData.ReadingName) ) end end function this.RefreshGuildTranscriptBuffInfo(msg) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptRewardSortPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptRewardSortPanel.lua index cce6bc35ec..1abbaeec48 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptRewardSortPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptRewardSortPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") GuildTranscriptMainPopup = Inherit(BasePanel) local this = GuildTranscriptMainPopup local guildCheckpointConfig diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildMemberView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/View/GuildMemberView.lua index 3eb6614aba..84af9dc53a 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 27239da0f5..0cf72885cf 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 d9255d3cab..8e451abb11 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 c0141687dc..37ef8b0488 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 369f203bad..03ebfa1ea8 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 e976744149..438654910c 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 163130d2c8..8d061f482c 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 9f2f8aa998..7f23c4e6b8 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 e073770848..a40458e0b6 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 902aadce06..3c407999aa 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 343f241bd3..60b7be52f1 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 0665b80463..e6b1885c65 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 6e3bb9ef46..0b232d717a 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 edd966183e..9e98ef6817 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 fcf0d65184..46ac2abdf1 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 bb342c3c9f..d5b532e034 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 c246c9f38a..2f597eeb5e 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) @@ -180,7 +180,7 @@ function LuckyCatPanel:OnRefresh() end end end - this.rechargeNumberText.text = "$"..string.format("%s", againRechargeMoney) .. "即可再抽取" .. string.format(Language[11137], canGetTime) + this.rechargeNumberText.text = "$"..string.format("%s", againRechargeMoney) .. Language[12347] .. string.format(Language[11137], canGetTime) if (this.isEnter == false) then this.rechargeNumberText.text = "" this.textShow.text = "" diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyCat/View/LuckyCat.lua b/Assets/ManagedResources/~Lua/Modules/LuckyCat/View/LuckyCat.lua index 3382a6a359..82e2aaa7a8 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 1627eb1222..8b9f93a33e 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 393ef8412c..a34a02a4cc 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 @@ -399,7 +399,7 @@ function this.SwitchTreasureType(treasureType) PopupTipPanel.ShowTip(Language[12262]) else if LuckyTurnTableManager.advanceTimes + 1 > maxTimesCount then - PopupTipPanel.ShowTip("不可超出最大探宝次数!") + PopupTipPanel.ShowTip(Language[12261]) return else UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,61,nil) @@ -424,7 +424,7 @@ function this.SwitchTreasureType(treasureType) PopupTipPanel.ShowTip(Language[12262]) else if LuckyTurnTableManager.advanceTimes + 10 > maxTimesCount then - PopupTipPanel.ShowTip("不可超出最大探宝次数!") + PopupTipPanel.ShowTip(Language[12261]) return else UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,61,nil) diff --git a/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua index 37eb596965..131ca678c3 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 1dd7295def..64a05287f1 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 51dc1a1a80..f07c0574f1 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 1f75a9963c..dd6c77371d 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 7e37ab6fc8..ec3a595778 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1,4 +1,4 @@ - + require("Base/BasePanel") require("Modules/Main/View/MainPlayerView") MainPanel = Inherit(BasePanel) @@ -661,7 +661,7 @@ function this:BindEvent() UIManager.OpenPanel(UIName.CarbonTypePanelV2) else local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.ENDLESS) - PopupTipPanel.ShowTip(string.format("玩家等级达到%s级开启",config.OpenRules[2])) + PopupTipPanel.ShowTip(string.format(Language[12297],config.OpenRules[2])) end end) Util.AddClick(this.btnFenjie, function() diff --git a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua index 63c81f7f9e..2f30d3bdea 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 678f20e6c8..4a79c54588 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 4c1324d099..1a345907f2 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 f273396405..a50d3ba365 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 d2c9a21efd..5077109a97 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 58194700ef..ab22b9a6e2 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 1c5ee0489b..15e14a9247 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 e64e30aa50..a235233ffc 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 cf0b8b731e..aee4ac4d6b 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 d31543ab63..38541f09c8 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 7e696c0490..7919d6f45f 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 ac424f3da6..607d20ea22 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 cad528acdc..949fdf5cf0 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 e5872a676d..5e842da29d 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 7158d23d9a..497454fff8 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 c0ba293499..26a5cd5a1f 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 6d7a0e5333..a6d8aa51eb 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 938d2c79a1..9d154238e8 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 4f00959398..91b7eedbba 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 a430c7f6fe..c5dcf73257 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 b27419824e..138dfdf73d 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 66ce9ef364..7d1f9a0aac 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 dbf32a28e0..e98bc2bc60 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 ba649b26b1..588c2c2528 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 507eef499f..d129656905 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 9867c22a4b..97fb844009 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 d36a12adf3..b15df204da 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 f58a01a788..1dfc805707 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 8b8895b64c..97f09c9981 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 79da4a5eb4..0b2c77e0c6 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 613570c5cc..e63c869ccd 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 04eb340175..1b34872ba1 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 6e0af543fa..b7f7cf5797 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 c7ac74d4e2..f6f1f66012 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 6c3f18a825..603564b975 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 c1ee26fc04..a030d70472 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 ee62462c76..147ca6815d 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 fbaf3ba106..4d466622e9 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 a2379c17cb..5cb36f9482 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 56f2c0ca66..2660696efe 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 659b88996a..0b19468e1e 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 f0680d1035..74927c481b 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 f724a91027..8f107bbb4f 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 05c53faa38..da99c3562f 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 c6abad57a4..674d3f3210 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 d6a538de1a..63b4845d4f 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 69708d2161..8eb2320cee 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 c027b1148a..72439f954b 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 ef2d4e4c79..701eb5effa 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 b03029b9b2..70e969b355 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 3a5ac2ce6c..1a9d6b1c53 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 b578ac421f..06f756bb33 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 bd208104d0..7981554982 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 cae531d3e9..33e48c5095 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 9bab542b4d..ef84f82e84 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 89395c5eaa..deaa27a3f6 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 30d90d0c65..0a880d4568 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Base/Stack") MissionDailyTipPanel = Inherit(BasePanel) local this = MissionDailyTipPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Message/MsgPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/MsgPanel.lua index c7a2927b01..7ebfccc6ac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/MsgPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/MsgPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") MsgPanel = Inherit(BasePanel) local str1 = Language[10508] diff --git a/Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua b/Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua index cfd3a6bb6b..add1cf7be5 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 1c7b7effe1..d929263021 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 712de3db46..eeb5b2751e 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 37172ac17f..223b944127 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 faab2ff255..be5964af93 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 212fa39c3a..a8e9552fd4 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 77cc1e0274..a3ed76cc31 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 fb56b05f7d..0d371967f9 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 318afde838..32c5c5e613 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 65d75945f5..52fd9271c6 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 30f2b2094c..37e982baae 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 2a6f6347b0..0b0e5fc4e9 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 8526a16705..7f69ed2407 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 e4b8392e6a..95804a5017 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 45c97a7e24..f6c33a2ee9 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 80db24b2ce..1d4abd1817 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 60fcca79d0..e82492ddc7 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 9ba17e153b..432bc2cbbd 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 --子模块脚本 @@ -12,8 +12,8 @@ local contentScripts = { } local TabBox = require("Modules/Common/TabBox") local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11358],type = -1 }, - [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "青龙秘宝" ,type = ActivityTypeDef.TreasureOfSomeBody }, - [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "秘宝试炼" ,type = ActivityTypeDef.TreasureOfSomeBody }, + [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12348] ,type = ActivityTypeDef.TreasureOfSomeBody }, + [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12349] ,type = ActivityTypeDef.TreasureOfSomeBody }, [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11359],type = -1 }, } local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} @@ -124,7 +124,7 @@ end function this.SwitchView(_index) if _index == 2 or _index == 3 then if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then - PopupTipPanel.ShowTip("未在活动时间范围内") + PopupTipPanel.ShowTip(Language[10778]) return end end @@ -143,9 +143,9 @@ function this.SwitchView(_index) if index == 1 then this.titleText.text = Language[11358] elseif index == 2 then - this.titleText.text = "青龙秘宝" + this.titleText.text = Language[12348] elseif index == 3 then - this.titleText.text = "秘宝试炼" + this.titleText.text = Language[12349] elseif index == 4 then this.titleText.text = Language[11360] end diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua index 769ef70be8..18f3ef5bdf 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 96fad5db3f..f6f4d53a6e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua @@ -1,4 +1,4 @@ ------ 日常任务弹窗 ----- +----- 日常任务弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua index 500207e376..eb12423964 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua @@ -1,4 +1,4 @@ ------ 日常任务弹窗 ----- +----- 日常任务弹窗 ----- local this = {} --传入父脚本模块 local parent @@ -70,7 +70,7 @@ end this.Closefunction = function() Timer.New(function() if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then - PopupTipPanel.ShowTip("活动已结束") + PopupTipPanel.ShowTip(Language[12320]) parent:ClosePanel() return @@ -83,10 +83,10 @@ function this:OnShow(_parent,...) parent=_parent sortingOrder = _parent.sortingOrder - this.tips.text = "完成日常任务和秘宝试炼以提升秘宝等级,领取对应奖励,解锁秘宝可领取额外奖励" + this.tips.text = Language[12350] local startTime,endTime,endTimeScale = QinglongSerectTreasureManager.GetTimeStartToEnd() - this.time.text = "活动时间:"..startTime.."-"..endTime - this.remainTime.text = "剩余时间:"..TimeToDHMS(tonumber(endTimeScale) - GetTimeStamp()) + this.time.text = Language[10546]..startTime.."-"..endTime + this.remainTime.text = Language[12321]..TimeToDHMS(tonumber(endTimeScale) - GetTimeStamp()) this:ShowTime(endTimeScale) this.refresh() @@ -132,16 +132,16 @@ function this:topBar() this.scoreText.text = curScore .."/"..rewardData.needScore - needScore this.progress.fillAmount = curScore/(rewardData.needScore - needScore) else - this.scoreText.text = "最大等级" + this.scoreText.text = Language[12351] this.progress.fillAmount = 1 end this.jiesuoBtn:GetComponent("Button").enabled = (treasureState == 0) - this.jiesuoBtnText.text = ((treasureState == 0) and "解锁秘宝" or "已解锁") + this.jiesuoBtnText.text = ((treasureState == 0) and Language[12352] or Language[12353]) Util.AddOnceClick(this.jiesuoBtn,function() UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.HeavenUnlockExtraRewardPanel,2) end) this.buyBtn:GetComponent("Button").enabled = (rewardData.needScore ~= 0) - this.buyBtnText.text = ((rewardData.needScore == 0) and "最大等级" or "购买等级") + this.buyBtnText.text = ((rewardData.needScore == 0) and Language[12351] or Language[12354]) Util.AddOnceClick(this.buyBtn,function() UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.QinglongSerectTreasureBuyLevel) end) @@ -163,7 +163,7 @@ function this:topBar() Timer.New(function() NetManager.GetActivityRewardRequest(-2,QinglongSerectTreasureManager.activityId,function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(1007, 1) - PopupTipPanel.ShowTip("成功领取额外积分包") + PopupTipPanel.ShowTip(Language[12355]) Timer.New(function() LogBlue("level:"..QinglongSerectTreasureManager.GetLevel()) this.refresh() @@ -239,10 +239,10 @@ function this:SingleTask(rewardItem, rewardSingleData) this:InitButtonState(rewardItem, rewardSingleData) end local type={ - [-2]={sprite = "s_slbz_1anniuhuise",text = "未达成"}, + [-2]={sprite = "s_slbz_1anniuhuise",text = Language[10348]}, [-1]={sprite = "t_tequan_yidacheng",text = ""}, - [0]={sprite = "s_slbz_1anniuongse",text = "领取"}, - [1]={sprite = "s_slbz_1anniuhuangse",text = "再次领取"} + [0]={sprite = "s_slbz_1anniuongse",text = Language[10022]}, + [1]={sprite = "s_slbz_1anniuhuangse",text = Language[12356]} } --初始化按钮状态 function this:InitButtonState(rewardItem, rewardSingleData) @@ -301,7 +301,7 @@ function this:ShowTime(endtime) self.timer = nil end local timeDown= endtime - GetTimeStamp() - this.remainTime.text = "剩余时间:"..TimeToDHMS(timeDown) + this.remainTime.text = Language[12321]..TimeToDHMS(timeDown) self.timer = Timer.New(function() if timeDown < 1 then self.timer:Stop() @@ -309,7 +309,7 @@ function this:ShowTime(endtime) return end timeDown = timeDown - 1 - this.remainTime.text = "剩余时间:"..TimeToDHMS(timeDown) + this.remainTime.text = Language[12321]..TimeToDHMS(timeDown) end, 1, -1, true) self.timer:Start() end diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua index 7328dc6181..97958b5378 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua @@ -1,4 +1,4 @@ ------ 日常任务弹窗 ----- +----- 日常任务弹窗 ----- local this = {} --传入父脚本模块 local parent @@ -78,7 +78,7 @@ end this.Closefunction = function() Timer.New(function() if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then - PopupTipPanel.ShowTip("活动已结束") + PopupTipPanel.ShowTip(Language[12320]) parent:ClosePanel() return @@ -98,7 +98,7 @@ end function this:SetTopBar() treasureState = QinglongSerectTreasureManager.GetTreasureState()--秘宝礼包状态 0:可购买 1:已购买 this.jiesuoBtn:GetComponent("Button").enabled = (treasureState == 0) - this.jiesuoBtnText.text = ((treasureState == 0) and "解锁秘宝" or "已解锁") + this.jiesuoBtnText.text = ((treasureState == 0) and Language[12352] or Language[12353]) Util.AddOnceClick(this.jiesuoBtn,function() UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.HeavenUnlockExtraRewardPanel,2) end) @@ -121,7 +121,7 @@ function this:SetTopBar() local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody) NetManager.GetActivityRewardRequest(-2,id,function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(1007, 1) - PopupTipPanel.ShowTip("成功领取额外积分包") + PopupTipPanel.ShowTip(Language[12355]) this.refresh(curType) end) end,1.5):Start() @@ -159,9 +159,9 @@ function this:showTaskList(type) end) end local type={ - [0]={sprite = "s_slbz_1anniuhuangse",text = "前往"}, - [1]={sprite = "s_slbz_1anniuongse",text = "领取"}, - [2]={sprite = "s_slbz_1anniuhuise",text = "已领取"}, + [0]={sprite = "s_slbz_1anniuhuangse",text = Language[10023]}, + [1]={sprite = "s_slbz_1anniuongse",text = Language[10022]}, + [2]={sprite = "s_slbz_1anniuhuise",text = Language[10350]}, } --单个任务 function this:SingleTask(go, rewardSingleData) @@ -173,7 +173,7 @@ function this:SingleTask(go, rewardSingleData) local value = sConFigData.taskValue[2][1] titleText.text = strs[1].."("..(math.abs(sConFigData.progress) > math.abs(value) and math.abs(value) or math.abs(sConFigData.progress)) .."/"..math.abs(value)..")" local rewardText = Util.GetGameObject(activityRewardGo, "reward"):GetComponent("Text") - rewardText.text = (strs[2] and strs[2] or "")..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name .."/次" + rewardText.text = (strs[2] and strs[2] or "")..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name ..Language[12357] local state = sConFigData.state local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "lingquButton") local red = Util.GetGameObject(lingquButton.gameObject, "redPoint") @@ -184,7 +184,7 @@ function this:SingleTask(go, rewardSingleData) Util.AddOnceClick(lingquButton, function() if state == 1 then NetManager.TakeMissionRewardRequest(TaskTypeDef.TreasureOfSomeBody,sConFigData.id, function(msg) - PopupTipPanel.ShowTip("成功领取"..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name) + PopupTipPanel.ShowTip(Language[12358]..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name) Timer.New(function() this.refresh(curType) end,1):Start() @@ -208,7 +208,7 @@ function this:ShowTime(curType) or ActivityGiftManager.GetTaskEndTime(8) LogBlue("endtime:"..endtime) local timeDown = endtime - GetTimeStamp() - this.remainTime.text = "剩余时间:"..TimeToDHMS(timeDown) + this.remainTime.text = Language[12321]..TimeToDHMS(timeDown) self.timer = Timer.New(function() if timeDown < 1 then self.timer:Stop() @@ -216,7 +216,7 @@ function this:ShowTime(curType) return end timeDown = timeDown - 1 - this.remainTime.text = "剩余时间:"..TimeToDHMS(timeDown) + this.remainTime.text = Language[12321]..TimeToDHMS(timeDown) end, 1, -1, true) self.timer:Start() end diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua index dc50a8d34a..91e742da90 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 4aac707eab..7418168dff 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 b6f15176ae..b7cba170ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/ProgressPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/ProgressPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") ProgressPanel = Inherit(BasePanel) local this= ProgressPanel --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua index 1f86726efd..0441372034 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua @@ -1,4 +1,4 @@ -QinglongSerectTreasureManager = {} +QinglongSerectTreasureManager = {} local this = QinglongSerectTreasureManager local TreasureSunlongConfig = ConfigManager.GetConfig(ConfigName.TreasureSunlongConfig) local TreasureSunLongTaskConfig = ConfigManager.GetConfig(ConfigName.TreasureSunLongTaskConfig) @@ -110,7 +110,7 @@ function this.GetTimeShow(data) local year = math.floor(os.date("%Y", data)) local month = math.floor(os.date("%m", data)) local day = math.floor(os.date("%d", data)) - local time = year .. "年" .. month .. "月" .. day .. "日" + local time = year .. Language[12359] .. month .. Language[12360] .. day .. Language[12303] return time end diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/SecondaryMissionManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/SecondaryMissionManager.lua index 80923b509e..e984d35f6d 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 a65e52b3ad..c81a41880d 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 a60bb6f991..25dd961602 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 8f51282e90..1c50852d60 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 94f5f956cf..d87df77730 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 b414ad5692..c62f094568 100644 --- a/Assets/ManagedResources/~Lua/Modules/OnlineReward/OnlineRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/OnlineReward/OnlineRewardPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local OnlineRewardPanel = Inherit(BasePanel) local this = OnlineRewardPanel local itemPreList={} --item预设容器 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/AttentionGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/AttentionGiftPage.lua index a64ac35fb0..570eff9fcf 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 2ef4bdb856..2101d84d1f 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 6546bc7a66..54fe9aff04 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 ed2379d1b2..dac54e7d8e 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 @@ -72,7 +72,7 @@ function CumulativeSignInPage:RefreshBox() local curDay = data.value progressBottom.fillAmount = curDay/7 - text.text = curDay.."天" + text.text = curDay..Language[10021] rewardPanel:SetActive(false) for i = 1, #data.mission do @@ -90,7 +90,7 @@ function CumulativeSignInPage:RefreshBox() if curDay激活30天月卡"--Language[11477] + self.smallDay1.text = Language[11476].. string.format(MoneyUtil.GetMoneyUnitName(),monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].Price) ..Language[12363]--Language[11477] self.smallDay2.text = Language[11478]..monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].BaseReward[1][2] .."" self.smallDayIcon.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].BaseReward[1][1]).ResourceID)) self.smallProgress:SetActive(not curMonthCardOpenState) @@ -101,7 +101,7 @@ function MonthCardPage:RefreshStoneShow() self.bigProgress:GetComponent("Text").text = "("..OperatingManager.GetsmonthSaveAmt().."/"..monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price..")" self.bigDayRightUpText = monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].ContiueDays * monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][2] self.bigDayRightUpIcon = SetIcon(monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][1]) - self.bigDay1.text = Language[11476].. string.format(MoneyUtil.GetMoneyUnitName(),monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price) .."即可激活30天月卡"--Language[11477] + self.bigDay1.text = Language[11476].. string.format(MoneyUtil.GetMoneyUnitName(),monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price) ..Language[12363]--Language[11477] self.bigDay2.text = Language[11478]..monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][2] .."" self.bigDayIcon.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][1]).ResourceID)) self.bigMonthRedPot:SetActive(OperatingManager.RefreshMonthCardRedPoint(MONTH_CARD_TYPE.LUXURYMONTHCARD)) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthRewardPreviewPopup.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthRewardPreviewPopup.lua index e7b3014808..779a6ee036 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 e16c674e78..11a91dee69 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 ca22271177..59aefe9273 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua @@ -1,4 +1,4 @@ ---[[ +--[[ * @ClassName OperatingPanel * @Description 运营活动 * @Date 2019/5/25 14:16 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index d2ac91c456..fffe18c490 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 9c5d026c2a..aa07a07150 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 b9d096aa77..a42547e97e 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 1a37b6b95a..19268912be 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 ee5ae2cd12..b275fb5c9f 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 121c1051c0..dfa795c52e 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 31825bf6b8..e6cdc87a4a 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 7cc26a6f8b..ce97f8867f 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 eb57160a34..73cbd2dfb5 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 8e4a75d659..1d567876f6 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 b1dbc1909d..1a36d5893f 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 5125f5f3c7..b70fffb987 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 2512e3fd8f..e96319eabb 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 595d2f0140..68a7409521 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 fa821bd556..44dcd6286f 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 453315d34f..9e74e2f14a 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 3dfd1e20e1..c0d9ee4e9d 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 73f35be1b4..e36caccc25 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 6134899564..dadce053e1 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 e245e27c71..77a82c6e81 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 8bee47e3f0..29ebc32128 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 79a37d7f02..54374a72a6 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 3d0fe1fb79..a5d53cc415 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 ab8f5e0ca8..e76b57975f 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 ec185870fc..65a064895d 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 a54d76263d..ff7899af35 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 c75869adeb..a2985e24aa 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 5aee74127c..88a5c8bd87 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 ef9ee1fbf9..38dd76ec60 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 7a5937fa9c..f2ae67f870 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 ee6849b218..9376559a11 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 a6ff9a7824..1e4bbaf26a 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 04fce8245d..7679d305ae 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 868ccfa8e1..20bb76d140 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 5c8bf39fc9..cb4b209445 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 dee3995f0e..3de56bf7ea 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 34d84d57c2..5d6f3c0002 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 98e65178ce..577aa76a23 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 5b9d5a2a8d..6d78a1636d 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 f00f7b827f..a40750ce22 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 7544c5e5bc..58ce76069f 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 9651415485..17c29143d6 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 77087c2607..deadd33432 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 9c6ffd52d2..661a2686de 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 e8262fcfcd..a2cb1a853c 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 f4c51fbcf3..203c7a42b3 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 798ee1c222..6036e1848f 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 c30f9b192d..780dd63880 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 361b97a3f9..733f0b56c8 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 9e9c1317ae..1c3385b4d1 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 c88433a80e..4707b3c086 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 efa53ee62e..d51e6d74a9 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 73cd4384ef..d018f2661e 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 d0b6dfdafe..4a79a25439 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 69c0c0c949..29eccafd9a 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 87f4c7d9c8..77176ee69e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/UnlockCheckpointPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/UnlockCheckpointPopup.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") --解锁关卡弹窗 UnlockCheckpointPopup = Inherit(BasePanel) local this=UnlockCheckpointPopup diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims.lua index 198c589995..6cb9202b15 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims.lua @@ -1,4 +1,4 @@ ------ 归元弹窗 ----- +----- 归元弹窗 ----- local this = {} --传入父脚本模块 local parent @@ -41,7 +41,7 @@ function this:OnShow(_parent,...) parent=_parent sortingOrder =_parent.sortingOrder local args = {...} - this.bodyText.text =string.format("是否消耗%s%s购买一次挑战次数?",args[1],args[3]) + this.bodyText.text =string.format(Language[12364],args[1],args[3]) func = args[2] if XuanYuanMirrorManager.GetBuyTimesTip() then this.root:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua index ebf05238d8..a5aeb13dd0 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 8a4ddee92a..c3f45af858 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 47771e9fa5..8775026c4c 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 fc7a811cd4..a5483af6c8 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 afd20e2039..6a82038ae0 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 c1552c9317..8278c94e42 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 401fb3c753..2549e3e1a7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua @@ -1,4 +1,4 @@ ------ 公会技能重置弹窗 ----- +----- 公会技能重置弹窗 ----- local this = {} --传入父脚本模块 local parent diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua index ef8e920d8c..b26b87386f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua @@ -1,4 +1,4 @@ ------ 装备批量出售 ----- +----- 装备批量出售 ----- local this = {} --传入父脚本模块 local parent @@ -12,8 +12,8 @@ local treasureState--礼包状态 local rewardData--表内活动数据 local curType = 0 local type = { - [1] = {name="天宫秘宝",id = 106,goodsType = GoodsTypeDef.TreasureOfHeaven}, - [2] = {name="青龙秘宝",id = 5001,goodsType = GoodsTypeDef.FindBaby}, + [1] = {name=Language[12365],id = 106,goodsType = GoodsTypeDef.TreasureOfHeaven}, + [2] = {name=Language[12348],id = 5001,goodsType = GoodsTypeDef.FindBaby}, } --初始化组件(用于子类重写) @@ -57,11 +57,11 @@ function this:OnShow(_parent,...) rewardStateData = TreasureOfHeavenManger.GetState() rewardData = TreasureOfHeavenManger.GetAllRewardData() this:showRewardTianGong() - this.tip.text = "解锁秘宝,可以领取额外专属奖励,并直接获得200积分" + this.tip.text = Language[12366] elseif curType == 2 then rewardData = QinglongSerectTreasureManager.GetAllRewardData() this:showRewardQinglong() - this.tip.text = "解锁高阶战令,激活进阶专属奖励+直升15级" + this.tip.text = Language[12367] end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua index 3c8ebd0060..64f8b41129 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_QinglongSerectTreasureBuyLevel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel.lua index 8e0eda1c12..b04c464175 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel.lua @@ -1,4 +1,4 @@ ------ 装备批量出售 ----- +----- 装备批量出售 ----- local this = {} --传入父脚本模块 local parent @@ -35,7 +35,7 @@ function this:BindEvent() LogBlue("点击了购买等级的按钮") NetManager.RequestBuyTreasureLevel(templv, function(msg) Timer.New(function() - PopupTipPanel.ShowTip("等级购买成功") + PopupTipPanel.ShowTip(Language[12368]) parent:ClosePanel() Game.GlobalEvent:DispatchEvent(GameEvent.TreasureOfHeaven.BuyQinglongSerectLevelSuccess) end,1):Start() @@ -53,10 +53,10 @@ function this:SetCount(value) count = value this.slider.value = value templv = lv + count - this.tip.text = string.format("购买%s级,升至%s级",count,templv) + this.tip.text = string.format(Language[12369],count,templv) this.num.text = a * count ^ 3 + b * count ^ 2 + c * count + d local tempCount = this:Caculate(templv) - this.bodyText.text=string.format("升至%s级,可立即解锁%s件奖励",templv,tempCount) + this.bodyText.text=string.format(Language[12370],templv,tempCount) end function this:Caculate(templv) local rewardData = QinglongSerectTreasureManager.GetAllRewardData() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua index 164e0eb33c..ae0c56da8c 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 @@ -48,7 +48,7 @@ function this:OnShow(_parent,...) this.titleText.text=Language[11638] this.text1.text=string.format(Language[11639],s) this.text2.text=Language[11640] --后续改成读表 - this.text3.text="需要充值"..string.format(MoneyUtil.GetMoneyUnitName(),b).."以上才可打开" + this.text3.text=Language[12371]..string.format(MoneyUtil.GetMoneyUnitName(),b)..Language[12372] this.curNum.text=string.format(Language[11637],BagManager.GetItemCountById(94)) Util.SetGray(this.okBtn,VipManager.GetChargedNum()=b diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua index df9009a639..ddaf7e0ef3 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 @@ -47,27 +47,27 @@ function this:OnShow(_parent,...) if _args[1] == RecruitType.Single then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten local d=RecruitManager.GetExpendData(RecruitType.Single) - this.rootText.text = string.format("确认花费%s妖晶进行1次神将召唤?",d[2]) + this.rootText.text = string.format(Language[12373],d[2]) elseif _args[1] == RecruitType.QianKunBoxSingle then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen local d=RecruitManager.GetExpendData(RecruitType.QianKunBoxSingle) - this.rootText.text = string.format("确认花费%s妖晶抽取1次乾坤宝盒?",d[2]) + this.rootText.text = string.format(Language[12374],d[2]) elseif _args[1] == RecruitType.TimeLimitSingle then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen local d=RecruitManager.GetExpendData(RecruitType.TimeLimitSingle) - this.rootText.text = string.format("确认花费%s妖晶进行1次限时召唤?",d[2]) + this.rootText.text = string.format(Language[12375],d[2]) elseif _args[1] == RecruitType.Ten then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten local d=RecruitManager.GetExpendData(RecruitType.Ten) - this.rootText.text = string.format("确认花费%s妖晶进行10次神将召唤?",d[2]) + this.rootText.text = string.format(Language[12376],d[2]) elseif _args[1] == RecruitType.QianKunBoxTen then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen local d=RecruitManager.GetExpendData(RecruitType.QianKunBoxTen) - this.rootText.text = string.format("确认花费%s妖晶抽取10次乾坤宝盒?",d[2]) + this.rootText.text = string.format(Language[12377],d[2]) elseif _args[1] == RecruitType.TimeLimitTen then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen local d=RecruitManager.GetExpendData(RecruitType.TimeLimitTen) - this.rootText.text = string.format("确认花费%s妖晶进行10次限时召唤?",d[2]) + this.rootText.text = string.format(Language[12378],d[2]) end Util.AddOnceClick(this.btn,function() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua index 4ad484105e..2535204bb4 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 ba74f8dc2f..2fbf871fa4 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 3da25da0c9..eae60d6c9f 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 b1cb373dc9..2b3ae3f46b 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 3a0fddbc48..43317e019b 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 @@ -37,10 +37,10 @@ function this:BindEvent() PopupTipPanel.ShowTip(Language[11248]) return elseif MapTrialManager.curTowerLevel>10000 then - PopupTipPanel.ShowTip("奖励层不可使用炸弹~") + PopupTipPanel.ShowTip(Language[12379]) return elseif usedNum>=5 then - PopupTipPanel.ShowTip("炸弹使用已达最大次数~") + PopupTipPanel.ShowTip(Language[12380]) else NetManager.RequestUseBomb(function (msg)--请求使用炸弹 MapTrialManager.bombUsed = MapTrialManager.bombUsed + 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua index 70bbdd1a23..397042736b 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 ac57f61479..50f0545851 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 740e2f7c9b..1aeb93f231 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 50e8c723bc..fa75bd25bd 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 08f14faabf..063d17c3c1 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 d32ea8ac4a..a289e4fbeb 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 30d5bb9a7f..db260ea6dd 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 7aeefc698b..3e93c89664 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 d95b58e8ec..a5e04c5481 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 2665936518..ca5555f8d1 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 51dcad2901..1ea56666a5 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 f486b1abff..30ce7f2055 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 a72918eee3..a52834b922 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 149d059c74..e735df6a99 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 5fc9987ec6..a7593a8b1b 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 b145004fa9..114def0d52 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 fd625b50b5..814111220e 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 007ad811a5..4622a5ff23 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 64c5c01772..7c308b7c83 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 49f318e038..5fc7fd1b24 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua @@ -1,4 +1,4 @@ -RankingManager = {} +RankingManager = {} local this = RankingManager this.CurPage=0 this.curRankingData={}--战力排行滚动数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index e0a491afe6..7dc5dd4bc0 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 --头像 @@ -359,9 +359,9 @@ function this.SetInfoShow(go,data,rankType,Value0) Util.GetGameObject(go,"goldExper/Text"):GetComponent("Text").text = data.rankInfo.param1 end if sData.activiteId == ActivityTypeDef.GoldExper then - goldExper:GetComponent("Text").text = "点金次数" + goldExper:GetComponent("Text").text = Language[12381] elseif sData.activiteId == ActivityTypeDef.FastExplore then - goldExper:GetComponent("Text").text = "极速次数" + goldExper:GetComponent("Text").text = Language[12382] end elseif rankType == RANK_TYPE.ARENA_RANK then -- if data.personInfo.score and data.personInfo.score > 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua index bfc0b6f6a6..67622cd378 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 9c7984359a..ca26f3115b 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 d7d3bbb490..e4d8183234 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 9921cf2958..b2813bfbaa 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 2f09058ec8..5c95de60a0 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 a7e64fa79c..390d2e78bb 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 390cc08d9a..e1ec28c72a 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 c398adb49b..67e6545d34 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 5424fe0f2a..386ffdcb6e 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 c8dbfade3e..687b11df1c 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 c148515e43..4567a570b1 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 bebcbfca3b..992ea992cb 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 3b4f925f7b..16840b32ce 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 3fd665fdf6..87f328dfea 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 @@ -8,7 +8,7 @@ local TabBox = require("Modules/Common/TabBox") local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11786] }, [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11785] }, - [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "法宝归元" }, + [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12383] }, [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12212] }, } local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua index 9e83fbc50f..e3edf52540 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 a2747d6788..627fb15b78 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 d21d4a98ba..a52a5ff113 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 8431c6dacf..51cc6e1c72 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 4c2c9bd2e0..979e3a1610 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 48cc3beefd..44d77fbfd2 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 1b1d17d812..37ce21315a 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 e5e9a0f86e..4a3208c1f1 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 23d6414073..b81a3f7723 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 3f32d8ba02..a74650fd6b 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 a6de834393..092ec0e89e 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 e09cab5821..9a7e905788 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 3019ff3dd0..1c1f161389 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 5e3eb17cff..a9dadd6f43 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 f549f468f8..da617862a9 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 4555244415..e38168c64d 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 873e87faa0..0c62865e38 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 b0a446a3ab..5a08c722b9 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 84405255f2..a0fdca76b5 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 cfb9e3d14d..014aa87988 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 91df724c46..3dbcd82732 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 16b9822410..0a3db532fe 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 9aad30da2c..7f69010c92 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 f9d23bdc18..f54993be44 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 be774e8498..7322baa190 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 7a52985f1d..936965d3e5 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 982e8a72f8..71c1bbfeb6 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 ca13a6be30..605c292b95 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 104c5f71a1..e5bbcc4a6e 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 01e229ddf6..54d3890c5d 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 eedb20ff2d..1548e1c751 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 756b77542f..197437944f 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 ebe5948194..6f64adc7dd 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 2fe4c73d85..02d7acdbb4 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 19e6b619e0..029d27531b 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 5b68c941bd..dae2346220 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 26fa6b34f1..6c6b752bd3 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 2583823ded..9cde86f63a 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 9e69227753..d84a81739f 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 c0b7f69668..79a59ac172 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 a567665a6a..060d3b932c 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 94abfb3c1b..7a45f1d3e5 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 5de5c5b699..1810e5f516 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 105b1449ff..8e8a8a721c 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 5a1109c240..ee8a705f05 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 5e90e41d6f..82d674c4df 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 5191f867ae..baee7d73fb 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 d094dfeccc..0c4c5b56e1 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 e134ac03cd..c28ab29f1a 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 06a83a4b23..9cbc8dcd96 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 f0f3c01c15..7ecb660e6a 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 c6554f9395..9affae3d59 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 1cacde5552..32313cdd46 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 fd968e914c..cb7009e019 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 baac42a67a..84c6f22cee 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 e5e9c0bd48..b5f3ebdd2f 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 1112cade13..09d1ce00ca 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 a832785083..2dabf6da82 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 dbf8456038..28ff4ed3cc 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 2610b1866d..03fed2ee0c 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 754b7b7e55..ac8988ea84 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 540a842e42..7f62e97450 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 0b11ddfa87..5f644cb35b 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 c99ac78caf..562f857370 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) @@ -320,4 +320,3 @@ return this - diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index d4f3165fc4..9f3b21d79c 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 e9f2867a4b..d567214412 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 @@ -8,8 +8,8 @@ local treasureState--礼包状态 local rewardData--表内活动数据 local curType = 0 local type = { - [1]={name="天宫秘宝",id = 106,goodsType = GoodsTypeDef.TreasureOfHeaven}, - [2] = {name="青龙秘宝",id = 5001,goodsType = GoodsTypeDef.FindBaby}, + [1]={name=Language[12365],id = 106,goodsType = GoodsTypeDef.TreasureOfHeaven}, + [2] = {name=Language[12348],id = 5001,goodsType = GoodsTypeDef.FindBaby}, } --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua index ddc71e3f83..f6a5be6a3c 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 5c1587c7ff..625ef228e3 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local TreasureOfHeavenPanel = Inherit(BasePanel) local this = TreasureOfHeavenPanel local curScore = 0--当前分数 diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/BuyTreasureLevelPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/BuyTreasureLevelPanel.lua index 90ad1e4321..2c4b2733f6 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 8b5ab18272..d975721ffd 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 821f08c4cc..6bd6f39ad5 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 8591d58ebd..5441427af3 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 40d69fc377..542fb8e079 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 325df6446d..fc55b0d039 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 41c18ef153..4c02c15f83 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 27afd5c0b5..971ba3cd71 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 a722ff8574..bdfda1f2f7 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 7dbc34f51a..551e526887 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 @@ -15,8 +15,8 @@ local curType local fun--回调 local rechargeData local activityType = { -[1] = {name = "等级礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 21}, -[2] = {name = "五星成长礼",timePos = Vector3.New(0,-567,0),comp = "bg2",showType = 8}, +[1] = {name = Language[12384],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 21}, +[2] = {name = Language[12385],timePos = Vector3.New(0,-567,0),comp = "bg2",showType = 8}, } --初始化组件(用于子类重写) function this:InitComponent() diff --git a/Assets/ManagedResources/~Lua/Modules/Update/DownLoadManager.lua b/Assets/ManagedResources/~Lua/Modules/Update/DownLoadManager.lua index d9f90dc72c..3b65e2810f 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 6ed47f6713..bb4f946d78 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 3a71aaa666..ce1be2b7b6 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 b4ee1255c9..017bab748f 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 ccbc83b3a3..3af2471b6f 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 883cbbd840..6d804fb493 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 29ef058de1..2c1f5a18f0 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 89785f7302..7d367de916 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 48f8eca6db..7c731bea3e 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 f133f7409c..b93464ddbe 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 db1c63af5e..c2fcb2682b 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 01050d8a55..2e3a6457e8 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 d41b10882d..f8798c5819 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 cbbdf8240f..02c5f3b005 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 fb7e400ab3..3d7c811c26 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 2401af281c..00e999dd47 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 d926c6b9d3..1e69d25262 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 a06421bced..5f63415714 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 fe5e7f72a3..6a150a501e 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 678bc7e01d..e622d70e5b 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 c90aa5c597..8daca9ef2a 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 346466fa1a..9fbe8f1dd1 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 310f2ca6d7..dc93d83e06 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 b10098a3bb..1622b5c7f0 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 3cb57e63e3..afe5a8791c 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 f124885198..be437a4cdb 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 50661fa62e..5a811a936f 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 74c39a34b9..efdc795280 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 f5ff8c8fb4..8a0113aecf 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 601b532f33..998f15cccc 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 8df1c9a6aa..3d14c6ad11 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 e8170417b4..9e45dd3be9 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 55830147e8..282f34e59d 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 abfb331e47..67aae0664c 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 5c45f0f14c..9c5c02606c 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 bf69dcd278..d3014a3a8f 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 075548e0fd..c3df7bce60 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 a9ec3e5003..c9c25940fa 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 fdc58fff6a..3fd713c74f 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 0ad0b5ff97..3e8b66650e 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/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index 6b358a95f8..1b4ae5362b 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -2285,10 +2285,103 @@ 12285,޿ɹԪķ 12286,Ԫɹ 12287,ȷԪ -12288,%sķΪ1ʱĵĽҺǷȷϹԪ\n\n\t\t\t\t\t\t\tԪã -12289,ѡһҪԪķ! +12288,%sķΪ1ףʱĵĽҺǷȷϹԪ\n\n\t\t\t\t\t\t\tԪã +12289,ѡһҪԪ! 12290,ǰ̳ 12291,ѡҪϳɵ 12292,%sͬӪ 12293,Ϸ񼴿ȡ 12294,ǿֽǿ;ȼ100%ɲϡ +12295,޿ϱ־ +12296,־ϱɹл֧֣ +12297,ҵȼﵽ%s +12298,ɭ޻þǰ5޷ +12299,˽ܱ +12300, +12301,鱦 +12302, +12303, +12304, +12305, +12306,δ +12307,ر +12308, +12309,ã +12310,ѹرգ +12311,%s˼Žǣȫ幫Աǰս죡 +12312,%sԪ +12313,񽫺ϳ +12314,û +12315,ѡҪû񽫣 +12316,û㣡 +12317, +12318, +12319,Ŀѱ޷û +12320,ѽ +12321,ʣʱ: +12322,ȫȡ +12323,ӲΪ +12324,ḱ +12325,δս +12326,ʣ +12327,Ƿ񻨷%s%s1սս +12328,ɹ1ս +12329,Ƿ񻨷%s%s1ɨɨ˺Ϊ%s +12330,ɹ1ɨ +12331,ȷϴս%s˺ɨ +12332,Ƿ񻨷%s%s1ս +12333,ֻл᳤͸᳤ſʹô˹ܣ +12334,ѱܣ +12335,%sſٴʹô˹ܣ +12336,ǿЧѵߣ +12337,Ƿ%s%sһǿЧ󹥻ӳ%s +12338,ǿЧѵ +12339,ǰһ췽ɽ +12340,ͨ +12341,ʣ: +12342,ʣ๺: +12343,ȫԱ+0%(δ) +12344,ȫԱ+ %s +12345,(%s:%s:%s:ʧЧ) +12346,ѻܡ%s +12347,ٳȡ +12348,ر +12349,ر +12350,ճررȼȡӦرȡ⽱ +12351,ȼ +12352,ر +12353,ѽ +12354,ȼ +12355,ɹȡְ +12356,ٴȡ +12357,/ +12358,ɹȡ +12359, +12360, +12361,ǩ +12362,: +12363,30¿ +12364,Ƿ%s%sһս +12365,칬ر +12366,رȡרֱӻ200 +12367,߽սר+ֱ15 +12368,ȼɹ +12369,%s%s +12370,%s%s +12371,Ҫֵ +12372,ϲſɴ +12373,ȷϻ%s1ٻ +12374,ȷϻ%sȡ1ǬУ +12375,ȷϻ%s1ʱٻ +12376,ȷϻ%s10ٻ +12377,ȷϻ%sȡ10ǬУ +12378,ȷϻ%s10ʱٻ +12379,㲻ʹը~ +12380,ըʹѴ~ +12381, +12382,ٴ +12383,Ԫ +12384,ȼ +12385,dzɳ +12386, +12387,Ÿ