From 0d7482d5a0e8bf082abfb4b5bfbfee03597cdc3a Mon Sep 17 00:00:00 2001
From: lwb <q3213421wrwqr>
Date: 星期四, 25 二月 2021 15:43:08 +0800
Subject: [PATCH] 9527 去掉xlua
---
Core/GameEngine/Model/Config/FaceConfig.cs | 2
System/Vip/OSTimeLimitGiftModel.cs | 2
UI/Decorate/Tweens/RotationTween.cs | 2
System/GatheringSoul/GatherSoulComposeModel.cs | 2
Core/GameEngine/Model/Config/ChestsConfig.cs | 2
System/Dungeon/IceCrystalVeinModel.cs | 2
Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs | 2
System/AssetVersion/DownloadMgr.cs | 4
System/Rune/RuneComposeModel.cs | 2
Core/GameEngine/Model/Config/ItemCompoundConfig.cs | 72
System/Vip/VipInvest/WheelOfFortuneModel.cs | 24
System/Store/BuyItemController.cs | 8
System/FriendSystem/FriendsModel.cs | 2
System/OpenServerActivity/InSevenDayModel.cs | 2
Core/GameEngine/Model/Config/XMZZAchievementConfig.cs | 2
System/KnapSack/Logic/ItemOperateUtility.cs | 2
Utility/TimeUtility.cs | 2
Core/GameEngine/Model/Config/mapbornConfig.cs | 2
Core/GameEngine/Model/Config/GatherSoulComposeConfig.cs | 12
Core/GameEngine/Model/Config/EquipPlusEvolveConfig.cs | 2
System/HeavenBattle/HeavenBattleInfo.cs | 2
System/OpenServerActivity/RedEnvelopeModel.cs | 2
Core/GameEngine/Model/Config/BOSSFirstKillConfig.cs | 2
Core/GameEngine/Model/Config/DungeonOpenTimeConfig.cs | 22
Core/GameEngine/Model/Config/TreasureSkillConfig.cs | 2
Fight/MapTransferUtility.cs | 2
System/Pet/PetReinforceModel.cs | 2
System/KnapSack/Logic/BoxGetItemModel.cs | 2
Fight/Actor/Status/StatusMgr.cs | 2
Core/GameEngine/Model/Config/FamilyConfig.cs | 2
System/Welfare/LevelGiftModel.cs | 2
Core/GameEngine/Model/Config/TASKINFOConfig.cs | 2
Core/GameEngine/Model/Config/HorseLVUpConfig.cs | 2
Core/GameEngine/Model/Config/PetEatEquipConfig.cs | 2
System/Vip/FirstTimeRechargeModel.cs | 2
System/LoginAd/LoginAdModel.cs | 2
System/OffLineTime/OffLineTimeLackModel.cs | 2
Core/GameEngine/Model/Config/NewAllPeoplePartyAwardConfig.cs | 2
System/MainInterfacePanel/StoryMissionsModel.cs | 2
Core/GameEngine/Model/Config/LoadingTipConfig.cs | 2
System/Vip/SuperUPGiftModel.cs | 2
System/Compose/New/ComposeWinModel.cs | 2
Core/GameEngine/Model/Config/SkillConfig.cs | 2
Core/GameEngine/Model/Config/WeekPartyConfig.cs | 2
System/KnapSack/FBHelpPointExchageModel.cs | 2
Fight/Stage/MapEditor/GuideDialogueModel.cs | 2
Fight/GameActor/GAMgr.cs | 2
Core/GameEngine/Model/Config/VipPrivilegeInfoConfig.cs | 12
System/RoleParticulars/OtherPlayerEquipModel.cs | 2
System/Auction/AuctionNewGetShowModel.cs | 2
Fight/Stage/MapEditor/NewGuideModel.cs | 2
Core/GameEngine/Model/Config/TrialRewardsConfig.cs | 2
Core/GameEngine/Model/Config/XBGetItemConfig.cs | 2
System/FashionDress/FashionDecomposeModel.cs | 2
Core/Utilities/AnyCountDownUtility.cs | 2
Core/GameEngine/Model/Config/DungeonStateTimeConfig.cs | 2
Core/GameEngine/Model/Config/GatherSoulPropertyConfig.cs | 2
System/KnapSack/New/KingTreasureShowModel.cs | 2
Core/GameEngine/Model/Config/MapData_10120Config.cs | 2
Fight/Actor/Skill/FlyObject/FlyObjectManager.cs | 2
System/FindPrecious/DemonJarModel.cs | 2
Core/GameEngine/Model/Config/EquipWashConfig.cs | 2
Core/GameEngine/Model/Config/StoreConfig.cs | 32
System/OpenServerActivity/SpringFestivalModel.cs | 28
Utility/OperationLogCollect.cs | 2
Core/GameEngine/Model/Config/DailyQuestSpecialOpenTimeConfig.cs | 2
Core/GameEngine/Model/Config/KickOutReasonConfig.cs | 2
System/Login/ServerData.cs | 16
Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs | 2
System/Dungeon/DungeonAssistModel.cs | 2
UI/Decorate/Tweens/PositionTween.cs | 1
System/Achievement/AchievementModel.cs | 2
System/BetterItemGet/ItemUseModel.cs | 2
System/Welfare/CZBMModel.cs | 2
System/Store/Logic/BuySuccessModel.cs | 2
Fight/Stage/MapEditor/GuideMessageModel.cs | 2
Core/GameEngine/Model/Config/NPCDropItemConfig.cs | 2
Core/GameEngine/Model/Config/TaskPowerConfig.cs | 2
System/FairyAu/FairyBossModel.cs | 8
Core/GameEngine/Model/Config/FamilyTechConfig.cs | 2
System/HappyXB/HappyXBModel.cs | 2
System/OpenServerActivity/WishingPoolModel.cs | 2
System/Rune/RuneResolveModel.cs | 2
Core/GameEngine/Model/Config/AddUpRechargeConfig.cs | 2
Core/GameEngine/Model/Config/SceneReplaceConfig.cs | 2
System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs | 2
System/KnapSack/Logic/ItemLogicUtility.cs | 2
System/EquipGem/EquipStrengthModel.cs | 2
Core/GameEngine/Model/Config/MapData_10010Config.cs | 2
System/GMCommand/GMCmdModel.cs | 2
System/NewBieGuidance/FunctionalGuideCenter.cs | 2
Core/GameEngine/Model/Config/RuneTowerConfig.cs | 2
System/Welfare/ConsumeRebateModel.cs | 12
Core/GameEngine/Model/Config/IceLodeStarAwardConfig.cs | 2
System/BetterItemGet/PreciousItemGetModel.cs | 2
System/Tip/ConfirmCancel.cs | 2
Core/GameEngine/Model/Config/RefineStoveConfig.cs | 2
Core/GameEngine/Model/Config/SkillClassifingConfig.cs | 2
Core/GameEngine/Model/Config/UniquenessArriveConfig.cs | 2
Core/GameEngine/Model/Config/FunctionForecastConfig.cs | 2
Core/GameEngine/Model/Config/WorldBossConfig.cs | 2
Core/GameEngine/Model/Config/RealmConfig.cs | 32
System/Team/GroupDungeonChallengeProcessor.cs | 22
System/FairyAu/AllianceBossModel.cs | 2
Core/NetworkPackage/Socket/ClientSocket.cs | 12
System/Chat/UIFrame.cs | 2
Core/GameEngine/Model/Config/FuncConfigConfig.cs | 2
System/Dungeon/DungeonData.cs | 2
System/OpenServerActivity/DaysAccumulateRechargeModel.cs | 2
Core/GameEngine/Model/Config/RoleEquipStarsConfig.cs | 2
Core/GameEngine/Model/Config/CrossRealmPKDanAwardConfig.cs | 2
System/GatheringSoul/VirtualPackModel.cs | 2
System/OpenServerActivity/FestivalRedpackModel.cs | 2
System/Welfare/MultipleExpModel.cs | 2
System/CrossServer/CrossServerUtility.cs | 2
Core/GameEngine/Model/Config/DemonRecommondPropertyConfig.cs | 2
Core/GameEngine/Model/Config/PetInfoConfig.cs | 42
Core/GameEngine/Model/Config/AllPeoplePartyConfig.cs | 2
Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs | 12
System/OpenServerActivity/OpenServiceAchievementModel.cs | 22
Core/GameEngine/Model/Config/ViewRoleFuncConfig.cs | 12
Core/GameEngine/Model/Config/ActorShowConfig.cs | 152 +-
Core/GameEngine/Model/Config/NewDropItemGroupConfig.cs | 2
Core/GameEngine/Model/Config/EquipControlConfig.cs | 2
System/RolePromote/RolePromoteModel.cs | 2
System/HazyRegion/HazyRegionModel.cs | 2
Core/GameEngine/Model/Config/AlchemySpecConfig.cs | 2
System/Debug/DebugUtility.cs | 2
UI/Common/SmoothMask.cs | 2
Utility/MaterialUtility.cs | 2
Core/GameEngine/Model/Config/AppointItemConfig.cs | 2
Core/GameEngine/Model/Config/MailConfig.cs | 2
Core/GameEngine/Model/Config/StoryMissionsConfig.cs | 44
Core/GameEngine/Model/Config/RealmPracticeConfig.cs | 2
Core/GameEngine/Model/Config/PlayerPropertyConfig.cs | 2
Core/GameEngine/Model/Config/DemonJarConfig.cs | 42
Core/ResModule/AnimatorControllerLoader.cs | 2
Utility/Clock.cs | 2
Core/GameEngine/Model/Config/GodWeaponConfig.cs | 2
System/KnapSack/Logic/PackModel.cs | 2
System/Vip/LimitedTimePackageModel.cs | 2
Utility/LocalSave.cs | 2
Utility/TransformExtension.cs | 20
Core/GameEngine/Model/Config/WHYJRewardConfig.cs | 22
System/Login/ServerListCenter.cs | 2
Core/GameEngine/Model/Config/LoginSeverListConfig.cs | 2
Core/GameEngine/Model/Config/VIPAwardConfig.cs | 2
System/Strengthening/HowToPlayModel.cs | 2
Core/GameEngine/Model/Config/ModelResConfig.cs | 2
Core/GameEngine/Model/Config/RedPackConfig.cs | 2
System/NewYearFairylandCeremony/NewYearFairylandCeremonyModel.cs | 2
UI/Common/TimeDownMgr.cs | 2
System/FakeDungeon/FakeDungeonUtility.cs | 2
Core/GameEngine/Model/Config/FuncOpenLVConfig.cs | 2
Core/GameEngine/Model/Config/MapData_10080Config.cs | 2
Core/GameEngine/Model/Config/EquipShenEvolveConfig.cs | 2
System/Role/ReikiRootModel.cs | 16
Core/GameEngine/Model/Config/FairyLeagueRankAwardConfig.cs | 20
Core/GameEngine/Model/Config/JobSetupConfig.cs | 82
Core/GameEngine/Model/Config/LoginAdConfig.cs | 12
Core/GameEngine/Model/Config/UnionLivenConfig.cs | 2
System/Skill/ScrollerController.cs | 2
System/FairyAu/KingFairyModel.cs | 2
System/Team/TeamModel.cs | 2
System/Alchemy/AlchemyModel.cs | 2
Core/GameEngine/Model/Config/HazyRegionConfig.cs | 74
Core/Common/ResourcesPath.cs | 2
System/Strengthening/WingsRedDotModel.cs | 2
System/WindowBase/WindowCenter.cs | 2
System/WindowBase/WidgetBehavior.cs | 2
Core/GameEngine/Model/Config/EquipShenAttrConfig.cs | 2
Core/GameEngine/Model/Config/TreasureFindHostConfig.cs | 2
System/DailyQuest/ResourcesBackModel.cs | 2
System/Mount/MountModel.cs | 4
Core/GameEngine/Model/Config/RandomNameConfig.cs | 2
Core/GameEngine/Model/Config/OSCBillRankAwardConfig.cs | 2
Utility/GMCommand.cs | 4
Core/GameEngine/Model/Config/NPCConfig.cs | 12
Core/GameEngine/Model/Config/ItemPlusConfig.cs | 32
System/Message/SysNotifyMgr.cs | 2
System/BossShow/BossShowModel.cs | 2
System/SystemSetting/HangUpSetModel.cs | 4
Core/GameEngine/Model/Config/FashionDressCabinetConfig.cs | 2
Core/GameEngine/Model/Config/LoadingFunctionConfig.cs | 2
Core/GameEngine/Model/Config/KingTreasureConfig.cs | 2
System/AssetVersion/AssetVersionUtility.cs | 2
System/Pet/PetWin.cs | 38
Core/GameEngine/Model/Config/EquipSuitConfig.cs | 2
Core/GameEngine/Model/Config/MonsterNameColorConfig.cs | 2
Core/GameEngine/Model/Config/FuncSwitchConfig.cs | 2
Core/GameEngine/SnxxzGame.cs | 2
System/SystemSetting/SettingEffectMgr.cs | 2
UI/Common/FunctionButton.cs | 24
System/CrossServerBoss/CrossServerBossModel.cs | 2
System/MainInterfacePanel/CoinTaskTipModel.cs | 2
System/SkyTower/SkyTowerModel.cs | 2
Core/GameEngine/Model/Config/CreateRoleConfig.cs | 2
System/RoleParticulars/RoleParticularModel.cs | 2
Core/GameEngine/Model/Config/RidingPetBossRewardConfig.cs | 26
System/Chat/ChatBubbleModel.cs | 2
Core/GameEngine/DataToCtl/PackageRegedit.cs | 54
Core/GameEngine/Model/Config/GemItemConfig.cs | 2
System/OpenServerActivity/OSGiftModel.cs | 12
Core/GameEngine/Model/Config/PersonalBossConfig.cs | 12
UI/Common/ScrollItem.cs | 2
Core/GameEngine/Model/Config/ReikiRootConfig.cs | 20
System/Welfare/PrayerModel.cs | 2
Utility/ComponentExtersion.cs | 28
Core/GameEngine/Model/Config/LegendPropertyValueConfig.cs | 2
System/Store/StoreModel.cs | 2
System/WorldMap/WorldMapSkip.cs | 2
Core/GameEngine/Model/Config/NewUniquenessArriveConfig.cs | 2
Core/GameEngine/Model/Config/MapConfig.cs | 12
System/Vip/VipInvest/VipInvestModel.cs | 2
System/AssetVersion/InGameDownLoad.cs | 2
System/OpenServerActivity/OpenServerActivityNotifyModel.cs | 2
Utility/RunTimeExceptionUtility.cs | 44
Core/GameEngine/Model/Config/DungeonHelpBattleConfig.cs | 2
Core/GameEngine/Model/Config/GmCmdConfig.cs | 2
Core/GameEngine/Model/Config/ApkUpdateUrlConfig.cs | 2
Core/GameEngine/Login/Launch.cs | 4
Core/GameEngine/Model/Config/DailyQuestConfig.cs | 2
System/AssetVersion/DownLoadAndDiscompressTask.cs | 2
UI/Common/UIDragDropBehaviour.cs | 8
Utility/LanguageVerify.cs | 82
Core/GameEngine/Model/Config/EquipSuitNameConfig.cs | 2
Core/GameEngine/Model/Config/FirstGoldConfig.cs | 2
Core/GameEngine/Model/Config/FashionDressConfig.cs | 2
System/Dungeon/DungeonUseBuffModel.cs | 12
Core/GameEngine/Model/Config/RichTextMsgReplaceConfig.cs | 2
Core/GameEngine/Model/Config/RoleStrongerConfig.cs | 2
System/FairyAu/UnionTaskModel.cs | 2
Core/GameEngine/Model/Config/DailyQuestOpenTimeConfig.cs | 2
System/OpenServerActivity/FlashRushToBuyModel.cs | 2
Core/GameEngine/Model/Config/HelpInfoConfig.cs | 2
System/EquipTrain/EquipTrainModel.cs | 2
System/Role/TitleModel.cs | 2
System/KnapSack/KnapsackTimeCDMgr.cs | 4
System/TreasureFindHost/TreasureFindHostModel.cs | 2
Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs | 4
Core/SDK/SDKUtility.cs | 2
System/OpenServerActivity/MysticalPurchaseModel.cs | 2
Core/GameEngine/Model/Config/MapData_10090Config.cs | 2
Core/GameEngine/Model/Config/ResourcesBackConfig.cs | 2
Utility/MathUtility.cs | 2
Core/GameEngine/Model/Config/RankListConfig.cs | 2
System/WindowJump/WindowJumpMgr.cs | 4
System/BetterItemGet/BetterEquipGetModel.cs | 2
System/OpenServerActivity/OpenServerActivityCenter.cs | 13
Core/GameEngine/Model/Config/JobNameConfig.cs | 2
Core/GameEngine/Model/Config/DungeonUseBuffConfig.cs | 2
UI/Core/ButtonEx.cs | 2
System/OpenServerActivity/FlashSaleModel.cs | 2
Core/GameEngine/Model/Config/JadeDynastyStoneAttrConfig.cs | 22
Core/GameEngine/Model/Config/AssistThanksGiftConfig.cs | 2
Core/GameEngine/Model/Config/AttrFruitConfig.cs | 12
Core/GameEngine/Model/Config/CTGConfig.cs | 56
Core/GameEngine/Model/Config/MapUiControlConfig.cs | 2
Fight/GameActor/HeroRoundGird.cs | 4
System/Rune/RuneModel.cs | 2
Core/GameEngine/Model/Config/DungeonInspireConfig.cs | 2
System/Vip/MultiRechargeModel.cs | 2
Core/GameEngine/Model/Config/DienstgradConfig.cs | 74
Core/GameEngine/Model/Config/WeatherConfig.cs | 2
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 2
System/Pet/PetModel.cs | 108
Core/GameEngine/Login/LaunchPostProcess.cs | 3
Core/GameEngine/Model/Config/NPCDialogueConfig.cs | 2
Core/ResModule/UILoader.cs | 2
Core/GameEngine/Model/Config/DogzEquipPlusConfig.cs | 22
UI/Common/SmoothSlider.cs | 2
Core/GameEngine/Model/Config/ContinueSignInConfig.cs | 2
Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs | 50
System/EquipStar/EquipStarModel.cs | 2
Core/GameEngine/Model/Config/CrossServerArenaConfig.cs | 2
Core/GameEngine/Model/Config/SysInfoConfig.cs | 12
Core/GameEngine/Common/Equation.cs | 2
System/JadeDynastySkill/JadeDynastySkillModel.cs | 2
Core/GameEngine/Model/Config/RuneConfig.cs | 2
Core/GameEngine/Model/Config/TaskListConfig.cs | 12
System/MainInterfacePanel/OffLineOnHookModel.cs | 2
Core/GameEngine/Model/Config/OSRedAchieveConfig.cs | 2
System/GatheringSoul/GatheringSoulModel.cs | 2
System/SystemSetting/SystemSetting.cs | 4
System/Welfare/MultipleRealmPointModel.cs | 2
Core/GameEngine/Model/Config/DailyLivenessRewardConfig.cs | 2
System/Tip/PwdKeyboard.cs | 2
System/FairyAu/FairyFeastModel.cs | 12
Core/GameEngine/Model/Config/AuctionConfig.cs | 22
Core/GameEngine/Model/Config/LanguageConfig.cs | 2
System/WindowBase/OneLevelWin.cs | 2
System/KnapSack/New/KnapSackEventMgr.cs | 2
System/FairyAu/FairyLeagueModel.cs | 2
System/MainInterfacePanel/TipPanel.cs | 2
Utility/EnumHelper.cs | 126
Core/GameEngine/Model/Config/MonsterRefreshPointConfig.cs | 2
Core/GameEngine/Model/Config/DungeonConfig.cs | 134 +-
Core/GameEngine/Model/Config/ChatBubbleBoxConfig.cs | 32
System/RuneTower/RuneTowerModel.cs | 2
System/Chat/ChatCenter.cs | 2
UI/Common/FuncOpen.cs | 2
Utility/LayerUtility.cs | 2
Core/GameEngine/Model/Config/RuleConfig.cs | 2
System/Vip/DayPackageModel.cs | 2
Core/GameEngine/Model/Config/OnlineAwardConfig.cs | 2
System/Welfare/AwardExchangeModel.cs | 2
System/Message/BattleHint.cs | 2
Core/GameEngine/Model/Config/WeekPartyPointConfig.cs | 2
System/Guard/GuardModel.cs | 2
Core/GameEngine/Model/Config/TreasureDungeonConfig.cs | 50
System/Redpoint/RedpointCenter.cs | 2
Core/GameEngine/Model/Config/LVAawrdConfig.cs | 2
Core/GameEngine/Model/Config/AdventureDialogueConfig.cs | 12
Core/GameEngine/Model/Config/LegendPropertyConfig.cs | 2
Core/GameEngine/Model/Config/TreasureConfig.cs | 2
System/Role/RoleModel.cs | 2
Fight/PreFightMission.cs | 2
Core/GameEngine/Model/Config/PyTaskConfig.cs | 2
System/OpenServerActivity/OSRedEnvelopeModel.cs | 2
Core/GameEngine/Model/Config/TreasureChapterConfig.cs | 2
System/FairylandCeremony/FairylandCeremonyModel.cs | 2
System/OpenServerActivity/BossFirstBloodModel.cs | 2
System/OpenServerActivity/LuckyTreasureModel.cs | 2
System/Pet/RidingAndPetActivationModel.cs | 2
System/Dogz/DogzModel.cs | 2
Core/GameEngine/Model/Config/AuctionIndexConfig.cs | 22
Core/GameEngine/Model/Config/TeamTargetConfig.cs | 2
System/JadeDynastyBoss/JadeDynastyBossModel.cs | 2
System/Dogz/DogzPackModel.cs | 2
System/FairyAu/FairyModel.cs | 2
Core/GameEngine/Model/Config/ItemPlusSumAttrConfig.cs | 22
Core/GameEngine/Model/Config/WingRefineAttrConfig.cs | 2
Core/GameEngine/Model/Config/LoginRewardConfig.cs | 2
System/FindPrecious/PersonalBossModel.cs | 2
System/SystemSetting/SetPrivateModel.cs | 2
Core/GameEngine/Model/Config/InitialFunctionConfig.cs | 2
System/PlayerDead/PlayerDeadModel.cs | 2
System/GatheringSoul/GatherSoulDungeonModel.cs | 2
UI/Effect/TimeMgr.cs | 4
System/HttpRequest/HttpRequest.cs | 16
System/Welfare/OperationTimeHepler.cs | 2
System/Skill/SkillModel.cs | 46
Core/GameEngine/Model/Config/RoleResourceConfig.cs | 2
Fight/Actor/Skill/SkillHelper.cs | 2
Core/GameEngine/Model/Config/WingRefineExpConfig.cs | 2
System/WorldMap/MapModel.cs | 2
Core/GameEngine/Model/Config/DungeonHintConfig.cs | 2
System/EquipGem/EquipGemModel.cs | 2
Fight/Stage/StageLoad.cs | 2
Core/GameEngine/Model/Config/TalentConfig.cs | 2
Core/GameEngine/Model/Config/HolidayHomingConfig.cs | 2
Core/GameEngine/Model/Config/EquipDeComposeConfig.cs | 2
System/FindPrecious/WorldBossModel.cs | 2
Core/GameEngine/Model/Config/SpiritWeaponConfig.cs | 68
Core/GameEngine/Model/Config/LoadingBackGroundConfig.cs | 2
Core/GameEngine/Model/Config/SuitEffectConfig.cs | 2
Core/GameEngine/Model/Config/CrossRealmPKOrderAwardConfig.cs | 2
Core/GameEngine/Model/Config/BossHomeConfig.cs | 2
Core/GameEngine/Model/Config/InSevenDaysConfig.cs | 2
System/Voice/SpeechTranslate.cs | 4
System/Redpoint/RedpointBehaviour.cs | 2
System/Skill/QuickSetting.cs | 50
System/Vip/NeedForWhiteModel.cs | 2
System/Skill/TalentModel.cs | 14
Core/GameEngine/Model/Config/MapEventPointConfig.cs | 2
UI/Effect/UIEffect.cs | 2
System/Welfare/SignInModel.cs | 2
Core/GameEngine/Model/Config/GuideConfig.cs | 22
System/SystemSetting/ActivitiesPushModel.cs | 2
System/RidingPet/RidingPetBossModel.cs | 2
Core/GameEngine/Model/Config/CrossServerBossConfig.cs | 2
Core/GameEngine/Model/Config/EquipStarConfig.cs | 2
Core/GameEngine/Model/Config/IconConfig.cs | 2
Core/GameEngine/Model/Config/OpenServerActivityConfig.cs | 20
Utility/FileExtersion.cs | 2
Core/GameEngine/Model/Config/ChestsAwardConfig.cs | 2
Core/GameEngine/Model/Config/ItemConfig.cs | 2
System/BetterItemGet/RealmBetterEquipModel .cs | 2
UI/Effect/EffectMgr.cs | 4
Core/GameEngine/Model/Config/OccupationNameConfig.cs | 2
UI/Common/CyclicScroll.cs | 2
System/Activity/ActivityModel.cs | 2
Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs | 2
System/Strengthening/GodBeastModel.cs | 2
Core/GameEngine/Model/Config/VIPKillNPCConfig.cs | 2
System/BossReborn/BossRebornModel.cs | 22
System/Role/PropertyBehaviour.cs | 2
Core/GameEngine/Model/Config/HorseSkinPlusConfig.cs | 2
Core/GameEngine/Model/Config/GatherSoulConfig.cs | 12
Core/GameEngine/Model/Config/mapnpcConfig.cs | 2
System/DailyQuest/DailyQuestModel.cs | 3
Core/GameEngine/Model/Config/AlchemyConfig.cs | 2
System/HazyRegion/HazyDemonKingModel.cs | 12
UI/Core/ImageEx.cs | 2
Core/GameEngine/Model/Config/DialogConfig.cs | 2
Core/GameEngine/Model/Config/ContactConfig.cs | 2
System/Chat/VoiceHttpRequest.cs | 2
Core/GameEngine/Model/Config/AudioConfig.cs | 2
Core/GameEngine/Model/Config/GetItemWaysConfig.cs | 2
Core/GameEngine/Model/Config/ItemPlusMasterConfig.cs | 2
Core/GameEngine/Model/Config/OSCBillTagAwardConfig.cs | 2
UI/Common/UI3DModelExhibition.cs | 4
Core/NetworkPackage/GameNetSystem.cs | 16
System/WindowBase/ModelCenter.cs | 2
System/Equip/EquipFightPower.cs | 2
Core/GameEngine/Model/Config/FestivalRedpackTaskConfig.cs | 12
Core/GameEngine/Model/Config/WindowSearchConfig.cs | 2
System/Rank/RankModel.cs | 50
System/Language/Language.cs | 2
System/Skill/ExpertSkillSelectWin.cs | 2
Core/GameEngine/Model/Config/VipPrivilegeConfig.cs | 2
Core/GameEngine/Model/Config/ActFeastTravelTaskConfig.cs | 2
Core/GameEngine/Model/Config/EffectConfig.cs | 2
Core/SFX/SFXPlayUtility.cs | 2
Core/GameEngine/Model/Config/SuperUpRechargeConfig.cs | 2
System/Vip/VipModel.cs | 2
Core/GameEngine/Model/Config/TreasureUpConfig.cs | 12
Core/GameEngine/Model/Config/DailyQuestMixServerStateTimeConfig.cs | 2
Core/GameEngine/Model/Config/NewAllPeoplePartyConfig.cs | 2
Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs | 56
Core/GameEngine/Model/Config/HorseConfig.cs | 12
Core/GameEngine/Model/Config/bossSkillTipsConfig.cs | 2
Core/GameEngine/Model/Config/SkyTowerServerChallengeConfig.cs | 2
Core/GameEngine/Model/Config/HorseUpConfig.cs | 32
Core/GameEngine/Model/Config/DamageNumConfig.cs | 12
Core/GameEngine/Model/Config/EquipSuitAttrConfig.cs | 2
Fight/Stage/MapEditor/StoryHintModel.cs | 2
System/SystemSetting/SettingMgr.cs | 4
System/CrossServerOneVsOne/OpponentInformation.cs | 32
Core/GameEngine/Model/Config/CrossServerOneVsOneRobotConfig.cs | 2
System/Dungeon/DungeonNuwaModel.cs | 12
Utility/GlobalTimeEvent.cs | 38
System/TaiChi/TaiChiModel.cs | 2
Core/GameEngine/Model/Config/WashLevelMaxConfig.cs | 2
Core/GameEngine/Model/Config/AlchemyCountConfig.cs | 2
System/KnapSack/Logic/ItemOverdueModel.cs | 2
Core/GameEngine/Model/Config/AllPeoplePartyAwardConfig.cs | 2
Core/GameEngine/Model/Config/QuestionBankConfig.cs | 2
Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs | 32
UI/Common/ItemBehaviour.cs | 2
System/Welfare/WelfareCenter.cs | 16
UI/Decorate/Tweens/ScaleTween.cs | 1
Core/GameEngine/Model/Config/DirtyWordConfig.cs | 2
System/FindPrecious/RewardPreviewGroup.cs | 2
Core/GameEngine/Model/Config/CollectNpcConfig.cs | 2
UI/Decorate/Tweens/UIAlphaTween.cs | 2
System/OpenServerActivity/AccumulateRechargeModel.cs | 2
Core/GameEngine/Model/Config/SkyTowerConfig.cs | 2
Core/Common/Singleton.cs | 2
System/KnapSack/Logic/TreasureEffectModel.cs | 2
System/StartCoroutine/CoroutineMgr.cs | 4
Utility/DeviceUtility.cs | 54
System/ItemTip/ItemTipUtility.cs | 2
System/Skill/TreasureSkillModel.cs | 2
Core/GameEngine/Model/Config/PlayerLVConfig.cs | 2
Core/GameEngine/Model/Config/ElderGodAreaConfig.cs | 2
Core/GameEngine/Model/Config/FreeGoodsConfig.cs | 2
System/KnapSack/New/BatchUseModel.cs | 2
Core/GameEngine/Model/Config/ItemPlusMaxConfig.cs | 2
Core/GameEngine/Model/Config/AreaCameraConfig.cs | 2
Core/GameEngine/Model/Config/DirtyNameConfig.cs | 2
Core/GameEngine/Model/Config/PetClassCostConfig.cs | 2
System/HazyRegion/HazyGrassModel.cs | 20
Core/GameEngine/Model/Config/FightPowerParamConfig.cs | 2
Core/GameEngine/Model/Config/BossRebornConfig.cs | 2
Core/GameEngine/Model/Config/DungeonMixServerStateTimeConfig.cs | 2
Core/GameEngine/Model/Config/EquipPlaceMapConfig.cs | 2
System/FindPrecious/BossHomeModel.cs | 2
System/FindPrecious/FindPreciousModel.cs | 2
Core/GameEngine/Model/Player/PlayerDatas.cs | 2
Core/ResModule/InstanceResourcesLoader.cs | 2
System/MainInterfacePanel/CapacityDelayModel.cs | 2
System/SpiritWeapon/SpiritWeaponModel.cs | 2
System/FindPrecious/ElderGodAreaModel.cs | 2
Core/GameEngine/Model/Config/RuneComposeConfig.cs | 2
Core/GameEngine/Model/Config/maptransportConfig.cs | 2
Core/GameEngine/Model/Config/PriorBundleConfig.cs | 2
Core/GameEngine/Model/Config/DogzConfig.cs | 42
Fight/BossFakeLineUtility.cs | 2
Core/GameEngine/Model/Config/SignInConfig.cs | 2
System/DailyQuest/DayRemind.cs | 2
System/FashionDress/FashionDressModel.cs | 2
Core/GameEngine/Model/Config/EquipGSParamConfig.cs | 2
System/MainInterfacePanel/PKModel.cs | 2
Fight/GameActor/BattleEffectPlayRule.cs | 2
System/SystemSetting/FuncSwitchModel.cs | 2
Core/GameEngine/Model/Config/ItemExchangeConfig.cs | 20
System/HeavenBattle/HeavenBattleModel.cs | 2
System/MainInterfacePanel/TaskAllocation.cs | 4
Utility/UIUtility.cs | 2
Core/GameEngine/Model/Config/SuccessConfig.cs | 22
System/Dungeon/DungeonLiquidModel.cs | 2
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs | 3
Core/GameEngine/Model/Config/PriorLanguageConfig.cs | 2
System/Message/GMNotify.cs | 2
Core/Config/AssetSource.cs | 2
Core/GameEngine/Model/Config/InvestConfig.cs | 2
System/SystemSetting/ChatSetting.cs | 4
Core/GameEngine/Model/Config/MapResourcesConfig.cs | 12
Core/GameEngine/Model/Config/BossInfoConfig.cs | 2
Core/ResModule/AssetBundle/AssetBundleUtility.cs | 2
System/MainInterfacePanel/MainRedDot.cs | 2
Core/GameEngine/Model/Config/AncientRobotNameConfig.cs | 2
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs | 74
Core/GameEngine/Model/Config/mapAreaConfig.cs | 2
System/SystemSetting/PrivateRemind.cs | 2
Core/GameEngine/Model/Config/DungeonSpecialStateTimeConfig.cs | 2
System/Chat/UIFrameMgr.cs | 2
Core/GameEngine/Model/Config/OrderInfoConfig.cs | 2
System/OpenServerActivity/ImpactRankModel.cs | 2
System/Login/LoginModel.cs | 2
Core/GameEngine/Model/Config/KingTreasureItemConfig.cs | 2
System/Redpoint/Redpoint.cs | 2
System/Equip/EquipModel.cs | 2
System/Compose/New/SelectEquipModel.cs | 2
Fight/PrepareHandler.cs | 2
System/DailyQuest/DailyQuestActionTimer.cs | 2
System/Dungeon/TrialDungeonModel.cs | 2
System/MainInterfacePanel/FeatureNoticeModel.cs | 2
Core/ResModule/GameObjectPoolManager.cs | 2
System/Treasure/TreasureModel.cs | 2
System/OpenServerActivity/LoginRewardModel.cs | 24
Utility/UIHelper.cs | 2
Core/Common/SingletonMonobehaviour.cs | 2
Core/GameEngine/Model/Config/EquipWashSpecConfig.cs | 2
System/KnapSack/Logic/ItemTipsModel.cs | 2
Core/GameEngine/Model/Config/GuardConfig.cs | 12
System/Dungeon/DungeonModel.cs | 2
System/Login/CrossServerLogin.cs | 2
System/Role/MagicianModel.cs | 2
System/NewBieGuidance/NewBieCenter.cs | 2
/dev/null | 12
System/ClientVersion/VersionConfig.cs | 2
Core/GameEngine/Model/Config/ReikiRootEffectConfig.cs | 32
System/FindPrecious/FindPreciousTimer.cs | 2
Core/GameEngine/Model/Config/SceneShadowConfig.cs | 2
Core/GameEngine/Model/Config/AuctionItemConfig.cs | 2
System/ClientVersion/VersionUtility.cs | 2
538 files changed, 1,932 insertions(+), 2,040 deletions(-)
diff --git a/Core/Common/ResourcesPath.cs b/Core/Common/ResourcesPath.cs
index 17b2e26..035c5b0 100644
--- a/Core/Common/ResourcesPath.cs
+++ b/Core/Common/ResourcesPath.cs
@@ -2,7 +2,7 @@
using System;
using System.IO;
-[XLua.LuaCallCSharp]
+
public class ResourcesPath : Singleton<ResourcesPath>
{
public const string AssetDependentFileBundleName =
diff --git a/Core/Common/Singleton.cs b/Core/Common/Singleton.cs
index 02d1fa5..54916c7 100644
--- a/Core/Common/Singleton.cs
+++ b/Core/Common/Singleton.cs
@@ -1,5 +1,5 @@
锘�
-[XLua.LuaCallCSharp]
+
public class Singleton<T> where T : class, new() {
private static T m_Instance;
diff --git a/Core/Common/SingletonMonobehaviour.cs b/Core/Common/SingletonMonobehaviour.cs
index 557d4ec..8df45b2 100644
--- a/Core/Common/SingletonMonobehaviour.cs
+++ b/Core/Common/SingletonMonobehaviour.cs
@@ -1,6 +1,6 @@
锘縰sing UnityEngine;
-[XLua.LuaCallCSharp]
+
public class SingletonMonobehaviour<T> : MonoBehaviour where T : MonoBehaviour
{
diff --git a/Core/Config/AssetSource.cs b/Core/Config/AssetSource.cs
index d5571f2..86cb244 100644
--- a/Core/Config/AssetSource.cs
+++ b/Core/Config/AssetSource.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class AssetSource
{
diff --git a/Core/GameEngine/Common/Equation.cs b/Core/GameEngine/Common/Equation.cs
index 95f01cc..491acf4 100644
--- a/Core/GameEngine/Common/Equation.cs
+++ b/Core/GameEngine/Common/Equation.cs
@@ -5,7 +5,7 @@
using System.Text.RegularExpressions;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class Equation : Singleton<Equation>
{
public static readonly List<char> operatorList = new List<char>() { '*', '-', '+', '/', '^', '!', '@', '%', ';', '#', '$', '~', '&' };
diff --git a/Core/GameEngine/DataToCtl/PackageRegedit.cs b/Core/GameEngine/DataToCtl/PackageRegedit.cs
index 00953e7..5a07f57 100644
--- a/Core/GameEngine/DataToCtl/PackageRegedit.cs
+++ b/Core/GameEngine/DataToCtl/PackageRegedit.cs
@@ -9,32 +9,19 @@
static object lockojbLua = new object();
- //Lua 娉ㄥ唽鐨勫寘鍛戒护
- static HashSet<ushort> _luaPackageCmd = new HashSet<ushort>();
- static HashSet<ushort> luaPackageCmd
- {
- get
- {
- lock (lockojbLua) { return _luaPackageCmd; }
- }
- }
#region IL鐑洿宸ョ▼鐨勫皝鍖�
static object lockojbIL1 = new object();
static Dictionary<ushort, string> _ILPackageTable = new Dictionary<ushort, string>();
- static Dictionary<ushort, string> ilPackageTable
- {
- get
- {
+ static Dictionary<ushort, string> ilPackageTable {
+ get {
lock (lockojbIL1) { return _ILPackageTable; }
}
}
static object lockojbIL2 = new object();
static Dictionary<ushort, DtcBasic> _ILPackToBusinessTable = new Dictionary<ushort, DtcBasic>();
- static Dictionary<ushort, DtcBasic> ilPackToBusinessTable
- {
- get
- {
+ static Dictionary<ushort, DtcBasic> ilPackToBusinessTable {
+ get {
lock (lockojbIL2) { return _ILPackToBusinessTable; }
}
}
@@ -43,19 +30,15 @@
#region 涓诲伐绋嬪師鐢熺殑灏佸寘
static object lockojb1 = new object();
static Dictionary<ushort, Type> m_PackageTable = new Dictionary<ushort, Type>();
- static Dictionary<ushort, Type> packageTable
- {
- get
- {
+ static Dictionary<ushort, Type> packageTable {
+ get {
lock (lockojb1) { return m_PackageTable; }
}
}
static object lockojb2 = new object();
static Dictionary<ushort, DtcBasic> m_PackToBusinessTable = new Dictionary<ushort, DtcBasic>();
- static Dictionary<ushort, DtcBasic> packToBusinessTable
- {
- get
- {
+ static Dictionary<ushort, DtcBasic> packToBusinessTable {
+ get {
lock (lockojb2) { return m_PackToBusinessTable; }
}
}
@@ -559,17 +542,6 @@
#endregion
}
- //娉ㄥ唽lua鐨勫皝鍖�
- public static void RegisterLua(Dictionary<ushort, Action> luaPtRegister)
- {
- foreach (var key in luaPtRegister.Keys)
- {
- if (luaPackageCmd.Add(key))
- DebugEx.LogFormat("娉ㄥ唽Lua灏佸寘锛歿0}", key);
- else
- DebugEx.LogErrorFormat("閲嶅Lua灏佸寘鐧昏: {0}锛�", key);
- }
- }
public static void RegisterIL(List<string[]> packs)
{
@@ -625,20 +597,12 @@
return packToBusinessTable.ContainsKey(_cmd);
}
- public static bool ContainLua(ushort _cmd)
- {
- return luaPackageCmd.Contains(_cmd);
- }
-
public static void Distribute(GameNetPackBasic _package)
{
try
{
DebugEx.LogFormat("Distribute锛歿0}", _package.cmd);
- if (_package is LuaGameNetPack)
- //鎵цlua鐨勫皝鍖�
- CSharpCallLua.OnRecieveLuaNetPackage(_package as LuaGameNetPack);
- else if (_package is GameNetPackBasicAdapter.Adapter)
+ if (_package is GameNetPackBasicAdapter.Adapter)
{
DebugEx.LogFormat("鎵цIL灏佸寘锛歿0}", _package.cmd);
//鎵цIL鐑洿宸ョ▼鐨勫皝鍖�
diff --git a/Core/GameEngine/Login/Launch.cs b/Core/GameEngine/Login/Launch.cs
index c23d690..e41bb8a 100644
--- a/Core/GameEngine/Login/Launch.cs
+++ b/Core/GameEngine/Login/Launch.cs
@@ -1174,10 +1174,6 @@
{
ILLauncherProxy.Instance.Init();
ILLauncherProxy.Instance.LaunchStart();
- LuaUtility.Init();
- CSharpCallLua.LaunchStart();
- CSharpCallLua.RegisterLuaEvent();
- CSharpCallLua.ConfigInit();
}
catch (Exception e)
{
diff --git a/Core/GameEngine/Login/LaunchPostProcess.cs b/Core/GameEngine/Login/LaunchPostProcess.cs
index 6d213ce..30f2d60 100644
--- a/Core/GameEngine/Login/LaunchPostProcess.cs
+++ b/Core/GameEngine/Login/LaunchPostProcess.cs
@@ -4,7 +4,7 @@
using Snxxz.UI;
using System;
-[XLua.LuaCallCSharp]
+
public class LaunchPostProcess : SingletonMonobehaviour<LaunchPostProcess>
{
@@ -38,7 +38,6 @@
NewBieCenter.Instance.Init();
ClientDungeonStageUtility.Init();
TipPanel.Instance.Initialize();
- CSharpCallLua.LaunchPostProcess();
if (Application.isMobilePlatform)
{
diff --git a/Core/GameEngine/Model/Config/ActFeastTravelTaskConfig.cs b/Core/GameEngine/Model/Config/ActFeastTravelTaskConfig.cs
index cc0f752..9758f45 100644
--- a/Core/GameEngine/Model/Config/ActFeastTravelTaskConfig.cs
+++ b/Core/GameEngine/Model/Config/ActFeastTravelTaskConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ActFeastTravelTaskConfig
{
diff --git a/Core/GameEngine/Model/Config/ActorShowConfig.cs b/Core/GameEngine/Model/Config/ActorShowConfig.cs
index 97abfa5..865f3c2 100644
--- a/Core/GameEngine/Model/Config/ActorShowConfig.cs
+++ b/Core/GameEngine/Model/Config/ActorShowConfig.cs
@@ -9,35 +9,35 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ActorShowConfig
{
- public readonly int ID;
- public readonly int NpcID;
- public readonly int MapID;
- public readonly int line;
- public readonly int[] showNpcs;
- public readonly int length;
- public readonly int showNameTime;
- public readonly Int3 BindMissionID;
- public readonly int type;
- public readonly int[] scale;
- public readonly int[] NpcFace;
- public readonly int[] PosX;
- public readonly int[] PosY;
- public readonly int shadow;
- public readonly int[] effect;
- public readonly int uieffect;
- public readonly string[] mob;
- public readonly int[] clipActions;
- public readonly string cam;
- public readonly int[] Height;
- public readonly int DialogueTime;
- public readonly int Dialogue;
- public readonly int soundId;
- public readonly int soundTime;
- public readonly int step;
+ public readonly int ID;
+ public readonly int NpcID;
+ public readonly int MapID;
+ public readonly int line;
+ public readonly int[] showNpcs;
+ public readonly int length;
+ public readonly int showNameTime;
+ public readonly Int3 BindMissionID;
+ public readonly int type;
+ public readonly int[] scale;
+ public readonly int[] NpcFace;
+ public readonly int[] PosX;
+ public readonly int[] PosY;
+ public readonly int shadow;
+ public readonly int[] effect;
+ public readonly int uieffect;
+ public readonly string[] mob;
+ public readonly int[] clipActions;
+ public readonly string cam;
+ public readonly int[] Height;
+ public readonly int DialogueTime;
+ public readonly int Dialogue;
+ public readonly int soundId;
+ public readonly int soundTime;
+ public readonly int step;
public readonly int[] showName;
public ActorShowConfig()
@@ -50,96 +50,96 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out ID);
-
- int.TryParse(tables[1],out NpcID);
-
- int.TryParse(tables[2],out MapID);
-
- int.TryParse(tables[3],out line);
-
+ int.TryParse(tables[0],out ID);
+
+ int.TryParse(tables[1],out NpcID);
+
+ int.TryParse(tables[2],out MapID);
+
+ int.TryParse(tables[3],out line);
+
string[] showNpcsStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
showNpcs = new int[showNpcsStringArray.Length];
for (int i=0;i<showNpcsStringArray.Length;i++)
{
int.TryParse(showNpcsStringArray[i],out showNpcs[i]);
- }
-
- int.TryParse(tables[5],out length);
-
- int.TryParse(tables[6],out showNameTime);
-
- Int3.TryParse(tables[7],out BindMissionID);
-
- int.TryParse(tables[8],out type);
-
+ }
+
+ int.TryParse(tables[5],out length);
+
+ int.TryParse(tables[6],out showNameTime);
+
+ Int3.TryParse(tables[7],out BindMissionID);
+
+ int.TryParse(tables[8],out type);
+
string[] scaleStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
scale = new int[scaleStringArray.Length];
for (int i=0;i<scaleStringArray.Length;i++)
{
int.TryParse(scaleStringArray[i],out scale[i]);
- }
-
+ }
+
string[] NpcFaceStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
NpcFace = new int[NpcFaceStringArray.Length];
for (int i=0;i<NpcFaceStringArray.Length;i++)
{
int.TryParse(NpcFaceStringArray[i],out NpcFace[i]);
- }
-
+ }
+
string[] PosXStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
PosX = new int[PosXStringArray.Length];
for (int i=0;i<PosXStringArray.Length;i++)
{
int.TryParse(PosXStringArray[i],out PosX[i]);
- }
-
+ }
+
string[] PosYStringArray = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
PosY = new int[PosYStringArray.Length];
for (int i=0;i<PosYStringArray.Length;i++)
{
int.TryParse(PosYStringArray[i],out PosY[i]);
- }
-
- int.TryParse(tables[13],out shadow);
-
+ }
+
+ int.TryParse(tables[13],out shadow);
+
string[] effectStringArray = tables[14].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
effect = new int[effectStringArray.Length];
for (int i=0;i<effectStringArray.Length;i++)
{
int.TryParse(effectStringArray[i],out effect[i]);
- }
-
- int.TryParse(tables[15],out uieffect);
-
- mob = tables[16].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
-
+ }
+
+ int.TryParse(tables[15],out uieffect);
+
+ mob = tables[16].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+
string[] clipActionsStringArray = tables[17].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
clipActions = new int[clipActionsStringArray.Length];
for (int i=0;i<clipActionsStringArray.Length;i++)
{
int.TryParse(clipActionsStringArray[i],out clipActions[i]);
- }
-
- cam = tables[18];
-
+ }
+
+ cam = tables[18];
+
string[] HeightStringArray = tables[19].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
Height = new int[HeightStringArray.Length];
for (int i=0;i<HeightStringArray.Length;i++)
{
int.TryParse(HeightStringArray[i],out Height[i]);
- }
-
- int.TryParse(tables[20],out DialogueTime);
-
- int.TryParse(tables[21],out Dialogue);
-
- int.TryParse(tables[22],out soundId);
-
- int.TryParse(tables[23],out soundTime);
-
- int.TryParse(tables[24],out step);
-
+ }
+
+ int.TryParse(tables[20],out DialogueTime);
+
+ int.TryParse(tables[21],out Dialogue);
+
+ int.TryParse(tables[22],out soundId);
+
+ int.TryParse(tables[23],out soundTime);
+
+ int.TryParse(tables[24],out step);
+
string[] showNameStringArray = tables[25].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
showName = new int[showNameStringArray.Length];
for (int i=0;i<showNameStringArray.Length;i++)
diff --git a/Core/GameEngine/Model/Config/AddUpRechargeConfig.cs b/Core/GameEngine/Model/Config/AddUpRechargeConfig.cs
index 7b68223..2312552 100644
--- a/Core/GameEngine/Model/Config/AddUpRechargeConfig.cs
+++ b/Core/GameEngine/Model/Config/AddUpRechargeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AddUpRechargeConfig
{
diff --git a/Core/GameEngine/Model/Config/AdventureDialogueConfig.cs b/Core/GameEngine/Model/Config/AdventureDialogueConfig.cs
index 6e7ad74..6fad7de 100644
--- a/Core/GameEngine/Model/Config/AdventureDialogueConfig.cs
+++ b/Core/GameEngine/Model/Config/AdventureDialogueConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AdventureDialogueConfig
{
@@ -40,11 +40,11 @@
dialogues = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- string[] speakTypeStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- speakType = new int[speakTypeStringArray.Length];
- for (int i=0;i<speakTypeStringArray.Length;i++)
- {
- int.TryParse(speakTypeStringArray[i],out speakType[i]);
+ string[] speakTypeStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ speakType = new int[speakTypeStringArray.Length];
+ for (int i=0;i<speakTypeStringArray.Length;i++)
+ {
+ int.TryParse(speakTypeStringArray[i],out speakType[i]);
}
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/AlchemyConfig.cs b/Core/GameEngine/Model/Config/AlchemyConfig.cs
index 0acb217..6f668af 100644
--- a/Core/GameEngine/Model/Config/AlchemyConfig.cs
+++ b/Core/GameEngine/Model/Config/AlchemyConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AlchemyConfig
{
diff --git a/Core/GameEngine/Model/Config/AlchemyCountConfig.cs b/Core/GameEngine/Model/Config/AlchemyCountConfig.cs
index b834e6f..8f9a77d 100644
--- a/Core/GameEngine/Model/Config/AlchemyCountConfig.cs
+++ b/Core/GameEngine/Model/Config/AlchemyCountConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AlchemyCountConfig
{
diff --git a/Core/GameEngine/Model/Config/AlchemySpecConfig.cs b/Core/GameEngine/Model/Config/AlchemySpecConfig.cs
index 271c4d8..21dfe23 100644
--- a/Core/GameEngine/Model/Config/AlchemySpecConfig.cs
+++ b/Core/GameEngine/Model/Config/AlchemySpecConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AlchemySpecConfig
{
diff --git a/Core/GameEngine/Model/Config/AllPeoplePartyAwardConfig.cs b/Core/GameEngine/Model/Config/AllPeoplePartyAwardConfig.cs
index 85982a5..b6b4676 100644
--- a/Core/GameEngine/Model/Config/AllPeoplePartyAwardConfig.cs
+++ b/Core/GameEngine/Model/Config/AllPeoplePartyAwardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AllPeoplePartyAwardConfig
{
diff --git a/Core/GameEngine/Model/Config/AllPeoplePartyConfig.cs b/Core/GameEngine/Model/Config/AllPeoplePartyConfig.cs
index caa6195..5efacf6 100644
--- a/Core/GameEngine/Model/Config/AllPeoplePartyConfig.cs
+++ b/Core/GameEngine/Model/Config/AllPeoplePartyConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AllPeoplePartyConfig
{
diff --git a/Core/GameEngine/Model/Config/AncientRobotNameConfig.cs b/Core/GameEngine/Model/Config/AncientRobotNameConfig.cs
index 4b3c7f3..81ea134 100644
--- a/Core/GameEngine/Model/Config/AncientRobotNameConfig.cs
+++ b/Core/GameEngine/Model/Config/AncientRobotNameConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AncientRobotNameConfig
{
diff --git a/Core/GameEngine/Model/Config/ApkUpdateUrlConfig.cs b/Core/GameEngine/Model/Config/ApkUpdateUrlConfig.cs
index a66b1a9..25c9dcd 100644
--- a/Core/GameEngine/Model/Config/ApkUpdateUrlConfig.cs
+++ b/Core/GameEngine/Model/Config/ApkUpdateUrlConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ApkUpdateUrlConfig
{
diff --git a/Core/GameEngine/Model/Config/AppointItemConfig.cs b/Core/GameEngine/Model/Config/AppointItemConfig.cs
index b3e2339..0844967 100644
--- a/Core/GameEngine/Model/Config/AppointItemConfig.cs
+++ b/Core/GameEngine/Model/Config/AppointItemConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AppointItemConfig
{
diff --git a/Core/GameEngine/Model/Config/AreaCameraConfig.cs b/Core/GameEngine/Model/Config/AreaCameraConfig.cs
index dddac5e..c121273 100644
--- a/Core/GameEngine/Model/Config/AreaCameraConfig.cs
+++ b/Core/GameEngine/Model/Config/AreaCameraConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AreaCameraConfig
{
diff --git a/Core/GameEngine/Model/Config/AssistThanksGiftConfig.cs b/Core/GameEngine/Model/Config/AssistThanksGiftConfig.cs
index cab3232..2e8756d 100644
--- a/Core/GameEngine/Model/Config/AssistThanksGiftConfig.cs
+++ b/Core/GameEngine/Model/Config/AssistThanksGiftConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AssistThanksGiftConfig
{
diff --git a/Core/GameEngine/Model/Config/AttrFruitConfig.cs b/Core/GameEngine/Model/Config/AttrFruitConfig.cs
index fd396d4..df9f076 100644
--- a/Core/GameEngine/Model/Config/AttrFruitConfig.cs
+++ b/Core/GameEngine/Model/Config/AttrFruitConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AttrFruitConfig
{
@@ -36,11 +36,11 @@
int.TryParse(tables[1],out FuncID);
- string[] MaxUseCntStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- MaxUseCnt = new Int2[MaxUseCntStringArray.Length];
- for (int i=0;i<MaxUseCntStringArray.Length;i++)
- {
- Int2.TryParse(MaxUseCntStringArray[i],out MaxUseCnt[i]);
+ string[] MaxUseCntStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ MaxUseCnt = new Int2[MaxUseCntStringArray.Length];
+ for (int i=0;i<MaxUseCntStringArray.Length;i++)
+ {
+ Int2.TryParse(MaxUseCntStringArray[i],out MaxUseCnt[i]);
}
AddItemMaxCnt = tables[3];
diff --git a/Core/GameEngine/Model/Config/AuctionConfig.cs b/Core/GameEngine/Model/Config/AuctionConfig.cs
index 07c4174..6024df1 100644
--- a/Core/GameEngine/Model/Config/AuctionConfig.cs
+++ b/Core/GameEngine/Model/Config/AuctionConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AuctionConfig
{
@@ -35,18 +35,18 @@
int.TryParse(tables[1],out TypeId);
- string[] ChooseItem1StringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- ChooseItem1 = new int[ChooseItem1StringArray.Length];
- for (int i=0;i<ChooseItem1StringArray.Length;i++)
- {
- int.TryParse(ChooseItem1StringArray[i],out ChooseItem1[i]);
+ string[] ChooseItem1StringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ ChooseItem1 = new int[ChooseItem1StringArray.Length];
+ for (int i=0;i<ChooseItem1StringArray.Length;i++)
+ {
+ int.TryParse(ChooseItem1StringArray[i],out ChooseItem1[i]);
}
- string[] ChooseItem2StringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- ChooseItem2 = new int[ChooseItem2StringArray.Length];
- for (int i=0;i<ChooseItem2StringArray.Length;i++)
- {
- int.TryParse(ChooseItem2StringArray[i],out ChooseItem2[i]);
+ string[] ChooseItem2StringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ ChooseItem2 = new int[ChooseItem2StringArray.Length];
+ for (int i=0;i<ChooseItem2StringArray.Length;i++)
+ {
+ int.TryParse(ChooseItem2StringArray[i],out ChooseItem2[i]);
}
TypeName = tables[4];
diff --git a/Core/GameEngine/Model/Config/AuctionIndexConfig.cs b/Core/GameEngine/Model/Config/AuctionIndexConfig.cs
index 2ba8c3b..6b294eb 100644
--- a/Core/GameEngine/Model/Config/AuctionIndexConfig.cs
+++ b/Core/GameEngine/Model/Config/AuctionIndexConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AuctionIndexConfig
{
@@ -33,20 +33,20 @@
int.TryParse(tables[1],out Job);
- string[] ItemTypeStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- ItemType = new int[ItemTypeStringArray.Length];
- for (int i=0;i<ItemTypeStringArray.Length;i++)
- {
- int.TryParse(ItemTypeStringArray[i],out ItemType[i]);
+ string[] ItemTypeStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ ItemType = new int[ItemTypeStringArray.Length];
+ for (int i=0;i<ItemTypeStringArray.Length;i++)
+ {
+ int.TryParse(ItemTypeStringArray[i],out ItemType[i]);
}
int.TryParse(tables[3],out Order);
- string[] SpecItemIDStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- SpecItemID = new int[SpecItemIDStringArray.Length];
- for (int i=0;i<SpecItemIDStringArray.Length;i++)
- {
- int.TryParse(SpecItemIDStringArray[i],out SpecItemID[i]);
+ string[] SpecItemIDStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ SpecItemID = new int[SpecItemIDStringArray.Length];
+ for (int i=0;i<SpecItemIDStringArray.Length;i++)
+ {
+ int.TryParse(SpecItemIDStringArray[i],out SpecItemID[i]);
}
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/AuctionItemConfig.cs b/Core/GameEngine/Model/Config/AuctionItemConfig.cs
index 01c68df..613cbd6 100644
--- a/Core/GameEngine/Model/Config/AuctionItemConfig.cs
+++ b/Core/GameEngine/Model/Config/AuctionItemConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AuctionItemConfig
{
diff --git a/Core/GameEngine/Model/Config/AudioConfig.cs b/Core/GameEngine/Model/Config/AudioConfig.cs
index 6772f7e..2c9c2a8 100644
--- a/Core/GameEngine/Model/Config/AudioConfig.cs
+++ b/Core/GameEngine/Model/Config/AudioConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class AudioConfig
{
diff --git a/Core/GameEngine/Model/Config/BOSSFirstKillConfig.cs b/Core/GameEngine/Model/Config/BOSSFirstKillConfig.cs
index c78fcf0..0b9b5fb 100644
--- a/Core/GameEngine/Model/Config/BOSSFirstKillConfig.cs
+++ b/Core/GameEngine/Model/Config/BOSSFirstKillConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class BOSSFirstKillConfig
{
diff --git a/Core/GameEngine/Model/Config/BossHomeConfig.cs b/Core/GameEngine/Model/Config/BossHomeConfig.cs
index c5a1088..6ace47c 100644
--- a/Core/GameEngine/Model/Config/BossHomeConfig.cs
+++ b/Core/GameEngine/Model/Config/BossHomeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class BossHomeConfig
{
diff --git a/Core/GameEngine/Model/Config/BossInfoConfig.cs b/Core/GameEngine/Model/Config/BossInfoConfig.cs
index ad09b17..5d7bb29 100644
--- a/Core/GameEngine/Model/Config/BossInfoConfig.cs
+++ b/Core/GameEngine/Model/Config/BossInfoConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class BossInfoConfig
{
diff --git a/Core/GameEngine/Model/Config/BossRebornConfig.cs b/Core/GameEngine/Model/Config/BossRebornConfig.cs
index 20ed10c..1f07de1 100644
--- a/Core/GameEngine/Model/Config/BossRebornConfig.cs
+++ b/Core/GameEngine/Model/Config/BossRebornConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class BossRebornConfig
{
diff --git a/Core/GameEngine/Model/Config/CTGConfig.cs b/Core/GameEngine/Model/Config/CTGConfig.cs
index b57eb5d..83ee050 100644
--- a/Core/GameEngine/Model/Config/CTGConfig.cs
+++ b/Core/GameEngine/Model/Config/CTGConfig.cs
@@ -9,19 +9,19 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class CTGConfig
{
- public readonly int RecordID;
- public readonly string Title;
- public readonly int TotalBuyCount;
- public readonly int DailyBuyCount;
- public readonly int GainGold;
- public readonly int GainGoldPaper;
- public readonly int FirstGoldPaperPrize;
- public readonly string GainItemList;
- public readonly string Icon;
+ public readonly int RecordID;
+ public readonly string Title;
+ public readonly int TotalBuyCount;
+ public readonly int DailyBuyCount;
+ public readonly int GainGold;
+ public readonly int GainGoldPaper;
+ public readonly int FirstGoldPaperPrize;
+ public readonly string GainItemList;
+ public readonly string Icon;
public readonly int PayType;
public CTGConfig()
@@ -34,24 +34,24 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out RecordID);
-
- Title = tables[1];
-
- int.TryParse(tables[2],out TotalBuyCount);
-
- int.TryParse(tables[3],out DailyBuyCount);
-
- int.TryParse(tables[4],out GainGold);
-
- int.TryParse(tables[5],out GainGoldPaper);
-
- int.TryParse(tables[6],out FirstGoldPaperPrize);
-
- GainItemList = tables[7];
-
- Icon = tables[8];
-
+ int.TryParse(tables[0],out RecordID);
+
+ Title = tables[1];
+
+ int.TryParse(tables[2],out TotalBuyCount);
+
+ int.TryParse(tables[3],out DailyBuyCount);
+
+ int.TryParse(tables[4],out GainGold);
+
+ int.TryParse(tables[5],out GainGoldPaper);
+
+ int.TryParse(tables[6],out FirstGoldPaperPrize);
+
+ GainItemList = tables[7];
+
+ Icon = tables[8];
+
int.TryParse(tables[9],out PayType);
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/ChatBubbleBoxConfig.cs b/Core/GameEngine/Model/Config/ChatBubbleBoxConfig.cs
index 0b03bcf..b029b11 100644
--- a/Core/GameEngine/Model/Config/ChatBubbleBoxConfig.cs
+++ b/Core/GameEngine/Model/Config/ChatBubbleBoxConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ChatBubbleBoxConfig
{
@@ -46,18 +46,18 @@
rightBubbleIcon = tables[4];
- string[] leftOffsetStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- leftOffset = new int[leftOffsetStringArray.Length];
- for (int i=0;i<leftOffsetStringArray.Length;i++)
- {
- int.TryParse(leftOffsetStringArray[i],out leftOffset[i]);
+ string[] leftOffsetStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ leftOffset = new int[leftOffsetStringArray.Length];
+ for (int i=0;i<leftOffsetStringArray.Length;i++)
+ {
+ int.TryParse(leftOffsetStringArray[i],out leftOffset[i]);
}
- string[] rightOffsetStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- rightOffset = new int[rightOffsetStringArray.Length];
- for (int i=0;i<rightOffsetStringArray.Length;i++)
- {
- int.TryParse(rightOffsetStringArray[i],out rightOffset[i]);
+ string[] rightOffsetStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ rightOffset = new int[rightOffsetStringArray.Length];
+ for (int i=0;i<rightOffsetStringArray.Length;i++)
+ {
+ int.TryParse(rightOffsetStringArray[i],out rightOffset[i]);
}
Icon = tables[7];
@@ -66,11 +66,11 @@
GainTip = tables[9];
- string[] colorStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- color = new int[colorStringArray.Length];
- for (int i=0;i<colorStringArray.Length;i++)
- {
- int.TryParse(colorStringArray[i],out color[i]);
+ string[] colorStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ color = new int[colorStringArray.Length];
+ for (int i=0;i<colorStringArray.Length;i++)
+ {
+ int.TryParse(colorStringArray[i],out color[i]);
}
int.TryParse(tables[11],out top);
diff --git a/Core/GameEngine/Model/Config/ChestsAwardConfig.cs b/Core/GameEngine/Model/Config/ChestsAwardConfig.cs
index 79867fc..d67ab43 100644
--- a/Core/GameEngine/Model/Config/ChestsAwardConfig.cs
+++ b/Core/GameEngine/Model/Config/ChestsAwardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ChestsAwardConfig
{
diff --git a/Core/GameEngine/Model/Config/ChestsConfig.cs b/Core/GameEngine/Model/Config/ChestsConfig.cs
index f2a6e80..0169f96 100644
--- a/Core/GameEngine/Model/Config/ChestsConfig.cs
+++ b/Core/GameEngine/Model/Config/ChestsConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ChestsConfig
{
diff --git a/Core/GameEngine/Model/Config/CollectNpcConfig.cs b/Core/GameEngine/Model/Config/CollectNpcConfig.cs
index 9bee003..403eea8 100644
--- a/Core/GameEngine/Model/Config/CollectNpcConfig.cs
+++ b/Core/GameEngine/Model/Config/CollectNpcConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class CollectNpcConfig
{
diff --git a/Core/GameEngine/Model/Config/ContactConfig.cs b/Core/GameEngine/Model/Config/ContactConfig.cs
index cb311d9..d86110f 100644
--- a/Core/GameEngine/Model/Config/ContactConfig.cs
+++ b/Core/GameEngine/Model/Config/ContactConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ContactConfig
{
diff --git a/Core/GameEngine/Model/Config/ContinueSignInConfig.cs b/Core/GameEngine/Model/Config/ContinueSignInConfig.cs
index 4916d70..1a6ad4d 100644
--- a/Core/GameEngine/Model/Config/ContinueSignInConfig.cs
+++ b/Core/GameEngine/Model/Config/ContinueSignInConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ContinueSignInConfig
{
diff --git a/Core/GameEngine/Model/Config/CreateRoleConfig.cs b/Core/GameEngine/Model/Config/CreateRoleConfig.cs
index e446e7b..66f666c 100644
--- a/Core/GameEngine/Model/Config/CreateRoleConfig.cs
+++ b/Core/GameEngine/Model/Config/CreateRoleConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class CreateRoleConfig
{
diff --git a/Core/GameEngine/Model/Config/CrossRealmPKDanAwardConfig.cs b/Core/GameEngine/Model/Config/CrossRealmPKDanAwardConfig.cs
index ea92aac..b97f6ac 100644
--- a/Core/GameEngine/Model/Config/CrossRealmPKDanAwardConfig.cs
+++ b/Core/GameEngine/Model/Config/CrossRealmPKDanAwardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class CrossRealmPKDanAwardConfig
{
diff --git a/Core/GameEngine/Model/Config/CrossRealmPKOrderAwardConfig.cs b/Core/GameEngine/Model/Config/CrossRealmPKOrderAwardConfig.cs
index 2deb749..87d8797 100644
--- a/Core/GameEngine/Model/Config/CrossRealmPKOrderAwardConfig.cs
+++ b/Core/GameEngine/Model/Config/CrossRealmPKOrderAwardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class CrossRealmPKOrderAwardConfig
{
diff --git a/Core/GameEngine/Model/Config/CrossServerArenaConfig.cs b/Core/GameEngine/Model/Config/CrossServerArenaConfig.cs
index f0f8627..b801e36 100644
--- a/Core/GameEngine/Model/Config/CrossServerArenaConfig.cs
+++ b/Core/GameEngine/Model/Config/CrossServerArenaConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class CrossServerArenaConfig
{
diff --git a/Core/GameEngine/Model/Config/CrossServerBossConfig.cs b/Core/GameEngine/Model/Config/CrossServerBossConfig.cs
index 8744d51..118d28c 100644
--- a/Core/GameEngine/Model/Config/CrossServerBossConfig.cs
+++ b/Core/GameEngine/Model/Config/CrossServerBossConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class CrossServerBossConfig
{
diff --git a/Core/GameEngine/Model/Config/CrossServerOneVsOneRobotConfig.cs b/Core/GameEngine/Model/Config/CrossServerOneVsOneRobotConfig.cs
index 6280783..58053d1 100644
--- a/Core/GameEngine/Model/Config/CrossServerOneVsOneRobotConfig.cs
+++ b/Core/GameEngine/Model/Config/CrossServerOneVsOneRobotConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class CrossServerOneVsOneRobotConfig
{
diff --git a/Core/GameEngine/Model/Config/DailyLivenessRewardConfig.cs b/Core/GameEngine/Model/Config/DailyLivenessRewardConfig.cs
index b6b34c5..c988d56 100644
--- a/Core/GameEngine/Model/Config/DailyLivenessRewardConfig.cs
+++ b/Core/GameEngine/Model/Config/DailyLivenessRewardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DailyLivenessRewardConfig
{
diff --git a/Core/GameEngine/Model/Config/DailyQuestConfig.cs b/Core/GameEngine/Model/Config/DailyQuestConfig.cs
index 1a05c68..31d3e24 100644
--- a/Core/GameEngine/Model/Config/DailyQuestConfig.cs
+++ b/Core/GameEngine/Model/Config/DailyQuestConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DailyQuestConfig
{
diff --git a/Core/GameEngine/Model/Config/DailyQuestMixServerStateTimeConfig.cs b/Core/GameEngine/Model/Config/DailyQuestMixServerStateTimeConfig.cs
index 49ef9f9..b5d709d 100644
--- a/Core/GameEngine/Model/Config/DailyQuestMixServerStateTimeConfig.cs
+++ b/Core/GameEngine/Model/Config/DailyQuestMixServerStateTimeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DailyQuestMixServerStateTimeConfig
{
diff --git a/Core/GameEngine/Model/Config/DailyQuestOpenTimeConfig.cs b/Core/GameEngine/Model/Config/DailyQuestOpenTimeConfig.cs
index 31eaf9a..be9b7af 100644
--- a/Core/GameEngine/Model/Config/DailyQuestOpenTimeConfig.cs
+++ b/Core/GameEngine/Model/Config/DailyQuestOpenTimeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DailyQuestOpenTimeConfig
{
diff --git a/Core/GameEngine/Model/Config/DailyQuestSpecialOpenTimeConfig.cs b/Core/GameEngine/Model/Config/DailyQuestSpecialOpenTimeConfig.cs
index 13544e7..03a9ca5 100644
--- a/Core/GameEngine/Model/Config/DailyQuestSpecialOpenTimeConfig.cs
+++ b/Core/GameEngine/Model/Config/DailyQuestSpecialOpenTimeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DailyQuestSpecialOpenTimeConfig
{
diff --git a/Core/GameEngine/Model/Config/DamageNumConfig.cs b/Core/GameEngine/Model/Config/DamageNumConfig.cs
index 2407474..9f7ef65 100644
--- a/Core/GameEngine/Model/Config/DamageNumConfig.cs
+++ b/Core/GameEngine/Model/Config/DamageNumConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DamageNumConfig
{
@@ -40,11 +40,11 @@
int.TryParse(tables[4],out minus);
- string[] numsStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- nums = new int[numsStringArray.Length];
- for (int i=0;i<numsStringArray.Length;i++)
- {
- int.TryParse(numsStringArray[i],out nums[i]);
+ string[] numsStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ nums = new int[numsStringArray.Length];
+ for (int i=0;i<numsStringArray.Length;i++)
+ {
+ int.TryParse(numsStringArray[i],out nums[i]);
}
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/DemonJarConfig.cs b/Core/GameEngine/Model/Config/DemonJarConfig.cs
index 5798046..ec497f4 100644
--- a/Core/GameEngine/Model/Config/DemonJarConfig.cs
+++ b/Core/GameEngine/Model/Config/DemonJarConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DemonJarConfig
{
@@ -47,11 +47,11 @@
int.TryParse(tables[2],out Time);
- string[] MustItemIDStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- MustItemID = new int[MustItemIDStringArray.Length];
- for (int i=0;i<MustItemIDStringArray.Length;i++)
- {
- int.TryParse(MustItemIDStringArray[i],out MustItemID[i]);
+ string[] MustItemIDStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ MustItemID = new int[MustItemIDStringArray.Length];
+ for (int i=0;i<MustItemIDStringArray.Length;i++)
+ {
+ int.TryParse(MustItemIDStringArray[i],out MustItemID[i]);
}
RareItemID = tables[4];
@@ -68,25 +68,25 @@
int.TryParse(tables[10],out CancelAttentionAfterKill);
- string[] Job1StringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- Job1 = new int[Job1StringArray.Length];
- for (int i=0;i<Job1StringArray.Length;i++)
- {
- int.TryParse(Job1StringArray[i],out Job1[i]);
+ string[] Job1StringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ Job1 = new int[Job1StringArray.Length];
+ for (int i=0;i<Job1StringArray.Length;i++)
+ {
+ int.TryParse(Job1StringArray[i],out Job1[i]);
}
- string[] Job2StringArray = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- Job2 = new int[Job2StringArray.Length];
- for (int i=0;i<Job2StringArray.Length;i++)
- {
- int.TryParse(Job2StringArray[i],out Job2[i]);
+ string[] Job2StringArray = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ Job2 = new int[Job2StringArray.Length];
+ for (int i=0;i<Job2StringArray.Length;i++)
+ {
+ int.TryParse(Job2StringArray[i],out Job2[i]);
}
- string[] Job3StringArray = tables[13].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- Job3 = new int[Job3StringArray.Length];
- for (int i=0;i<Job3StringArray.Length;i++)
- {
- int.TryParse(Job3StringArray[i],out Job3[i]);
+ string[] Job3StringArray = tables[13].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ Job3 = new int[Job3StringArray.Length];
+ for (int i=0;i<Job3StringArray.Length;i++)
+ {
+ int.TryParse(Job3StringArray[i],out Job3[i]);
}
int.TryParse(tables[14],out KillHurtMin);
diff --git a/Core/GameEngine/Model/Config/DemonRecommondPropertyConfig.cs b/Core/GameEngine/Model/Config/DemonRecommondPropertyConfig.cs
index 860f0f1..6685ae1 100644
--- a/Core/GameEngine/Model/Config/DemonRecommondPropertyConfig.cs
+++ b/Core/GameEngine/Model/Config/DemonRecommondPropertyConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DemonRecommondPropertyConfig
{
diff --git a/Core/GameEngine/Model/Config/DialogConfig.cs b/Core/GameEngine/Model/Config/DialogConfig.cs
index 405e41f..dbcfa9c 100644
--- a/Core/GameEngine/Model/Config/DialogConfig.cs
+++ b/Core/GameEngine/Model/Config/DialogConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DialogConfig
{
diff --git a/Core/GameEngine/Model/Config/DienstgradConfig.cs b/Core/GameEngine/Model/Config/DienstgradConfig.cs
index 855a7ff..2b08ae4 100644
--- a/Core/GameEngine/Model/Config/DienstgradConfig.cs
+++ b/Core/GameEngine/Model/Config/DienstgradConfig.cs
@@ -9,22 +9,22 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DienstgradConfig
{
- public readonly int ID;
- public readonly string Name;
- public readonly int Type;
- public readonly int Prescription;
- public readonly string OutTimeDesc;
- public readonly int[] LightType;
- public readonly int[] LightAttribute;
- public readonly string Image;
- public readonly string Content;
- public readonly int[] Skills;
- public readonly int gotoId;
- public readonly int missionId;
+ public readonly int ID;
+ public readonly string Name;
+ public readonly int Type;
+ public readonly int Prescription;
+ public readonly string OutTimeDesc;
+ public readonly int[] LightType;
+ public readonly int[] LightAttribute;
+ public readonly string Image;
+ public readonly string Content;
+ public readonly int[] Skills;
+ public readonly int gotoId;
+ public readonly int missionId;
public readonly int order;
public DienstgradConfig()
@@ -37,45 +37,45 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out ID);
-
- Name = tables[1];
-
- int.TryParse(tables[2],out Type);
-
- int.TryParse(tables[3],out Prescription);
-
- OutTimeDesc = tables[4];
-
+ int.TryParse(tables[0],out ID);
+
+ Name = tables[1];
+
+ int.TryParse(tables[2],out Type);
+
+ int.TryParse(tables[3],out Prescription);
+
+ OutTimeDesc = tables[4];
+
string[] LightTypeStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
LightType = new int[LightTypeStringArray.Length];
for (int i=0;i<LightTypeStringArray.Length;i++)
{
int.TryParse(LightTypeStringArray[i],out LightType[i]);
- }
-
+ }
+
string[] LightAttributeStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
LightAttribute = new int[LightAttributeStringArray.Length];
for (int i=0;i<LightAttributeStringArray.Length;i++)
{
int.TryParse(LightAttributeStringArray[i],out LightAttribute[i]);
- }
-
- Image = tables[7];
-
- Content = tables[8];
-
+ }
+
+ Image = tables[7];
+
+ Content = tables[8];
+
string[] SkillsStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
Skills = new int[SkillsStringArray.Length];
for (int i=0;i<SkillsStringArray.Length;i++)
{
int.TryParse(SkillsStringArray[i],out Skills[i]);
- }
-
- int.TryParse(tables[10],out gotoId);
-
- int.TryParse(tables[11],out missionId);
-
+ }
+
+ int.TryParse(tables[10],out gotoId);
+
+ int.TryParse(tables[11],out missionId);
+
int.TryParse(tables[12],out order);
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/DirtyNameConfig.cs b/Core/GameEngine/Model/Config/DirtyNameConfig.cs
index 79c5d37..cfa8c4d 100644
--- a/Core/GameEngine/Model/Config/DirtyNameConfig.cs
+++ b/Core/GameEngine/Model/Config/DirtyNameConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DirtyNameConfig
{
diff --git a/Core/GameEngine/Model/Config/DirtyWordConfig.cs b/Core/GameEngine/Model/Config/DirtyWordConfig.cs
index e2d7f68..92d2758 100644
--- a/Core/GameEngine/Model/Config/DirtyWordConfig.cs
+++ b/Core/GameEngine/Model/Config/DirtyWordConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DirtyWordConfig
{
diff --git a/Core/GameEngine/Model/Config/DogzConfig.cs b/Core/GameEngine/Model/Config/DogzConfig.cs
index 45a2609..e23239c 100644
--- a/Core/GameEngine/Model/Config/DogzConfig.cs
+++ b/Core/GameEngine/Model/Config/DogzConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DogzConfig
{
@@ -38,34 +38,34 @@
HeadIcon = tables[2];
- string[] BaseAttrTypesStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- BaseAttrTypes = new int[BaseAttrTypesStringArray.Length];
- for (int i=0;i<BaseAttrTypesStringArray.Length;i++)
- {
- int.TryParse(BaseAttrTypesStringArray[i],out BaseAttrTypes[i]);
+ string[] BaseAttrTypesStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ BaseAttrTypes = new int[BaseAttrTypesStringArray.Length];
+ for (int i=0;i<BaseAttrTypesStringArray.Length;i++)
+ {
+ int.TryParse(BaseAttrTypesStringArray[i],out BaseAttrTypes[i]);
}
- string[] BaseAttrValuesStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- BaseAttrValues = new int[BaseAttrValuesStringArray.Length];
- for (int i=0;i<BaseAttrValuesStringArray.Length;i++)
- {
- int.TryParse(BaseAttrValuesStringArray[i],out BaseAttrValues[i]);
+ string[] BaseAttrValuesStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ BaseAttrValues = new int[BaseAttrValuesStringArray.Length];
+ for (int i=0;i<BaseAttrValuesStringArray.Length;i++)
+ {
+ int.TryParse(BaseAttrValuesStringArray[i],out BaseAttrValues[i]);
}
- string[] HelpBattleSkillsStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- HelpBattleSkills = new int[HelpBattleSkillsStringArray.Length];
- for (int i=0;i<HelpBattleSkillsStringArray.Length;i++)
- {
- int.TryParse(HelpBattleSkillsStringArray[i],out HelpBattleSkills[i]);
+ string[] HelpBattleSkillsStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ HelpBattleSkills = new int[HelpBattleSkillsStringArray.Length];
+ for (int i=0;i<HelpBattleSkillsStringArray.Length;i++)
+ {
+ int.TryParse(HelpBattleSkillsStringArray[i],out HelpBattleSkills[i]);
}
int.TryParse(tables[6],out FightPowerEx);
- string[] EquipPlaceColorListStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- EquipPlaceColorList = new int[EquipPlaceColorListStringArray.Length];
- for (int i=0;i<EquipPlaceColorListStringArray.Length;i++)
- {
- int.TryParse(EquipPlaceColorListStringArray[i],out EquipPlaceColorList[i]);
+ string[] EquipPlaceColorListStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ EquipPlaceColorList = new int[EquipPlaceColorListStringArray.Length];
+ for (int i=0;i<EquipPlaceColorListStringArray.Length;i++)
+ {
+ int.TryParse(EquipPlaceColorListStringArray[i],out EquipPlaceColorList[i]);
}
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/DogzEquipPlusConfig.cs b/Core/GameEngine/Model/Config/DogzEquipPlusConfig.cs
index 0523267..fb994f0 100644
--- a/Core/GameEngine/Model/Config/DogzEquipPlusConfig.cs
+++ b/Core/GameEngine/Model/Config/DogzEquipPlusConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DogzEquipPlusConfig
{
@@ -36,18 +36,18 @@
int.TryParse(tables[2],out level);
- string[] attTypeStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- attType = new int[attTypeStringArray.Length];
- for (int i=0;i<attTypeStringArray.Length;i++)
- {
- int.TryParse(attTypeStringArray[i],out attType[i]);
+ string[] attTypeStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ attType = new int[attTypeStringArray.Length];
+ for (int i=0;i<attTypeStringArray.Length;i++)
+ {
+ int.TryParse(attTypeStringArray[i],out attType[i]);
}
- string[] attValueStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- attValue = new int[attValueStringArray.Length];
- for (int i=0;i<attValueStringArray.Length;i++)
- {
- int.TryParse(attValueStringArray[i],out attValue[i]);
+ string[] attValueStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ attValue = new int[attValueStringArray.Length];
+ for (int i=0;i<attValueStringArray.Length;i++)
+ {
+ int.TryParse(attValueStringArray[i],out attValue[i]);
}
int.TryParse(tables[5],out upExpTotal);
diff --git a/Core/GameEngine/Model/Config/DungeonConfig.cs b/Core/GameEngine/Model/Config/DungeonConfig.cs
index fb76e51..b0e1529 100644
--- a/Core/GameEngine/Model/Config/DungeonConfig.cs
+++ b/Core/GameEngine/Model/Config/DungeonConfig.cs
@@ -9,32 +9,32 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DungeonConfig
{
- public readonly int ID;
- public readonly int DataMapID;
- public readonly int LineID;
- public readonly int MapID;
- public readonly string FBName;
- public readonly int LVLimitMin;
- public readonly int LVLimitMax;
- public readonly int JobRankLimit;
- public readonly int TicketID;
- public readonly int[] TicketCostCnt;
- public readonly int TicketPrice;
- public readonly int SweepLVLimit;
- public readonly int SweepItemID;
- public readonly int SweepCostCnt;
- public readonly string StepTime;
- public readonly string RefreshNPC;
- public readonly int[] BossActorID;
- public readonly int[] Rewards;
- public readonly string[] RewardCountDescriptions;
- public readonly string Description;
- public readonly int AutomaticATK;
- public readonly int MapButton;
+ public readonly int ID;
+ public readonly int DataMapID;
+ public readonly int LineID;
+ public readonly int MapID;
+ public readonly string FBName;
+ public readonly int LVLimitMin;
+ public readonly int LVLimitMax;
+ public readonly int JobRankLimit;
+ public readonly int TicketID;
+ public readonly int[] TicketCostCnt;
+ public readonly int TicketPrice;
+ public readonly int SweepLVLimit;
+ public readonly int SweepItemID;
+ public readonly int SweepCostCnt;
+ public readonly string StepTime;
+ public readonly string RefreshNPC;
+ public readonly int[] BossActorID;
+ public readonly int[] Rewards;
+ public readonly string[] RewardCountDescriptions;
+ public readonly string Description;
+ public readonly int AutomaticATK;
+ public readonly int MapButton;
public readonly int ShowNewItemTip;
public DungeonConfig()
@@ -47,65 +47,65 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out ID);
-
- int.TryParse(tables[1],out DataMapID);
-
- int.TryParse(tables[2],out LineID);
-
- int.TryParse(tables[3],out MapID);
-
- FBName = tables[4];
-
- int.TryParse(tables[5],out LVLimitMin);
-
- int.TryParse(tables[6],out LVLimitMax);
-
- int.TryParse(tables[7],out JobRankLimit);
-
- int.TryParse(tables[8],out TicketID);
-
+ int.TryParse(tables[0],out ID);
+
+ int.TryParse(tables[1],out DataMapID);
+
+ int.TryParse(tables[2],out LineID);
+
+ int.TryParse(tables[3],out MapID);
+
+ FBName = tables[4];
+
+ int.TryParse(tables[5],out LVLimitMin);
+
+ int.TryParse(tables[6],out LVLimitMax);
+
+ int.TryParse(tables[7],out JobRankLimit);
+
+ int.TryParse(tables[8],out TicketID);
+
string[] TicketCostCntStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
TicketCostCnt = new int[TicketCostCntStringArray.Length];
for (int i=0;i<TicketCostCntStringArray.Length;i++)
{
int.TryParse(TicketCostCntStringArray[i],out TicketCostCnt[i]);
- }
-
- int.TryParse(tables[10],out TicketPrice);
-
- int.TryParse(tables[11],out SweepLVLimit);
-
- int.TryParse(tables[12],out SweepItemID);
-
- int.TryParse(tables[13],out SweepCostCnt);
-
- StepTime = tables[14];
-
- RefreshNPC = tables[15];
-
+ }
+
+ int.TryParse(tables[10],out TicketPrice);
+
+ int.TryParse(tables[11],out SweepLVLimit);
+
+ int.TryParse(tables[12],out SweepItemID);
+
+ int.TryParse(tables[13],out SweepCostCnt);
+
+ StepTime = tables[14];
+
+ RefreshNPC = tables[15];
+
string[] BossActorIDStringArray = tables[16].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
BossActorID = new int[BossActorIDStringArray.Length];
for (int i=0;i<BossActorIDStringArray.Length;i++)
{
int.TryParse(BossActorIDStringArray[i],out BossActorID[i]);
- }
-
+ }
+
string[] RewardsStringArray = tables[17].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
Rewards = new int[RewardsStringArray.Length];
for (int i=0;i<RewardsStringArray.Length;i++)
{
int.TryParse(RewardsStringArray[i],out Rewards[i]);
- }
-
- RewardCountDescriptions = tables[18].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
-
- Description = tables[19];
-
- int.TryParse(tables[20],out AutomaticATK);
-
- int.TryParse(tables[21],out MapButton);
-
+ }
+
+ RewardCountDescriptions = tables[18].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+
+ Description = tables[19];
+
+ int.TryParse(tables[20],out AutomaticATK);
+
+ int.TryParse(tables[21],out MapButton);
+
int.TryParse(tables[22],out ShowNewItemTip);
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/DungeonHelpBattleConfig.cs b/Core/GameEngine/Model/Config/DungeonHelpBattleConfig.cs
index 286fa7f..7b0b79a 100644
--- a/Core/GameEngine/Model/Config/DungeonHelpBattleConfig.cs
+++ b/Core/GameEngine/Model/Config/DungeonHelpBattleConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DungeonHelpBattleConfig
{
diff --git a/Core/GameEngine/Model/Config/DungeonHintConfig.cs b/Core/GameEngine/Model/Config/DungeonHintConfig.cs
index fba4095..2e6dc5c 100644
--- a/Core/GameEngine/Model/Config/DungeonHintConfig.cs
+++ b/Core/GameEngine/Model/Config/DungeonHintConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DungeonHintConfig
{
diff --git a/Core/GameEngine/Model/Config/DungeonInspireConfig.cs b/Core/GameEngine/Model/Config/DungeonInspireConfig.cs
index 38057d4..c7ff1f9 100644
--- a/Core/GameEngine/Model/Config/DungeonInspireConfig.cs
+++ b/Core/GameEngine/Model/Config/DungeonInspireConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DungeonInspireConfig
{
diff --git a/Core/GameEngine/Model/Config/DungeonMixServerStateTimeConfig.cs b/Core/GameEngine/Model/Config/DungeonMixServerStateTimeConfig.cs
index 29f31af..9ed1bbd 100644
--- a/Core/GameEngine/Model/Config/DungeonMixServerStateTimeConfig.cs
+++ b/Core/GameEngine/Model/Config/DungeonMixServerStateTimeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DungeonMixServerStateTimeConfig
{
diff --git a/Core/GameEngine/Model/Config/DungeonOpenTimeConfig.cs b/Core/GameEngine/Model/Config/DungeonOpenTimeConfig.cs
index 1fd2303..b1eb34e 100644
--- a/Core/GameEngine/Model/Config/DungeonOpenTimeConfig.cs
+++ b/Core/GameEngine/Model/Config/DungeonOpenTimeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DungeonOpenTimeConfig
{
@@ -64,11 +64,11 @@
int.TryParse(tables[7],out FBType);
- string[] RewardRateStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- RewardRate = new int[RewardRateStringArray.Length];
- for (int i=0;i<RewardRateStringArray.Length;i++)
- {
- int.TryParse(RewardRateStringArray[i],out RewardRate[i]);
+ string[] RewardRateStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ RewardRate = new int[RewardRateStringArray.Length];
+ for (int i=0;i<RewardRateStringArray.Length;i++)
+ {
+ int.TryParse(RewardRateStringArray[i],out RewardRate[i]);
}
int.TryParse(tables[9],out BuyTimesID);
@@ -99,11 +99,11 @@
PanelImg = tables[22];
- string[] ElixirHintStringArray = tables[23].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- ElixirHint = new int[ElixirHintStringArray.Length];
- for (int i=0;i<ElixirHintStringArray.Length;i++)
- {
- int.TryParse(ElixirHintStringArray[i],out ElixirHint[i]);
+ string[] ElixirHintStringArray = tables[23].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ ElixirHint = new int[ElixirHintStringArray.Length];
+ for (int i=0;i<ElixirHintStringArray.Length;i++)
+ {
+ int.TryParse(ElixirHintStringArray[i],out ElixirHint[i]);
}
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/DungeonSpecialStateTimeConfig.cs b/Core/GameEngine/Model/Config/DungeonSpecialStateTimeConfig.cs
index d2331c6..525f187 100644
--- a/Core/GameEngine/Model/Config/DungeonSpecialStateTimeConfig.cs
+++ b/Core/GameEngine/Model/Config/DungeonSpecialStateTimeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DungeonSpecialStateTimeConfig
{
diff --git a/Core/GameEngine/Model/Config/DungeonStateTimeConfig.cs b/Core/GameEngine/Model/Config/DungeonStateTimeConfig.cs
index 798ae87..24c9f82 100644
--- a/Core/GameEngine/Model/Config/DungeonStateTimeConfig.cs
+++ b/Core/GameEngine/Model/Config/DungeonStateTimeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DungeonStateTimeConfig
{
diff --git a/Core/GameEngine/Model/Config/DungeonUseBuffConfig.cs b/Core/GameEngine/Model/Config/DungeonUseBuffConfig.cs
index cdc4ec0..fd2109e 100644
--- a/Core/GameEngine/Model/Config/DungeonUseBuffConfig.cs
+++ b/Core/GameEngine/Model/Config/DungeonUseBuffConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class DungeonUseBuffConfig
{
diff --git a/Core/GameEngine/Model/Config/EffectConfig.cs b/Core/GameEngine/Model/Config/EffectConfig.cs
index e83f9be..c445a5d 100644
--- a/Core/GameEngine/Model/Config/EffectConfig.cs
+++ b/Core/GameEngine/Model/Config/EffectConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EffectConfig
{
diff --git a/Core/GameEngine/Model/Config/ElderGodAreaConfig.cs b/Core/GameEngine/Model/Config/ElderGodAreaConfig.cs
index 9928f04..69821af 100644
--- a/Core/GameEngine/Model/Config/ElderGodAreaConfig.cs
+++ b/Core/GameEngine/Model/Config/ElderGodAreaConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ElderGodAreaConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipControlConfig.cs b/Core/GameEngine/Model/Config/EquipControlConfig.cs
index 8464ae5..b498497 100644
--- a/Core/GameEngine/Model/Config/EquipControlConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipControlConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipControlConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipDeComposeConfig.cs b/Core/GameEngine/Model/Config/EquipDeComposeConfig.cs
index 4c38ef3..1418c7b 100644
--- a/Core/GameEngine/Model/Config/EquipDeComposeConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipDeComposeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipDeComposeConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipGSParamConfig.cs b/Core/GameEngine/Model/Config/EquipGSParamConfig.cs
index 3b96c19..222432c 100644
--- a/Core/GameEngine/Model/Config/EquipGSParamConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipGSParamConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipGSParamConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipPlaceMapConfig.cs b/Core/GameEngine/Model/Config/EquipPlaceMapConfig.cs
index 824732e..2f790a3 100644
--- a/Core/GameEngine/Model/Config/EquipPlaceMapConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipPlaceMapConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipPlaceMapConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipPlusEvolveConfig.cs b/Core/GameEngine/Model/Config/EquipPlusEvolveConfig.cs
index d30afc0..a8156c0 100644
--- a/Core/GameEngine/Model/Config/EquipPlusEvolveConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipPlusEvolveConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipPlusEvolveConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipShenAttrConfig.cs b/Core/GameEngine/Model/Config/EquipShenAttrConfig.cs
index 0021edc..06b2d53 100644
--- a/Core/GameEngine/Model/Config/EquipShenAttrConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipShenAttrConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipShenAttrConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipShenEvolveConfig.cs b/Core/GameEngine/Model/Config/EquipShenEvolveConfig.cs
index 5b91e30..839211f 100644
--- a/Core/GameEngine/Model/Config/EquipShenEvolveConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipShenEvolveConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipShenEvolveConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipStarConfig.cs b/Core/GameEngine/Model/Config/EquipStarConfig.cs
index 104cafb..df1131c 100644
--- a/Core/GameEngine/Model/Config/EquipStarConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipStarConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipStarConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipSuitAttrConfig.cs b/Core/GameEngine/Model/Config/EquipSuitAttrConfig.cs
index ca48076..301de6b 100644
--- a/Core/GameEngine/Model/Config/EquipSuitAttrConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipSuitAttrConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipSuitAttrConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipSuitConfig.cs b/Core/GameEngine/Model/Config/EquipSuitConfig.cs
index d2a8a37..37f4321 100644
--- a/Core/GameEngine/Model/Config/EquipSuitConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipSuitConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipSuitConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipSuitNameConfig.cs b/Core/GameEngine/Model/Config/EquipSuitNameConfig.cs
index 7cc16e9..4582b6f 100644
--- a/Core/GameEngine/Model/Config/EquipSuitNameConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipSuitNameConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipSuitNameConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipWashConfig.cs b/Core/GameEngine/Model/Config/EquipWashConfig.cs
index dfd6456..42a445e 100644
--- a/Core/GameEngine/Model/Config/EquipWashConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipWashConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipWashConfig
{
diff --git a/Core/GameEngine/Model/Config/EquipWashSpecConfig.cs b/Core/GameEngine/Model/Config/EquipWashSpecConfig.cs
index d89d12b..0c82400 100644
--- a/Core/GameEngine/Model/Config/EquipWashSpecConfig.cs
+++ b/Core/GameEngine/Model/Config/EquipWashSpecConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class EquipWashSpecConfig
{
diff --git a/Core/GameEngine/Model/Config/FaceConfig.cs b/Core/GameEngine/Model/Config/FaceConfig.cs
index 4976351..265df4a 100644
--- a/Core/GameEngine/Model/Config/FaceConfig.cs
+++ b/Core/GameEngine/Model/Config/FaceConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FaceConfig
{
diff --git a/Core/GameEngine/Model/Config/FairyLeagueRankAwardConfig.cs b/Core/GameEngine/Model/Config/FairyLeagueRankAwardConfig.cs
index eba776a..a415e95 100644
--- a/Core/GameEngine/Model/Config/FairyLeagueRankAwardConfig.cs
+++ b/Core/GameEngine/Model/Config/FairyLeagueRankAwardConfig.cs
@@ -9,13 +9,13 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FairyLeagueRankAwardConfig
{
- public readonly int ID;
- public readonly int WorldLV;
- public readonly int Rank;
+ public readonly int ID;
+ public readonly int WorldLV;
+ public readonly int Rank;
public readonly string RankAuctionItem;
public FairyLeagueRankAwardConfig()
@@ -28,12 +28,12 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out ID);
-
- int.TryParse(tables[1],out WorldLV);
-
- int.TryParse(tables[2],out Rank);
-
+ int.TryParse(tables[0],out ID);
+
+ int.TryParse(tables[1],out WorldLV);
+
+ int.TryParse(tables[2],out Rank);
+
RankAuctionItem = tables[3];
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/FamilyConfig.cs b/Core/GameEngine/Model/Config/FamilyConfig.cs
index 3705cc9..80452a5 100644
--- a/Core/GameEngine/Model/Config/FamilyConfig.cs
+++ b/Core/GameEngine/Model/Config/FamilyConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FamilyConfig
{
diff --git a/Core/GameEngine/Model/Config/FamilyTechConfig.cs b/Core/GameEngine/Model/Config/FamilyTechConfig.cs
index 068b1df..887cd1f 100644
--- a/Core/GameEngine/Model/Config/FamilyTechConfig.cs
+++ b/Core/GameEngine/Model/Config/FamilyTechConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FamilyTechConfig
{
diff --git a/Core/GameEngine/Model/Config/FashionDressCabinetConfig.cs b/Core/GameEngine/Model/Config/FashionDressCabinetConfig.cs
index 964422f..6e11207 100644
--- a/Core/GameEngine/Model/Config/FashionDressCabinetConfig.cs
+++ b/Core/GameEngine/Model/Config/FashionDressCabinetConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FashionDressCabinetConfig
{
diff --git a/Core/GameEngine/Model/Config/FashionDressConfig.cs b/Core/GameEngine/Model/Config/FashionDressConfig.cs
index 41996ce..7b3261e 100644
--- a/Core/GameEngine/Model/Config/FashionDressConfig.cs
+++ b/Core/GameEngine/Model/Config/FashionDressConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FashionDressConfig
{
diff --git a/Core/GameEngine/Model/Config/FestivalRedpackTaskConfig.cs b/Core/GameEngine/Model/Config/FestivalRedpackTaskConfig.cs
index d3b25dd..260c66c 100644
--- a/Core/GameEngine/Model/Config/FestivalRedpackTaskConfig.cs
+++ b/Core/GameEngine/Model/Config/FestivalRedpackTaskConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FestivalRedpackTaskConfig
{
@@ -33,11 +33,11 @@
int.TryParse(tables[1],out FeastDay);
- string[] achievementsStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- achievements = new int[achievementsStringArray.Length];
- for (int i=0;i<achievementsStringArray.Length;i++)
- {
- int.TryParse(achievementsStringArray[i],out achievements[i]);
+ string[] achievementsStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ achievements = new int[achievementsStringArray.Length];
+ for (int i=0;i<achievementsStringArray.Length;i++)
+ {
+ int.TryParse(achievementsStringArray[i],out achievements[i]);
}
typeName = tables[3];
diff --git a/Core/GameEngine/Model/Config/FightPowerParamConfig.cs b/Core/GameEngine/Model/Config/FightPowerParamConfig.cs
index d8856ac..a137bf8 100644
--- a/Core/GameEngine/Model/Config/FightPowerParamConfig.cs
+++ b/Core/GameEngine/Model/Config/FightPowerParamConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FightPowerParamConfig
{
diff --git a/Core/GameEngine/Model/Config/FirstGoldConfig.cs b/Core/GameEngine/Model/Config/FirstGoldConfig.cs
index 4054499..56cbe3d 100644
--- a/Core/GameEngine/Model/Config/FirstGoldConfig.cs
+++ b/Core/GameEngine/Model/Config/FirstGoldConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FirstGoldConfig
{
diff --git a/Core/GameEngine/Model/Config/FreeGoodsConfig.cs b/Core/GameEngine/Model/Config/FreeGoodsConfig.cs
index 9c3b720..b7d2bb7 100644
--- a/Core/GameEngine/Model/Config/FreeGoodsConfig.cs
+++ b/Core/GameEngine/Model/Config/FreeGoodsConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FreeGoodsConfig
{
diff --git a/Core/GameEngine/Model/Config/FuncConfigConfig.cs b/Core/GameEngine/Model/Config/FuncConfigConfig.cs
index d5cf444..7bad81b 100644
--- a/Core/GameEngine/Model/Config/FuncConfigConfig.cs
+++ b/Core/GameEngine/Model/Config/FuncConfigConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FuncConfigConfig
{
diff --git a/Core/GameEngine/Model/Config/FuncOpenLVConfig.cs b/Core/GameEngine/Model/Config/FuncOpenLVConfig.cs
index 07fd9e2..729fee7 100644
--- a/Core/GameEngine/Model/Config/FuncOpenLVConfig.cs
+++ b/Core/GameEngine/Model/Config/FuncOpenLVConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FuncOpenLVConfig
{
diff --git a/Core/GameEngine/Model/Config/FuncSwitchConfig.cs b/Core/GameEngine/Model/Config/FuncSwitchConfig.cs
index 775acf8..3d5e2cd 100644
--- a/Core/GameEngine/Model/Config/FuncSwitchConfig.cs
+++ b/Core/GameEngine/Model/Config/FuncSwitchConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FuncSwitchConfig
{
diff --git a/Core/GameEngine/Model/Config/FunctionForecastConfig.cs b/Core/GameEngine/Model/Config/FunctionForecastConfig.cs
index bf90908..336dbf0 100644
--- a/Core/GameEngine/Model/Config/FunctionForecastConfig.cs
+++ b/Core/GameEngine/Model/Config/FunctionForecastConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class FunctionForecastConfig
{
diff --git a/Core/GameEngine/Model/Config/GatherSoulComposeConfig.cs b/Core/GameEngine/Model/Config/GatherSoulComposeConfig.cs
index 1716ea3..d681600 100644
--- a/Core/GameEngine/Model/Config/GatherSoulComposeConfig.cs
+++ b/Core/GameEngine/Model/Config/GatherSoulComposeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class GatherSoulComposeConfig
{
@@ -34,11 +34,11 @@
int.TryParse(tables[1],out NeedLV);
- string[] NeedItemStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- NeedItem = new int[NeedItemStringArray.Length];
- for (int i=0;i<NeedItemStringArray.Length;i++)
- {
- int.TryParse(NeedItemStringArray[i],out NeedItem[i]);
+ string[] NeedItemStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ NeedItem = new int[NeedItemStringArray.Length];
+ for (int i=0;i<NeedItemStringArray.Length;i++)
+ {
+ int.TryParse(NeedItemStringArray[i],out NeedItem[i]);
}
int.TryParse(tables[3],out NeedSoulSplinters);
diff --git a/Core/GameEngine/Model/Config/GatherSoulConfig.cs b/Core/GameEngine/Model/Config/GatherSoulConfig.cs
index 001628a..495b2fa 100644
--- a/Core/GameEngine/Model/Config/GatherSoulConfig.cs
+++ b/Core/GameEngine/Model/Config/GatherSoulConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class GatherSoulConfig
{
@@ -29,11 +29,11 @@
int.TryParse(tables[0],out ID);
- string[] AttrTypeStringArray = tables[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- AttrType = new int[AttrTypeStringArray.Length];
- for (int i=0;i<AttrTypeStringArray.Length;i++)
- {
- int.TryParse(AttrTypeStringArray[i],out AttrType[i]);
+ string[] AttrTypeStringArray = tables[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ AttrType = new int[AttrTypeStringArray.Length];
+ for (int i=0;i<AttrTypeStringArray.Length;i++)
+ {
+ int.TryParse(AttrTypeStringArray[i],out AttrType[i]);
}
int.TryParse(tables[2],out soulStage);
diff --git a/Core/GameEngine/Model/Config/GatherSoulPropertyConfig.cs b/Core/GameEngine/Model/Config/GatherSoulPropertyConfig.cs
index da7c358..3b8d558 100644
--- a/Core/GameEngine/Model/Config/GatherSoulPropertyConfig.cs
+++ b/Core/GameEngine/Model/Config/GatherSoulPropertyConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class GatherSoulPropertyConfig
{
diff --git a/Core/GameEngine/Model/Config/GemItemConfig.cs b/Core/GameEngine/Model/Config/GemItemConfig.cs
index 3c50f66..d302009 100644
--- a/Core/GameEngine/Model/Config/GemItemConfig.cs
+++ b/Core/GameEngine/Model/Config/GemItemConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class GemItemConfig
{
diff --git a/Core/GameEngine/Model/Config/GetItemWaysConfig.cs b/Core/GameEngine/Model/Config/GetItemWaysConfig.cs
index c160140..0f77faa 100644
--- a/Core/GameEngine/Model/Config/GetItemWaysConfig.cs
+++ b/Core/GameEngine/Model/Config/GetItemWaysConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class GetItemWaysConfig
{
diff --git a/Core/GameEngine/Model/Config/GmCmdConfig.cs b/Core/GameEngine/Model/Config/GmCmdConfig.cs
index c1fb4f4..27a6fa3 100644
--- a/Core/GameEngine/Model/Config/GmCmdConfig.cs
+++ b/Core/GameEngine/Model/Config/GmCmdConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class GmCmdConfig
{
diff --git a/Core/GameEngine/Model/Config/GodWeaponConfig.cs b/Core/GameEngine/Model/Config/GodWeaponConfig.cs
index 5138053..dec4bee 100644
--- a/Core/GameEngine/Model/Config/GodWeaponConfig.cs
+++ b/Core/GameEngine/Model/Config/GodWeaponConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class GodWeaponConfig
{
diff --git a/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs b/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
index cf4f781..b3e04c9 100644
--- a/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
+++ b/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class GodWeaponEffectConfig
{
@@ -51,25 +51,25 @@
skillName = tables[7];
- string[] effectPositionStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- effectPosition = new Vector3[effectPositionStringArray.Length];
- for (int i=0;i<effectPositionStringArray.Length;i++)
- {
- effectPosition[i]=effectPositionStringArray[i].Vector3Parse();
+ string[] effectPositionStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ effectPosition = new Vector3[effectPositionStringArray.Length];
+ for (int i=0;i<effectPositionStringArray.Length;i++)
+ {
+ effectPosition[i]=effectPositionStringArray[i].Vector3Parse();
}
- string[] effectAnglesStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- effectAngles = new Vector3[effectAnglesStringArray.Length];
- for (int i=0;i<effectAnglesStringArray.Length;i++)
- {
- effectAngles[i]=effectAnglesStringArray[i].Vector3Parse();
+ string[] effectAnglesStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ effectAngles = new Vector3[effectAnglesStringArray.Length];
+ for (int i=0;i<effectAnglesStringArray.Length;i++)
+ {
+ effectAngles[i]=effectAnglesStringArray[i].Vector3Parse();
}
- string[] effectScaleStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- effectScale = new Vector3[effectScaleStringArray.Length];
- for (int i=0;i<effectScaleStringArray.Length;i++)
- {
- effectScale[i]=effectScaleStringArray[i].Vector3Parse();
+ string[] effectScaleStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ effectScale = new Vector3[effectScaleStringArray.Length];
+ for (int i=0;i<effectScaleStringArray.Length;i++)
+ {
+ effectScale[i]=effectScaleStringArray[i].Vector3Parse();
}
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/GuardConfig.cs b/Core/GameEngine/Model/Config/GuardConfig.cs
index 35bd8bd..33ad3a1 100644
--- a/Core/GameEngine/Model/Config/GuardConfig.cs
+++ b/Core/GameEngine/Model/Config/GuardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class GuardConfig
{
@@ -35,11 +35,11 @@
int.TryParse(tables[2],out npcId);
- string[] effectIdsStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- effectIds = new int[effectIdsStringArray.Length];
- for (int i=0;i<effectIdsStringArray.Length;i++)
- {
- int.TryParse(effectIdsStringArray[i],out effectIds[i]);
+ string[] effectIdsStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ effectIds = new int[effectIdsStringArray.Length];
+ for (int i=0;i<effectIdsStringArray.Length;i++)
+ {
+ int.TryParse(effectIdsStringArray[i],out effectIds[i]);
}
int.TryParse(tables[4],out autoPick);
diff --git a/Core/GameEngine/Model/Config/GuideConfig.cs b/Core/GameEngine/Model/Config/GuideConfig.cs
index c7d08dc..a81ab48 100644
--- a/Core/GameEngine/Model/Config/GuideConfig.cs
+++ b/Core/GameEngine/Model/Config/GuideConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class GuideConfig
{
@@ -48,11 +48,11 @@
int.TryParse(tables[5],out PreGuideId);
- string[] StepsStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- Steps = new int[StepsStringArray.Length];
- for (int i=0;i<StepsStringArray.Length;i++)
- {
- int.TryParse(StepsStringArray[i],out Steps[i]);
+ string[] StepsStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ Steps = new int[StepsStringArray.Length];
+ for (int i=0;i<StepsStringArray.Length;i++)
+ {
+ int.TryParse(StepsStringArray[i],out Steps[i]);
}
int.TryParse(tables[7],out CanSkip);
@@ -61,11 +61,11 @@
int.TryParse(tables[9],out CannotCompleteByClick);
- string[] UnfoldAreasStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- UnfoldAreas = new int[UnfoldAreasStringArray.Length];
- for (int i=0;i<UnfoldAreasStringArray.Length;i++)
- {
- int.TryParse(UnfoldAreasStringArray[i],out UnfoldAreas[i]);
+ string[] UnfoldAreasStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ UnfoldAreas = new int[UnfoldAreasStringArray.Length];
+ for (int i=0;i<UnfoldAreasStringArray.Length;i++)
+ {
+ int.TryParse(UnfoldAreasStringArray[i],out UnfoldAreas[i]);
}
int.TryParse(tables[11],out AutoCompleteTime);
diff --git a/Core/GameEngine/Model/Config/HazyRegionConfig.cs b/Core/GameEngine/Model/Config/HazyRegionConfig.cs
index 072726c..7903699 100644
--- a/Core/GameEngine/Model/Config/HazyRegionConfig.cs
+++ b/Core/GameEngine/Model/Config/HazyRegionConfig.cs
@@ -9,22 +9,22 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class HazyRegionConfig
{
- public readonly int id;
- public readonly int incidentType;
- public readonly string name;
- public readonly int dungeonId;
- public readonly int lineId;
- public readonly int npcId;
- public readonly int dungeonType;
- public readonly int point;
- public readonly int alchemyLevel;
- public readonly int[] reward;
- public readonly int[] rewardState;
- public readonly string PortraitID;
+ public readonly int id;
+ public readonly int incidentType;
+ public readonly string name;
+ public readonly int dungeonId;
+ public readonly int lineId;
+ public readonly int npcId;
+ public readonly int dungeonType;
+ public readonly int point;
+ public readonly int alchemyLevel;
+ public readonly int[] reward;
+ public readonly int[] rewardState;
+ public readonly string PortraitID;
public readonly int star;
public HazyRegionConfig()
@@ -37,40 +37,40 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out id);
-
- int.TryParse(tables[1],out incidentType);
-
- name = tables[2];
-
- int.TryParse(tables[3],out dungeonId);
-
- int.TryParse(tables[4],out lineId);
-
- int.TryParse(tables[5],out npcId);
-
- int.TryParse(tables[6],out dungeonType);
-
- int.TryParse(tables[7],out point);
-
- int.TryParse(tables[8],out alchemyLevel);
-
+ int.TryParse(tables[0],out id);
+
+ int.TryParse(tables[1],out incidentType);
+
+ name = tables[2];
+
+ int.TryParse(tables[3],out dungeonId);
+
+ int.TryParse(tables[4],out lineId);
+
+ int.TryParse(tables[5],out npcId);
+
+ int.TryParse(tables[6],out dungeonType);
+
+ int.TryParse(tables[7],out point);
+
+ int.TryParse(tables[8],out alchemyLevel);
+
string[] rewardStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
reward = new int[rewardStringArray.Length];
for (int i=0;i<rewardStringArray.Length;i++)
{
int.TryParse(rewardStringArray[i],out reward[i]);
- }
-
+ }
+
string[] rewardStateStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
rewardState = new int[rewardStateStringArray.Length];
for (int i=0;i<rewardStateStringArray.Length;i++)
{
int.TryParse(rewardStateStringArray[i],out rewardState[i]);
- }
-
- PortraitID = tables[11];
-
+ }
+
+ PortraitID = tables[11];
+
int.TryParse(tables[12],out star);
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/HelpInfoConfig.cs b/Core/GameEngine/Model/Config/HelpInfoConfig.cs
index 3593f6c..107fb4c 100644
--- a/Core/GameEngine/Model/Config/HelpInfoConfig.cs
+++ b/Core/GameEngine/Model/Config/HelpInfoConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class HelpInfoConfig
{
diff --git a/Core/GameEngine/Model/Config/HolidayHomingConfig.cs b/Core/GameEngine/Model/Config/HolidayHomingConfig.cs
index d3ba81e..dcf6ed1 100644
--- a/Core/GameEngine/Model/Config/HolidayHomingConfig.cs
+++ b/Core/GameEngine/Model/Config/HolidayHomingConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class HolidayHomingConfig
{
diff --git a/Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs b/Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs
index e53c091..73f0d58 100644
--- a/Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs
+++ b/Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class HolidayHomingPointConfig
{
diff --git a/Core/GameEngine/Model/Config/HorseConfig.cs b/Core/GameEngine/Model/Config/HorseConfig.cs
index 1748da4..31d546f 100644
--- a/Core/GameEngine/Model/Config/HorseConfig.cs
+++ b/Core/GameEngine/Model/Config/HorseConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class HorseConfig
{
@@ -71,11 +71,11 @@
int.TryParse(tables[14],out Sort);
- string[] RideAudiosStringArray = tables[15].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- RideAudios = new int[RideAudiosStringArray.Length];
- for (int i=0;i<RideAudiosStringArray.Length;i++)
- {
- int.TryParse(RideAudiosStringArray[i],out RideAudios[i]);
+ string[] RideAudiosStringArray = tables[15].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ RideAudios = new int[RideAudiosStringArray.Length];
+ for (int i=0;i<RideAudiosStringArray.Length;i++)
+ {
+ int.TryParse(RideAudiosStringArray[i],out RideAudios[i]);
}
DescribeIconKey = tables[16];
diff --git a/Core/GameEngine/Model/Config/HorseLVUpConfig.cs b/Core/GameEngine/Model/Config/HorseLVUpConfig.cs
index 508b349..cc86e97 100644
--- a/Core/GameEngine/Model/Config/HorseLVUpConfig.cs
+++ b/Core/GameEngine/Model/Config/HorseLVUpConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class HorseLVUpConfig
{
diff --git a/Core/GameEngine/Model/Config/HorseSkinPlusConfig.cs b/Core/GameEngine/Model/Config/HorseSkinPlusConfig.cs
index 026d280..c7ecb9c 100644
--- a/Core/GameEngine/Model/Config/HorseSkinPlusConfig.cs
+++ b/Core/GameEngine/Model/Config/HorseSkinPlusConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class HorseSkinPlusConfig
{
diff --git a/Core/GameEngine/Model/Config/HorseUpConfig.cs b/Core/GameEngine/Model/Config/HorseUpConfig.cs
index 620e1bf..f502a57 100644
--- a/Core/GameEngine/Model/Config/HorseUpConfig.cs
+++ b/Core/GameEngine/Model/Config/HorseUpConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class HorseUpConfig
{
@@ -40,25 +40,25 @@
int.TryParse(tables[3],out NeedExp);
- string[] AttrTypeStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- AttrType = new int[AttrTypeStringArray.Length];
- for (int i=0;i<AttrTypeStringArray.Length;i++)
- {
- int.TryParse(AttrTypeStringArray[i],out AttrType[i]);
+ string[] AttrTypeStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ AttrType = new int[AttrTypeStringArray.Length];
+ for (int i=0;i<AttrTypeStringArray.Length;i++)
+ {
+ int.TryParse(AttrTypeStringArray[i],out AttrType[i]);
}
- string[] AttrValueStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- AttrValue = new int[AttrValueStringArray.Length];
- for (int i=0;i<AttrValueStringArray.Length;i++)
- {
- int.TryParse(AttrValueStringArray[i],out AttrValue[i]);
+ string[] AttrValueStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ AttrValue = new int[AttrValueStringArray.Length];
+ for (int i=0;i<AttrValueStringArray.Length;i++)
+ {
+ int.TryParse(AttrValueStringArray[i],out AttrValue[i]);
}
- string[] SkillIDStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- SkillID = new int[SkillIDStringArray.Length];
- for (int i=0;i<SkillIDStringArray.Length;i++)
- {
- int.TryParse(SkillIDStringArray[i],out SkillID[i]);
+ string[] SkillIDStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ SkillID = new int[SkillIDStringArray.Length];
+ for (int i=0;i<SkillIDStringArray.Length;i++)
+ {
+ int.TryParse(SkillIDStringArray[i],out SkillID[i]);
}
int.TryParse(tables[7],out NeedExpTotal);
diff --git a/Core/GameEngine/Model/Config/IceLodeStarAwardConfig.cs b/Core/GameEngine/Model/Config/IceLodeStarAwardConfig.cs
index c90b80f..c5224f6 100644
--- a/Core/GameEngine/Model/Config/IceLodeStarAwardConfig.cs
+++ b/Core/GameEngine/Model/Config/IceLodeStarAwardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class IceLodeStarAwardConfig
{
diff --git a/Core/GameEngine/Model/Config/IconConfig.cs b/Core/GameEngine/Model/Config/IconConfig.cs
index 1e600d9..49a3023 100644
--- a/Core/GameEngine/Model/Config/IconConfig.cs
+++ b/Core/GameEngine/Model/Config/IconConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class IconConfig
{
diff --git a/Core/GameEngine/Model/Config/InSevenDaysConfig.cs b/Core/GameEngine/Model/Config/InSevenDaysConfig.cs
index 33d5545..8214c2a 100644
--- a/Core/GameEngine/Model/Config/InSevenDaysConfig.cs
+++ b/Core/GameEngine/Model/Config/InSevenDaysConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class InSevenDaysConfig
{
diff --git a/Core/GameEngine/Model/Config/InitialFunctionConfig.cs b/Core/GameEngine/Model/Config/InitialFunctionConfig.cs
index 27b809c..a76f1ad 100644
--- a/Core/GameEngine/Model/Config/InitialFunctionConfig.cs
+++ b/Core/GameEngine/Model/Config/InitialFunctionConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class InitialFunctionConfig
{
diff --git a/Core/GameEngine/Model/Config/InvestConfig.cs b/Core/GameEngine/Model/Config/InvestConfig.cs
index cc4d414..1aa47de 100644
--- a/Core/GameEngine/Model/Config/InvestConfig.cs
+++ b/Core/GameEngine/Model/Config/InvestConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class InvestConfig
{
diff --git a/Core/GameEngine/Model/Config/ItemCompoundConfig.cs b/Core/GameEngine/Model/Config/ItemCompoundConfig.cs
index 5ec56ac..b5fca39 100644
--- a/Core/GameEngine/Model/Config/ItemCompoundConfig.cs
+++ b/Core/GameEngine/Model/Config/ItemCompoundConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ItemCompoundConfig
{
@@ -61,48 +61,48 @@
thirdTypeName = tables[7];
- string[] makeIDStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- makeID = new int[makeIDStringArray.Length];
- for (int i=0;i<makeIDStringArray.Length;i++)
- {
- int.TryParse(makeIDStringArray[i],out makeID[i]);
+ string[] makeIDStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ makeID = new int[makeIDStringArray.Length];
+ for (int i=0;i<makeIDStringArray.Length;i++)
+ {
+ int.TryParse(makeIDStringArray[i],out makeID[i]);
}
- string[] unfixedItemIDStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- unfixedItemID = new int[unfixedItemIDStringArray.Length];
- for (int i=0;i<unfixedItemIDStringArray.Length;i++)
- {
- int.TryParse(unfixedItemIDStringArray[i],out unfixedItemID[i]);
+ string[] unfixedItemIDStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ unfixedItemID = new int[unfixedItemIDStringArray.Length];
+ for (int i=0;i<unfixedItemIDStringArray.Length;i++)
+ {
+ int.TryParse(unfixedItemIDStringArray[i],out unfixedItemID[i]);
}
int.TryParse(tables[10],out unfixedItemCount);
- string[] unfixedItemDisplayStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- unfixedItemDisplay = new int[unfixedItemDisplayStringArray.Length];
- for (int i=0;i<unfixedItemDisplayStringArray.Length;i++)
- {
- int.TryParse(unfixedItemDisplayStringArray[i],out unfixedItemDisplay[i]);
+ string[] unfixedItemDisplayStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ unfixedItemDisplay = new int[unfixedItemDisplayStringArray.Length];
+ for (int i=0;i<unfixedItemDisplayStringArray.Length;i++)
+ {
+ int.TryParse(unfixedItemDisplayStringArray[i],out unfixedItemDisplay[i]);
}
- string[] itemIDStringArray = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- itemID = new int[itemIDStringArray.Length];
- for (int i=0;i<itemIDStringArray.Length;i++)
- {
- int.TryParse(itemIDStringArray[i],out itemID[i]);
+ string[] itemIDStringArray = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ itemID = new int[itemIDStringArray.Length];
+ for (int i=0;i<itemIDStringArray.Length;i++)
+ {
+ int.TryParse(itemIDStringArray[i],out itemID[i]);
}
- string[] itemCountStringArray = tables[13].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- itemCount = new int[itemCountStringArray.Length];
- for (int i=0;i<itemCountStringArray.Length;i++)
- {
- int.TryParse(itemCountStringArray[i],out itemCount[i]);
+ string[] itemCountStringArray = tables[13].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ itemCount = new int[itemCountStringArray.Length];
+ for (int i=0;i<itemCountStringArray.Length;i++)
+ {
+ int.TryParse(itemCountStringArray[i],out itemCount[i]);
}
- string[] itemDisplayStringArray = tables[14].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- itemDisplay = new int[itemDisplayStringArray.Length];
- for (int i=0;i<itemDisplayStringArray.Length;i++)
- {
- int.TryParse(itemDisplayStringArray[i],out itemDisplay[i]);
+ string[] itemDisplayStringArray = tables[14].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ itemDisplay = new int[itemDisplayStringArray.Length];
+ for (int i=0;i<itemDisplayStringArray.Length;i++)
+ {
+ int.TryParse(itemDisplayStringArray[i],out itemDisplay[i]);
}
int.TryParse(tables[15],out money);
@@ -111,11 +111,11 @@
int.TryParse(tables[17],out successUpper);
- string[] successRateIncreaseStringArray = tables[18].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- successRateIncrease = new int[successRateIncreaseStringArray.Length];
- for (int i=0;i<successRateIncreaseStringArray.Length;i++)
- {
- int.TryParse(successRateIncreaseStringArray[i],out successRateIncrease[i]);
+ string[] successRateIncreaseStringArray = tables[18].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ successRateIncrease = new int[successRateIncreaseStringArray.Length];
+ for (int i=0;i<successRateIncreaseStringArray.Length;i++)
+ {
+ int.TryParse(successRateIncreaseStringArray[i],out successRateIncrease[i]);
}
int.TryParse(tables[19],out addonsCountMax);
diff --git a/Core/GameEngine/Model/Config/ItemConfig.cs b/Core/GameEngine/Model/Config/ItemConfig.cs
index 360b2fc..d31872b 100644
--- a/Core/GameEngine/Model/Config/ItemConfig.cs
+++ b/Core/GameEngine/Model/Config/ItemConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ItemConfig
{
diff --git a/Core/GameEngine/Model/Config/ItemExchangeConfig.cs b/Core/GameEngine/Model/Config/ItemExchangeConfig.cs
index 8196829..bce7285 100644
--- a/Core/GameEngine/Model/Config/ItemExchangeConfig.cs
+++ b/Core/GameEngine/Model/Config/ItemExchangeConfig.cs
@@ -9,13 +9,13 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ItemExchangeConfig
{
- public readonly int itemId;
- public readonly string title;
- public readonly int[] items;
+ public readonly int itemId;
+ public readonly string title;
+ public readonly int[] items;
public readonly int jump;
public ItemExchangeConfig()
@@ -28,17 +28,17 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out itemId);
-
- title = tables[1];
-
+ int.TryParse(tables[0],out itemId);
+
+ title = tables[1];
+
string[] itemsStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
items = new int[itemsStringArray.Length];
for (int i=0;i<itemsStringArray.Length;i++)
{
int.TryParse(itemsStringArray[i],out items[i]);
- }
-
+ }
+
int.TryParse(tables[3],out jump);
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/ItemPlusConfig.cs b/Core/GameEngine/Model/Config/ItemPlusConfig.cs
index caad0b3..5a7f1ba 100644
--- a/Core/GameEngine/Model/Config/ItemPlusConfig.cs
+++ b/Core/GameEngine/Model/Config/ItemPlusConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ItemPlusConfig
{
@@ -40,27 +40,27 @@
int.TryParse(tables[2],out level);
- string[] attTypeStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- attType = new int[attTypeStringArray.Length];
- for (int i=0;i<attTypeStringArray.Length;i++)
- {
- int.TryParse(attTypeStringArray[i],out attType[i]);
+ string[] attTypeStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ attType = new int[attTypeStringArray.Length];
+ for (int i=0;i<attTypeStringArray.Length;i++)
+ {
+ int.TryParse(attTypeStringArray[i],out attType[i]);
}
- string[] attValueStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- attValue = new int[attValueStringArray.Length];
- for (int i=0;i<attValueStringArray.Length;i++)
- {
- int.TryParse(attValueStringArray[i],out attValue[i]);
+ string[] attValueStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ attValue = new int[attValueStringArray.Length];
+ for (int i=0;i<attValueStringArray.Length;i++)
+ {
+ int.TryParse(attValueStringArray[i],out attValue[i]);
}
int.TryParse(tables[5],out costCount);
- string[] costItemInfoStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- costItemInfo = new int[costItemInfoStringArray.Length];
- for (int i=0;i<costItemInfoStringArray.Length;i++)
- {
- int.TryParse(costItemInfoStringArray[i],out costItemInfo[i]);
+ string[] costItemInfoStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ costItemInfo = new int[costItemInfoStringArray.Length];
+ for (int i=0;i<costItemInfoStringArray.Length;i++)
+ {
+ int.TryParse(costItemInfoStringArray[i],out costItemInfo[i]);
}
int.TryParse(tables[7],out getExp);
diff --git a/Core/GameEngine/Model/Config/ItemPlusMasterConfig.cs b/Core/GameEngine/Model/Config/ItemPlusMasterConfig.cs
index 288d667..d281981 100644
--- a/Core/GameEngine/Model/Config/ItemPlusMasterConfig.cs
+++ b/Core/GameEngine/Model/Config/ItemPlusMasterConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ItemPlusMasterConfig
{
diff --git a/Core/GameEngine/Model/Config/ItemPlusMaxConfig.cs b/Core/GameEngine/Model/Config/ItemPlusMaxConfig.cs
index e705e06..b98f1e3 100644
--- a/Core/GameEngine/Model/Config/ItemPlusMaxConfig.cs
+++ b/Core/GameEngine/Model/Config/ItemPlusMaxConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ItemPlusMaxConfig
{
diff --git a/Core/GameEngine/Model/Config/ItemPlusSumAttrConfig.cs b/Core/GameEngine/Model/Config/ItemPlusSumAttrConfig.cs
index 6c02ddb..573ee91 100644
--- a/Core/GameEngine/Model/Config/ItemPlusSumAttrConfig.cs
+++ b/Core/GameEngine/Model/Config/ItemPlusSumAttrConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ItemPlusSumAttrConfig
{
@@ -29,18 +29,18 @@
int.TryParse(tables[0],out countNeed);
- string[] attTypeStringArray = tables[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- attType = new int[attTypeStringArray.Length];
- for (int i=0;i<attTypeStringArray.Length;i++)
- {
- int.TryParse(attTypeStringArray[i],out attType[i]);
+ string[] attTypeStringArray = tables[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ attType = new int[attTypeStringArray.Length];
+ for (int i=0;i<attTypeStringArray.Length;i++)
+ {
+ int.TryParse(attTypeStringArray[i],out attType[i]);
}
- string[] attValueStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- attValue = new int[attValueStringArray.Length];
- for (int i=0;i<attValueStringArray.Length;i++)
- {
- int.TryParse(attValueStringArray[i],out attValue[i]);
+ string[] attValueStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ attValue = new int[attValueStringArray.Length];
+ for (int i=0;i<attValueStringArray.Length;i++)
+ {
+ int.TryParse(attValueStringArray[i],out attValue[i]);
}
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs b/Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs
index 9ee7b25..022bb31 100644
--- a/Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs
+++ b/Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs
@@ -9,19 +9,19 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class JadeDynastyBossConfig
{
- public readonly int NPCID;
- public readonly int LineID;
- public readonly int Time;
- public readonly int RealmLV;
- public readonly int ZhuXianScore;
- public readonly string dropItems;
- public readonly int newDropId;
- public readonly string PortraitID;
- public readonly int[] conditionSorts;
+ public readonly int NPCID;
+ public readonly int LineID;
+ public readonly int Time;
+ public readonly int RealmLV;
+ public readonly int ZhuXianScore;
+ public readonly string dropItems;
+ public readonly int newDropId;
+ public readonly string PortraitID;
+ public readonly int[] conditionSorts;
public readonly int AutoAttention;
public JadeDynastyBossConfig()
@@ -34,29 +34,29 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out NPCID);
-
- int.TryParse(tables[1],out LineID);
-
- int.TryParse(tables[2],out Time);
-
- int.TryParse(tables[3],out RealmLV);
-
- int.TryParse(tables[4],out ZhuXianScore);
-
- dropItems = tables[5];
-
- int.TryParse(tables[6],out newDropId);
-
- PortraitID = tables[7];
-
+ int.TryParse(tables[0],out NPCID);
+
+ int.TryParse(tables[1],out LineID);
+
+ int.TryParse(tables[2],out Time);
+
+ int.TryParse(tables[3],out RealmLV);
+
+ int.TryParse(tables[4],out ZhuXianScore);
+
+ dropItems = tables[5];
+
+ int.TryParse(tables[6],out newDropId);
+
+ PortraitID = tables[7];
+
string[] conditionSortsStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
conditionSorts = new int[conditionSortsStringArray.Length];
for (int i=0;i<conditionSortsStringArray.Length;i++)
{
int.TryParse(conditionSortsStringArray[i],out conditionSorts[i]);
- }
-
+ }
+
int.TryParse(tables[9],out AutoAttention);
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/JadeDynastyStoneAttrConfig.cs b/Core/GameEngine/Model/Config/JadeDynastyStoneAttrConfig.cs
index c2ed559..ce57c7d 100644
--- a/Core/GameEngine/Model/Config/JadeDynastyStoneAttrConfig.cs
+++ b/Core/GameEngine/Model/Config/JadeDynastyStoneAttrConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class JadeDynastyStoneAttrConfig
{
@@ -35,18 +35,18 @@
int.TryParse(tables[2],out suiteLV);
- string[] attrIDListStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- attrIDList = new int[attrIDListStringArray.Length];
- for (int i=0;i<attrIDListStringArray.Length;i++)
- {
- int.TryParse(attrIDListStringArray[i],out attrIDList[i]);
+ string[] attrIDListStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ attrIDList = new int[attrIDListStringArray.Length];
+ for (int i=0;i<attrIDListStringArray.Length;i++)
+ {
+ int.TryParse(attrIDListStringArray[i],out attrIDList[i]);
}
- string[] attrValueListStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- attrValueList = new int[attrValueListStringArray.Length];
- for (int i=0;i<attrValueListStringArray.Length;i++)
- {
- int.TryParse(attrValueListStringArray[i],out attrValueList[i]);
+ string[] attrValueListStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ attrValueList = new int[attrValueListStringArray.Length];
+ for (int i=0;i<attrValueListStringArray.Length;i++)
+ {
+ int.TryParse(attrValueListStringArray[i],out attrValueList[i]);
}
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/JobNameConfig.cs b/Core/GameEngine/Model/Config/JobNameConfig.cs
index 301aea6..7c7046f 100644
--- a/Core/GameEngine/Model/Config/JobNameConfig.cs
+++ b/Core/GameEngine/Model/Config/JobNameConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class JobNameConfig
{
diff --git a/Core/GameEngine/Model/Config/JobSetupConfig.cs b/Core/GameEngine/Model/Config/JobSetupConfig.cs
index 3c3401c..f2775a0 100644
--- a/Core/GameEngine/Model/Config/JobSetupConfig.cs
+++ b/Core/GameEngine/Model/Config/JobSetupConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class JobSetupConfig
{
@@ -51,32 +51,32 @@
int.TryParse(tables[0],out Job);
- string[] BaseEquipStringArray = tables[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- BaseEquip = new int[BaseEquipStringArray.Length];
- for (int i=0;i<BaseEquipStringArray.Length;i++)
- {
- int.TryParse(BaseEquipStringArray[i],out BaseEquip[i]);
+ string[] BaseEquipStringArray = tables[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ BaseEquip = new int[BaseEquipStringArray.Length];
+ for (int i=0;i<BaseEquipStringArray.Length;i++)
+ {
+ int.TryParse(BaseEquipStringArray[i],out BaseEquip[i]);
}
- string[] ComAtkIdListStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- ComAtkIdList = new int[ComAtkIdListStringArray.Length];
- for (int i=0;i<ComAtkIdListStringArray.Length;i++)
- {
- int.TryParse(ComAtkIdListStringArray[i],out ComAtkIdList[i]);
+ string[] ComAtkIdListStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ ComAtkIdList = new int[ComAtkIdListStringArray.Length];
+ for (int i=0;i<ComAtkIdListStringArray.Length;i++)
+ {
+ int.TryParse(ComAtkIdListStringArray[i],out ComAtkIdList[i]);
}
- string[] StopActionStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- StopAction = new int[StopActionStringArray.Length];
- for (int i=0;i<StopActionStringArray.Length;i++)
- {
- int.TryParse(StopActionStringArray[i],out StopAction[i]);
+ string[] StopActionStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ StopAction = new int[StopActionStringArray.Length];
+ for (int i=0;i<StopActionStringArray.Length;i++)
+ {
+ int.TryParse(StopActionStringArray[i],out StopAction[i]);
}
- string[] CanStopSkillListStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- CanStopSkillList = new int[CanStopSkillListStringArray.Length];
- for (int i=0;i<CanStopSkillListStringArray.Length;i++)
- {
- int.TryParse(CanStopSkillListStringArray[i],out CanStopSkillList[i]);
+ string[] CanStopSkillListStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ CanStopSkillList = new int[CanStopSkillListStringArray.Length];
+ for (int i=0;i<CanStopSkillListStringArray.Length;i++)
+ {
+ int.TryParse(CanStopSkillListStringArray[i],out CanStopSkillList[i]);
}
CanBeStopSkillList = tables[5];
@@ -101,11 +101,11 @@
int.TryParse(tables[15],out MaxSwitchTargetDist);
- string[] HangupSkillListStringArray = tables[16].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- HangupSkillList = new int[HangupSkillListStringArray.Length];
- for (int i=0;i<HangupSkillListStringArray.Length;i++)
- {
- int.TryParse(HangupSkillListStringArray[i],out HangupSkillList[i]);
+ string[] HangupSkillListStringArray = tables[16].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ HangupSkillList = new int[HangupSkillListStringArray.Length];
+ for (int i=0;i<HangupSkillListStringArray.Length;i++)
+ {
+ int.TryParse(HangupSkillListStringArray[i],out HangupSkillList[i]);
}
DungeonSkillList = tables[17];
@@ -114,27 +114,27 @@
int.TryParse(tables[19],out HpPerUseSkill);
- string[] HpSkillListStringArray = tables[20].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- HpSkillList = new int[HpSkillListStringArray.Length];
- for (int i=0;i<HpSkillListStringArray.Length;i++)
- {
- int.TryParse(HpSkillListStringArray[i],out HpSkillList[i]);
+ string[] HpSkillListStringArray = tables[20].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ HpSkillList = new int[HpSkillListStringArray.Length];
+ for (int i=0;i<HpSkillListStringArray.Length;i++)
+ {
+ int.TryParse(HpSkillListStringArray[i],out HpSkillList[i]);
}
- string[] GainSkillListStringArray = tables[21].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- GainSkillList = new int[GainSkillListStringArray.Length];
- for (int i=0;i<GainSkillListStringArray.Length;i++)
- {
- int.TryParse(GainSkillListStringArray[i],out GainSkillList[i]);
+ string[] GainSkillListStringArray = tables[21].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ GainSkillList = new int[GainSkillListStringArray.Length];
+ for (int i=0;i<GainSkillListStringArray.Length;i++)
+ {
+ int.TryParse(GainSkillListStringArray[i],out GainSkillList[i]);
}
int.TryParse(tables[22],out MoveLimitDist);
- string[] RollBreakSkillListStringArray = tables[23].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- RollBreakSkillList = new int[RollBreakSkillListStringArray.Length];
- for (int i=0;i<RollBreakSkillListStringArray.Length;i++)
- {
- int.TryParse(RollBreakSkillListStringArray[i],out RollBreakSkillList[i]);
+ string[] RollBreakSkillListStringArray = tables[23].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ RollBreakSkillList = new int[RollBreakSkillListStringArray.Length];
+ for (int i=0;i<RollBreakSkillListStringArray.Length;i++)
+ {
+ int.TryParse(RollBreakSkillListStringArray[i],out RollBreakSkillList[i]);
}
ExpertSkillEffect = tables[24];
diff --git a/Core/GameEngine/Model/Config/KickOutReasonConfig.cs b/Core/GameEngine/Model/Config/KickOutReasonConfig.cs
index 43fb666..5d2d8b7 100644
--- a/Core/GameEngine/Model/Config/KickOutReasonConfig.cs
+++ b/Core/GameEngine/Model/Config/KickOutReasonConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class KickOutReasonConfig
{
diff --git a/Core/GameEngine/Model/Config/KingTreasureConfig.cs b/Core/GameEngine/Model/Config/KingTreasureConfig.cs
index 067fc11..9ff83fe 100644
--- a/Core/GameEngine/Model/Config/KingTreasureConfig.cs
+++ b/Core/GameEngine/Model/Config/KingTreasureConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class KingTreasureConfig
{
diff --git a/Core/GameEngine/Model/Config/KingTreasureItemConfig.cs b/Core/GameEngine/Model/Config/KingTreasureItemConfig.cs
index 7db1628..3e4896f 100644
--- a/Core/GameEngine/Model/Config/KingTreasureItemConfig.cs
+++ b/Core/GameEngine/Model/Config/KingTreasureItemConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class KingTreasureItemConfig
{
diff --git a/Core/GameEngine/Model/Config/LVAawrdConfig.cs b/Core/GameEngine/Model/Config/LVAawrdConfig.cs
index 9421e52..1db7fcb 100644
--- a/Core/GameEngine/Model/Config/LVAawrdConfig.cs
+++ b/Core/GameEngine/Model/Config/LVAawrdConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class LVAawrdConfig
{
diff --git a/Core/GameEngine/Model/Config/LanguageConfig.cs b/Core/GameEngine/Model/Config/LanguageConfig.cs
index edcaa06..bc302c6 100644
--- a/Core/GameEngine/Model/Config/LanguageConfig.cs
+++ b/Core/GameEngine/Model/Config/LanguageConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class LanguageConfig
{
diff --git a/Core/GameEngine/Model/Config/LegendPropertyConfig.cs b/Core/GameEngine/Model/Config/LegendPropertyConfig.cs
index 7a2df00..9dedd7c 100644
--- a/Core/GameEngine/Model/Config/LegendPropertyConfig.cs
+++ b/Core/GameEngine/Model/Config/LegendPropertyConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class LegendPropertyConfig
{
diff --git a/Core/GameEngine/Model/Config/LegendPropertyValueConfig.cs b/Core/GameEngine/Model/Config/LegendPropertyValueConfig.cs
index 0bb4472..6b2266b 100644
--- a/Core/GameEngine/Model/Config/LegendPropertyValueConfig.cs
+++ b/Core/GameEngine/Model/Config/LegendPropertyValueConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class LegendPropertyValueConfig
{
diff --git a/Core/GameEngine/Model/Config/LoadingBackGroundConfig.cs b/Core/GameEngine/Model/Config/LoadingBackGroundConfig.cs
index f7c6f32..2f3d35e 100644
--- a/Core/GameEngine/Model/Config/LoadingBackGroundConfig.cs
+++ b/Core/GameEngine/Model/Config/LoadingBackGroundConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class LoadingBackGroundConfig
{
diff --git a/Core/GameEngine/Model/Config/LoadingFunctionConfig.cs b/Core/GameEngine/Model/Config/LoadingFunctionConfig.cs
index 6d667f2..73e263e 100644
--- a/Core/GameEngine/Model/Config/LoadingFunctionConfig.cs
+++ b/Core/GameEngine/Model/Config/LoadingFunctionConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class LoadingFunctionConfig
{
diff --git a/Core/GameEngine/Model/Config/LoadingTipConfig.cs b/Core/GameEngine/Model/Config/LoadingTipConfig.cs
index 014e8ba..acf03d9 100644
--- a/Core/GameEngine/Model/Config/LoadingTipConfig.cs
+++ b/Core/GameEngine/Model/Config/LoadingTipConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class LoadingTipConfig
{
diff --git a/Core/GameEngine/Model/Config/LoginAdConfig.cs b/Core/GameEngine/Model/Config/LoginAdConfig.cs
index bd80fdc..a7b9ba6 100644
--- a/Core/GameEngine/Model/Config/LoginAdConfig.cs
+++ b/Core/GameEngine/Model/Config/LoginAdConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class LoginAdConfig
{
@@ -35,11 +35,11 @@
int.TryParse(tables[2],out jump);
- string[] conditionStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- condition = new int[conditionStringArray.Length];
- for (int i=0;i<conditionStringArray.Length;i++)
- {
- int.TryParse(conditionStringArray[i],out condition[i]);
+ string[] conditionStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ condition = new int[conditionStringArray.Length];
+ for (int i=0;i<conditionStringArray.Length;i++)
+ {
+ int.TryParse(conditionStringArray[i],out condition[i]);
}
gotoIcon = tables[4];
diff --git a/Core/GameEngine/Model/Config/LoginRewardConfig.cs b/Core/GameEngine/Model/Config/LoginRewardConfig.cs
index 52872f0..764d18f 100644
--- a/Core/GameEngine/Model/Config/LoginRewardConfig.cs
+++ b/Core/GameEngine/Model/Config/LoginRewardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class LoginRewardConfig
{
diff --git a/Core/GameEngine/Model/Config/LoginSeverListConfig.cs b/Core/GameEngine/Model/Config/LoginSeverListConfig.cs
index e87e210..f66434f 100644
--- a/Core/GameEngine/Model/Config/LoginSeverListConfig.cs
+++ b/Core/GameEngine/Model/Config/LoginSeverListConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class LoginSeverListConfig
{
diff --git a/Core/GameEngine/Model/Config/MailConfig.cs b/Core/GameEngine/Model/Config/MailConfig.cs
index bdd347f..6109962 100644
--- a/Core/GameEngine/Model/Config/MailConfig.cs
+++ b/Core/GameEngine/Model/Config/MailConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class MailConfig
{
diff --git a/Core/GameEngine/Model/Config/MapConfig.cs b/Core/GameEngine/Model/Config/MapConfig.cs
index f9f78c7..1adea62 100644
--- a/Core/GameEngine/Model/Config/MapConfig.cs
+++ b/Core/GameEngine/Model/Config/MapConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class MapConfig
{
@@ -59,11 +59,11 @@
int.TryParse(tables[9],out TeamLimit);
- string[] BornPointsStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- BornPoints = new Vector3[BornPointsStringArray.Length];
- for (int i=0;i<BornPointsStringArray.Length;i++)
- {
- BornPoints[i]=BornPointsStringArray[i].Vector3Parse();
+ string[] BornPointsStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ BornPoints = new Vector3[BornPointsStringArray.Length];
+ for (int i=0;i<BornPointsStringArray.Length;i++)
+ {
+ BornPoints[i]=BornPointsStringArray[i].Vector3Parse();
}
int.TryParse(tables[11],out MainTaskID);
diff --git a/Core/GameEngine/Model/Config/MapData_10010Config.cs b/Core/GameEngine/Model/Config/MapData_10010Config.cs
index afdecda..6638195 100644
--- a/Core/GameEngine/Model/Config/MapData_10010Config.cs
+++ b/Core/GameEngine/Model/Config/MapData_10010Config.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class MapData_10010Config
{
diff --git a/Core/GameEngine/Model/Config/MapData_10080Config.cs b/Core/GameEngine/Model/Config/MapData_10080Config.cs
index 6b7a10c..9a9d7ed 100644
--- a/Core/GameEngine/Model/Config/MapData_10080Config.cs
+++ b/Core/GameEngine/Model/Config/MapData_10080Config.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class MapData_10080Config
{
diff --git a/Core/GameEngine/Model/Config/MapData_10090Config.cs b/Core/GameEngine/Model/Config/MapData_10090Config.cs
index 7bd15d6..ef0f738 100644
--- a/Core/GameEngine/Model/Config/MapData_10090Config.cs
+++ b/Core/GameEngine/Model/Config/MapData_10090Config.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class MapData_10090Config
{
diff --git a/Core/GameEngine/Model/Config/MapData_10120Config.cs b/Core/GameEngine/Model/Config/MapData_10120Config.cs
index 082b137..2f67a6a 100644
--- a/Core/GameEngine/Model/Config/MapData_10120Config.cs
+++ b/Core/GameEngine/Model/Config/MapData_10120Config.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class MapData_10120Config
{
diff --git a/Core/GameEngine/Model/Config/MapEventPointConfig.cs b/Core/GameEngine/Model/Config/MapEventPointConfig.cs
index a69cd21..3471e52 100644
--- a/Core/GameEngine/Model/Config/MapEventPointConfig.cs
+++ b/Core/GameEngine/Model/Config/MapEventPointConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class MapEventPointConfig
{
diff --git a/Core/GameEngine/Model/Config/MapResourcesConfig.cs b/Core/GameEngine/Model/Config/MapResourcesConfig.cs
index 2de9d21..c69b303 100644
--- a/Core/GameEngine/Model/Config/MapResourcesConfig.cs
+++ b/Core/GameEngine/Model/Config/MapResourcesConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class MapResourcesConfig
{
@@ -54,11 +54,11 @@
MapOffset=tables[8].Vector3Parse();
- string[] EffectStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- Effect = new int[EffectStringArray.Length];
- for (int i=0;i<EffectStringArray.Length;i++)
- {
- int.TryParse(EffectStringArray[i],out Effect[i]);
+ string[] EffectStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ Effect = new int[EffectStringArray.Length];
+ for (int i=0;i<EffectStringArray.Length;i++)
+ {
+ int.TryParse(EffectStringArray[i],out Effect[i]);
}
int.TryParse(tables[10],out Music);
diff --git a/Core/GameEngine/Model/Config/MapUiControlConfig.cs b/Core/GameEngine/Model/Config/MapUiControlConfig.cs
index 64ec0d3..35c8b11 100644
--- a/Core/GameEngine/Model/Config/MapUiControlConfig.cs
+++ b/Core/GameEngine/Model/Config/MapUiControlConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class MapUiControlConfig
{
diff --git a/Core/GameEngine/Model/Config/ModelResConfig.cs b/Core/GameEngine/Model/Config/ModelResConfig.cs
index a22f25a..bffe204 100644
--- a/Core/GameEngine/Model/Config/ModelResConfig.cs
+++ b/Core/GameEngine/Model/Config/ModelResConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ModelResConfig
{
diff --git a/Core/GameEngine/Model/Config/MonsterNameColorConfig.cs b/Core/GameEngine/Model/Config/MonsterNameColorConfig.cs
index 8d93f1d..f6d7bc8 100644
--- a/Core/GameEngine/Model/Config/MonsterNameColorConfig.cs
+++ b/Core/GameEngine/Model/Config/MonsterNameColorConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class MonsterNameColorConfig
{
diff --git a/Core/GameEngine/Model/Config/MonsterRefreshPointConfig.cs b/Core/GameEngine/Model/Config/MonsterRefreshPointConfig.cs
index 585886d..eb5cdc4 100644
--- a/Core/GameEngine/Model/Config/MonsterRefreshPointConfig.cs
+++ b/Core/GameEngine/Model/Config/MonsterRefreshPointConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class MonsterRefreshPointConfig
{
diff --git a/Core/GameEngine/Model/Config/NPCConfig.cs b/Core/GameEngine/Model/Config/NPCConfig.cs
index cd4131e..56c01ed 100644
--- a/Core/GameEngine/Model/Config/NPCConfig.cs
+++ b/Core/GameEngine/Model/Config/NPCConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class NPCConfig
{
@@ -191,11 +191,11 @@
int.TryParse(tables[53],out Dig);
- string[] SoundsStringArray = tables[54].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- Sounds = new int[SoundsStringArray.Length];
- for (int i=0;i<SoundsStringArray.Length;i++)
- {
- int.TryParse(SoundsStringArray[i],out Sounds[i]);
+ string[] SoundsStringArray = tables[54].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ Sounds = new int[SoundsStringArray.Length];
+ for (int i=0;i<SoundsStringArray.Length;i++)
+ {
+ int.TryParse(SoundsStringArray[i],out Sounds[i]);
}
int.TryParse(tables[55],out LifeBarCount);
diff --git a/Core/GameEngine/Model/Config/NPCDialogueConfig.cs b/Core/GameEngine/Model/Config/NPCDialogueConfig.cs
index c732490..bc3e7fd 100644
--- a/Core/GameEngine/Model/Config/NPCDialogueConfig.cs
+++ b/Core/GameEngine/Model/Config/NPCDialogueConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class NPCDialogueConfig
{
diff --git a/Core/GameEngine/Model/Config/NPCDropItemConfig.cs b/Core/GameEngine/Model/Config/NPCDropItemConfig.cs
index 52001bf..99782d1 100644
--- a/Core/GameEngine/Model/Config/NPCDropItemConfig.cs
+++ b/Core/GameEngine/Model/Config/NPCDropItemConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class NPCDropItemConfig
{
diff --git a/Core/GameEngine/Model/Config/NewAllPeoplePartyAwardConfig.cs b/Core/GameEngine/Model/Config/NewAllPeoplePartyAwardConfig.cs
index bd3c8e7..43ca7d8 100644
--- a/Core/GameEngine/Model/Config/NewAllPeoplePartyAwardConfig.cs
+++ b/Core/GameEngine/Model/Config/NewAllPeoplePartyAwardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class NewAllPeoplePartyAwardConfig
{
diff --git a/Core/GameEngine/Model/Config/NewAllPeoplePartyConfig.cs b/Core/GameEngine/Model/Config/NewAllPeoplePartyConfig.cs
index e6b4648..fe46635 100644
--- a/Core/GameEngine/Model/Config/NewAllPeoplePartyConfig.cs
+++ b/Core/GameEngine/Model/Config/NewAllPeoplePartyConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class NewAllPeoplePartyConfig
{
diff --git a/Core/GameEngine/Model/Config/NewDropItemGroupConfig.cs b/Core/GameEngine/Model/Config/NewDropItemGroupConfig.cs
index ca6cf3b..7190543 100644
--- a/Core/GameEngine/Model/Config/NewDropItemGroupConfig.cs
+++ b/Core/GameEngine/Model/Config/NewDropItemGroupConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class NewDropItemGroupConfig
{
diff --git a/Core/GameEngine/Model/Config/NewUniquenessArriveConfig.cs b/Core/GameEngine/Model/Config/NewUniquenessArriveConfig.cs
index bad5948..aab4a32 100644
--- a/Core/GameEngine/Model/Config/NewUniquenessArriveConfig.cs
+++ b/Core/GameEngine/Model/Config/NewUniquenessArriveConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class NewUniquenessArriveConfig
{
diff --git a/Core/GameEngine/Model/Config/OSCBillRankAwardConfig.cs b/Core/GameEngine/Model/Config/OSCBillRankAwardConfig.cs
index 013c983..60fc4c9 100644
--- a/Core/GameEngine/Model/Config/OSCBillRankAwardConfig.cs
+++ b/Core/GameEngine/Model/Config/OSCBillRankAwardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class OSCBillRankAwardConfig
{
diff --git a/Core/GameEngine/Model/Config/OSCBillTagAwardConfig.cs b/Core/GameEngine/Model/Config/OSCBillTagAwardConfig.cs
index f6e93f7..1e31958 100644
--- a/Core/GameEngine/Model/Config/OSCBillTagAwardConfig.cs
+++ b/Core/GameEngine/Model/Config/OSCBillTagAwardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class OSCBillTagAwardConfig
{
diff --git a/Core/GameEngine/Model/Config/OSRedAchieveConfig.cs b/Core/GameEngine/Model/Config/OSRedAchieveConfig.cs
index b0c7b72..5880d25 100644
--- a/Core/GameEngine/Model/Config/OSRedAchieveConfig.cs
+++ b/Core/GameEngine/Model/Config/OSRedAchieveConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class OSRedAchieveConfig
{
diff --git a/Core/GameEngine/Model/Config/OccupationNameConfig.cs b/Core/GameEngine/Model/Config/OccupationNameConfig.cs
index 38babe6..a442dca 100644
--- a/Core/GameEngine/Model/Config/OccupationNameConfig.cs
+++ b/Core/GameEngine/Model/Config/OccupationNameConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class OccupationNameConfig
{
diff --git a/Core/GameEngine/Model/Config/OnlineAwardConfig.cs b/Core/GameEngine/Model/Config/OnlineAwardConfig.cs
index 8a80f00..81ab5d9 100644
--- a/Core/GameEngine/Model/Config/OnlineAwardConfig.cs
+++ b/Core/GameEngine/Model/Config/OnlineAwardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class OnlineAwardConfig
{
diff --git a/Core/GameEngine/Model/Config/OpenServerActivityConfig.cs b/Core/GameEngine/Model/Config/OpenServerActivityConfig.cs
index ab26134..03f55c1 100644
--- a/Core/GameEngine/Model/Config/OpenServerActivityConfig.cs
+++ b/Core/GameEngine/Model/Config/OpenServerActivityConfig.cs
@@ -9,13 +9,13 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class OpenServerActivityConfig
{
- public readonly int id;
- public readonly string icon;
- public readonly int[] childTypes;
+ public readonly int id;
+ public readonly string icon;
+ public readonly int[] childTypes;
public readonly int order;
public OpenServerActivityConfig()
@@ -28,17 +28,17 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out id);
-
- icon = tables[1];
-
+ int.TryParse(tables[0],out id);
+
+ icon = tables[1];
+
string[] childTypesStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
childTypes = new int[childTypesStringArray.Length];
for (int i=0;i<childTypesStringArray.Length;i++)
{
int.TryParse(childTypesStringArray[i],out childTypes[i]);
- }
-
+ }
+
int.TryParse(tables[3],out order);
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/OrderInfoConfig.cs b/Core/GameEngine/Model/Config/OrderInfoConfig.cs
index 41505a0..508ac95 100644
--- a/Core/GameEngine/Model/Config/OrderInfoConfig.cs
+++ b/Core/GameEngine/Model/Config/OrderInfoConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class OrderInfoConfig
{
diff --git a/Core/GameEngine/Model/Config/PersonalBossConfig.cs b/Core/GameEngine/Model/Config/PersonalBossConfig.cs
index 23f4268..25cc71a 100644
--- a/Core/GameEngine/Model/Config/PersonalBossConfig.cs
+++ b/Core/GameEngine/Model/Config/PersonalBossConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class PersonalBossConfig
{
@@ -34,11 +34,11 @@
int.TryParse(tables[1],out lineId);
- string[] MustItemIDStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- MustItemID = new int[MustItemIDStringArray.Length];
- for (int i=0;i<MustItemIDStringArray.Length;i++)
- {
- int.TryParse(MustItemIDStringArray[i],out MustItemID[i]);
+ string[] MustItemIDStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ MustItemID = new int[MustItemIDStringArray.Length];
+ for (int i=0;i<MustItemIDStringArray.Length;i++)
+ {
+ int.TryParse(MustItemIDStringArray[i],out MustItemID[i]);
}
RareItemID = tables[3];
diff --git a/Core/GameEngine/Model/Config/PetClassCostConfig.cs b/Core/GameEngine/Model/Config/PetClassCostConfig.cs
index e13e9b8..7651757 100644
--- a/Core/GameEngine/Model/Config/PetClassCostConfig.cs
+++ b/Core/GameEngine/Model/Config/PetClassCostConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class PetClassCostConfig
{
diff --git a/Core/GameEngine/Model/Config/PetEatEquipConfig.cs b/Core/GameEngine/Model/Config/PetEatEquipConfig.cs
index 72cdb09..a11110c 100644
--- a/Core/GameEngine/Model/Config/PetEatEquipConfig.cs
+++ b/Core/GameEngine/Model/Config/PetEatEquipConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class PetEatEquipConfig
{
diff --git a/Core/GameEngine/Model/Config/PetInfoConfig.cs b/Core/GameEngine/Model/Config/PetInfoConfig.cs
index d7d33ec..ffb1728 100644
--- a/Core/GameEngine/Model/Config/PetInfoConfig.cs
+++ b/Core/GameEngine/Model/Config/PetInfoConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class PetInfoConfig
{
@@ -60,32 +60,32 @@
int.TryParse(tables[8],out UseNeedRank);
- string[] SkillIDStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- SkillID = new int[SkillIDStringArray.Length];
- for (int i=0;i<SkillIDStringArray.Length;i++)
- {
- int.TryParse(SkillIDStringArray[i],out SkillID[i]);
+ string[] SkillIDStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ SkillID = new int[SkillIDStringArray.Length];
+ for (int i=0;i<SkillIDStringArray.Length;i++)
+ {
+ int.TryParse(SkillIDStringArray[i],out SkillID[i]);
}
- string[] SkillScoreStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- SkillScore = new int[SkillScoreStringArray.Length];
- for (int i=0;i<SkillScoreStringArray.Length;i++)
- {
- int.TryParse(SkillScoreStringArray[i],out SkillScore[i]);
+ string[] SkillScoreStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ SkillScore = new int[SkillScoreStringArray.Length];
+ for (int i=0;i<SkillScoreStringArray.Length;i++)
+ {
+ int.TryParse(SkillScoreStringArray[i],out SkillScore[i]);
}
- string[] SkillUnLockStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- SkillUnLock = new int[SkillUnLockStringArray.Length];
- for (int i=0;i<SkillUnLockStringArray.Length;i++)
- {
- int.TryParse(SkillUnLockStringArray[i],out SkillUnLock[i]);
+ string[] SkillUnLockStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ SkillUnLock = new int[SkillUnLockStringArray.Length];
+ for (int i=0;i<SkillUnLockStringArray.Length;i++)
+ {
+ int.TryParse(SkillUnLockStringArray[i],out SkillUnLock[i]);
}
- string[] ShowSkillStringArray = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- ShowSkill = new int[ShowSkillStringArray.Length];
- for (int i=0;i<ShowSkillStringArray.Length;i++)
- {
- int.TryParse(ShowSkillStringArray[i],out ShowSkill[i]);
+ string[] ShowSkillStringArray = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ ShowSkill = new int[ShowSkillStringArray.Length];
+ for (int i=0;i<ShowSkillStringArray.Length;i++)
+ {
+ int.TryParse(ShowSkillStringArray[i],out ShowSkill[i]);
}
IconKey = tables[13];
diff --git a/Core/GameEngine/Model/Config/PlayerLVConfig.cs b/Core/GameEngine/Model/Config/PlayerLVConfig.cs
index 6186e8e..ff5d46d 100644
--- a/Core/GameEngine/Model/Config/PlayerLVConfig.cs
+++ b/Core/GameEngine/Model/Config/PlayerLVConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class PlayerLVConfig
{
diff --git a/Core/GameEngine/Model/Config/PlayerPropertyConfig.cs b/Core/GameEngine/Model/Config/PlayerPropertyConfig.cs
index 87a33f4..7d93c3d 100644
--- a/Core/GameEngine/Model/Config/PlayerPropertyConfig.cs
+++ b/Core/GameEngine/Model/Config/PlayerPropertyConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class PlayerPropertyConfig
{
diff --git a/Core/GameEngine/Model/Config/PriorBundleConfig.cs b/Core/GameEngine/Model/Config/PriorBundleConfig.cs
index 468ca24..98f020d 100644
--- a/Core/GameEngine/Model/Config/PriorBundleConfig.cs
+++ b/Core/GameEngine/Model/Config/PriorBundleConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class PriorBundleConfig
{
diff --git a/Core/GameEngine/Model/Config/PriorLanguageConfig.cs b/Core/GameEngine/Model/Config/PriorLanguageConfig.cs
index 926a38b..b8f9eea 100644
--- a/Core/GameEngine/Model/Config/PriorLanguageConfig.cs
+++ b/Core/GameEngine/Model/Config/PriorLanguageConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class PriorLanguageConfig
{
diff --git a/Core/GameEngine/Model/Config/PyTaskConfig.cs b/Core/GameEngine/Model/Config/PyTaskConfig.cs
index a70a019..21195c5 100644
--- a/Core/GameEngine/Model/Config/PyTaskConfig.cs
+++ b/Core/GameEngine/Model/Config/PyTaskConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class PyTaskConfig
{
diff --git a/Core/GameEngine/Model/Config/QuestionBankConfig.cs b/Core/GameEngine/Model/Config/QuestionBankConfig.cs
index ec74d72..2f485a2 100644
--- a/Core/GameEngine/Model/Config/QuestionBankConfig.cs
+++ b/Core/GameEngine/Model/Config/QuestionBankConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class QuestionBankConfig
{
diff --git a/Core/GameEngine/Model/Config/RandomNameConfig.cs b/Core/GameEngine/Model/Config/RandomNameConfig.cs
index 4ff8f2a..02ea542 100644
--- a/Core/GameEngine/Model/Config/RandomNameConfig.cs
+++ b/Core/GameEngine/Model/Config/RandomNameConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RandomNameConfig
{
diff --git a/Core/GameEngine/Model/Config/RankListConfig.cs b/Core/GameEngine/Model/Config/RankListConfig.cs
index 9eaec45..40d9805 100644
--- a/Core/GameEngine/Model/Config/RankListConfig.cs
+++ b/Core/GameEngine/Model/Config/RankListConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RankListConfig
{
diff --git a/Core/GameEngine/Model/Config/RealmConfig.cs b/Core/GameEngine/Model/Config/RealmConfig.cs
index 2c2f66d..2fe0ffb 100644
--- a/Core/GameEngine/Model/Config/RealmConfig.cs
+++ b/Core/GameEngine/Model/Config/RealmConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RealmConfig
{
@@ -58,25 +58,25 @@
int.TryParse(tables[5],out NeedNum);
- string[] NeedEquipStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- NeedEquip = new int[NeedEquipStringArray.Length];
- for (int i=0;i<NeedEquipStringArray.Length;i++)
- {
- int.TryParse(NeedEquipStringArray[i],out NeedEquip[i]);
+ string[] NeedEquipStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ NeedEquip = new int[NeedEquipStringArray.Length];
+ for (int i=0;i<NeedEquipStringArray.Length;i++)
+ {
+ int.TryParse(NeedEquipStringArray[i],out NeedEquip[i]);
}
- string[] AddAttrTypeStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- AddAttrType = new int[AddAttrTypeStringArray.Length];
- for (int i=0;i<AddAttrTypeStringArray.Length;i++)
- {
- int.TryParse(AddAttrTypeStringArray[i],out AddAttrType[i]);
+ string[] AddAttrTypeStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ AddAttrType = new int[AddAttrTypeStringArray.Length];
+ for (int i=0;i<AddAttrTypeStringArray.Length;i++)
+ {
+ int.TryParse(AddAttrTypeStringArray[i],out AddAttrType[i]);
}
- string[] AddAttrNumStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- AddAttrNum = new int[AddAttrNumStringArray.Length];
- for (int i=0;i<AddAttrNumStringArray.Length;i++)
- {
- int.TryParse(AddAttrNumStringArray[i],out AddAttrNum[i]);
+ string[] AddAttrNumStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ AddAttrNum = new int[AddAttrNumStringArray.Length];
+ for (int i=0;i<AddAttrNumStringArray.Length;i++)
+ {
+ int.TryParse(AddAttrNumStringArray[i],out AddAttrNum[i]);
}
int.TryParse(tables[9],out BossID);
diff --git a/Core/GameEngine/Model/Config/RealmPracticeConfig.cs b/Core/GameEngine/Model/Config/RealmPracticeConfig.cs
index 7020851..0546194 100644
--- a/Core/GameEngine/Model/Config/RealmPracticeConfig.cs
+++ b/Core/GameEngine/Model/Config/RealmPracticeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RealmPracticeConfig
{
diff --git a/Core/GameEngine/Model/Config/RedPackConfig.cs b/Core/GameEngine/Model/Config/RedPackConfig.cs
index 51c3c60..1dbcbfb 100644
--- a/Core/GameEngine/Model/Config/RedPackConfig.cs
+++ b/Core/GameEngine/Model/Config/RedPackConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RedPackConfig
{
diff --git a/Core/GameEngine/Model/Config/RefineStoveConfig.cs b/Core/GameEngine/Model/Config/RefineStoveConfig.cs
index e34bdb0..26d592c 100644
--- a/Core/GameEngine/Model/Config/RefineStoveConfig.cs
+++ b/Core/GameEngine/Model/Config/RefineStoveConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RefineStoveConfig
{
diff --git a/Core/GameEngine/Model/Config/ReikiRootConfig.cs b/Core/GameEngine/Model/Config/ReikiRootConfig.cs
index 5665ab7..2d476bf 100644
--- a/Core/GameEngine/Model/Config/ReikiRootConfig.cs
+++ b/Core/GameEngine/Model/Config/ReikiRootConfig.cs
@@ -9,13 +9,13 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ReikiRootConfig
{
- public readonly int id;
- public readonly string propertyPerPoint;
- public readonly string promoteProperty;
+ public readonly int id;
+ public readonly string propertyPerPoint;
+ public readonly string promoteProperty;
public readonly int[] qualityArea;
public ReikiRootConfig()
@@ -28,12 +28,12 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out id);
-
- propertyPerPoint = tables[1];
-
- promoteProperty = tables[2];
-
+ int.TryParse(tables[0],out id);
+
+ propertyPerPoint = tables[1];
+
+ promoteProperty = tables[2];
+
string[] qualityAreaStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
qualityArea = new int[qualityAreaStringArray.Length];
for (int i=0;i<qualityAreaStringArray.Length;i++)
diff --git a/Core/GameEngine/Model/Config/ReikiRootEffectConfig.cs b/Core/GameEngine/Model/Config/ReikiRootEffectConfig.cs
index 59a0a81..47717f9 100644
--- a/Core/GameEngine/Model/Config/ReikiRootEffectConfig.cs
+++ b/Core/GameEngine/Model/Config/ReikiRootEffectConfig.cs
@@ -9,15 +9,15 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ReikiRootEffectConfig
{
- public readonly int key;
- public readonly int id;
- public readonly int quality;
- public readonly int effect;
- public readonly int uiScale;
+ public readonly int key;
+ public readonly int id;
+ public readonly int quality;
+ public readonly int effect;
+ public readonly int uiScale;
public readonly int offsetY;
public ReikiRootEffectConfig()
@@ -30,16 +30,16 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out key);
-
- int.TryParse(tables[1],out id);
-
- int.TryParse(tables[2],out quality);
-
- int.TryParse(tables[3],out effect);
-
- int.TryParse(tables[4],out uiScale);
-
+ int.TryParse(tables[0],out key);
+
+ int.TryParse(tables[1],out id);
+
+ int.TryParse(tables[2],out quality);
+
+ int.TryParse(tables[3],out effect);
+
+ int.TryParse(tables[4],out uiScale);
+
int.TryParse(tables[5],out offsetY);
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/ResourcesBackConfig.cs b/Core/GameEngine/Model/Config/ResourcesBackConfig.cs
index bbca53e..8dfb955 100644
--- a/Core/GameEngine/Model/Config/ResourcesBackConfig.cs
+++ b/Core/GameEngine/Model/Config/ResourcesBackConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ResourcesBackConfig
{
diff --git a/Core/GameEngine/Model/Config/RichTextMsgReplaceConfig.cs b/Core/GameEngine/Model/Config/RichTextMsgReplaceConfig.cs
index 0966377..272721e 100644
--- a/Core/GameEngine/Model/Config/RichTextMsgReplaceConfig.cs
+++ b/Core/GameEngine/Model/Config/RichTextMsgReplaceConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RichTextMsgReplaceConfig
{
diff --git a/Core/GameEngine/Model/Config/RidingPetBossRewardConfig.cs b/Core/GameEngine/Model/Config/RidingPetBossRewardConfig.cs
index cc2f047..60a2923 100644
--- a/Core/GameEngine/Model/Config/RidingPetBossRewardConfig.cs
+++ b/Core/GameEngine/Model/Config/RidingPetBossRewardConfig.cs
@@ -9,14 +9,14 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RidingPetBossRewardConfig
{
- public readonly int id;
- public readonly int lineId;
- public readonly string worldLevel;
- public readonly string rank;
+ public readonly int id;
+ public readonly int lineId;
+ public readonly string worldLevel;
+ public readonly string rank;
public readonly string items;
public RidingPetBossRewardConfig()
@@ -29,14 +29,14 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out id);
-
- int.TryParse(tables[1],out lineId);
-
- worldLevel = tables[2];
-
- rank = tables[3];
-
+ int.TryParse(tables[0],out id);
+
+ int.TryParse(tables[1],out lineId);
+
+ worldLevel = tables[2];
+
+ rank = tables[3];
+
items = tables[4];
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/RoleEquipStarsConfig.cs b/Core/GameEngine/Model/Config/RoleEquipStarsConfig.cs
index 90903ba..d45299e 100644
--- a/Core/GameEngine/Model/Config/RoleEquipStarsConfig.cs
+++ b/Core/GameEngine/Model/Config/RoleEquipStarsConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RoleEquipStarsConfig
{
diff --git a/Core/GameEngine/Model/Config/RoleResourceConfig.cs b/Core/GameEngine/Model/Config/RoleResourceConfig.cs
index 62c08bc..cd87304 100644
--- a/Core/GameEngine/Model/Config/RoleResourceConfig.cs
+++ b/Core/GameEngine/Model/Config/RoleResourceConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RoleResourceConfig
{
diff --git a/Core/GameEngine/Model/Config/RoleStrongerConfig.cs b/Core/GameEngine/Model/Config/RoleStrongerConfig.cs
index 16afbf3..3637f0a 100644
--- a/Core/GameEngine/Model/Config/RoleStrongerConfig.cs
+++ b/Core/GameEngine/Model/Config/RoleStrongerConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RoleStrongerConfig
{
diff --git a/Core/GameEngine/Model/Config/RuleConfig.cs b/Core/GameEngine/Model/Config/RuleConfig.cs
index cf396b9..4a2fca2 100644
--- a/Core/GameEngine/Model/Config/RuleConfig.cs
+++ b/Core/GameEngine/Model/Config/RuleConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RuleConfig
{
diff --git a/Core/GameEngine/Model/Config/RuneComposeConfig.cs b/Core/GameEngine/Model/Config/RuneComposeConfig.cs
index f1cc6aa..a6e1775 100644
--- a/Core/GameEngine/Model/Config/RuneComposeConfig.cs
+++ b/Core/GameEngine/Model/Config/RuneComposeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RuneComposeConfig
{
diff --git a/Core/GameEngine/Model/Config/RuneConfig.cs b/Core/GameEngine/Model/Config/RuneConfig.cs
index 3be614a..f253099 100644
--- a/Core/GameEngine/Model/Config/RuneConfig.cs
+++ b/Core/GameEngine/Model/Config/RuneConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RuneConfig
{
diff --git a/Core/GameEngine/Model/Config/RuneTowerConfig.cs b/Core/GameEngine/Model/Config/RuneTowerConfig.cs
index b1feda9..057b6f7 100644
--- a/Core/GameEngine/Model/Config/RuneTowerConfig.cs
+++ b/Core/GameEngine/Model/Config/RuneTowerConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RuneTowerConfig
{
diff --git a/Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs b/Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs
index e2966ea..b5eab29 100644
--- a/Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs
+++ b/Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class RuneTowerFloorConfig
{
diff --git a/Core/GameEngine/Model/Config/SceneReplaceConfig.cs b/Core/GameEngine/Model/Config/SceneReplaceConfig.cs
index d787193..e9cb1a2 100644
--- a/Core/GameEngine/Model/Config/SceneReplaceConfig.cs
+++ b/Core/GameEngine/Model/Config/SceneReplaceConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SceneReplaceConfig
{
diff --git a/Core/GameEngine/Model/Config/SceneShadowConfig.cs b/Core/GameEngine/Model/Config/SceneShadowConfig.cs
index 62a14c9..78b2d83 100644
--- a/Core/GameEngine/Model/Config/SceneShadowConfig.cs
+++ b/Core/GameEngine/Model/Config/SceneShadowConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SceneShadowConfig
{
diff --git a/Core/GameEngine/Model/Config/SignInConfig.cs b/Core/GameEngine/Model/Config/SignInConfig.cs
index 8fef45c..1791fa4 100644
--- a/Core/GameEngine/Model/Config/SignInConfig.cs
+++ b/Core/GameEngine/Model/Config/SignInConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SignInConfig
{
diff --git a/Core/GameEngine/Model/Config/SkillClassifingConfig.cs b/Core/GameEngine/Model/Config/SkillClassifingConfig.cs
index 87a3a89..1def7ab 100644
--- a/Core/GameEngine/Model/Config/SkillClassifingConfig.cs
+++ b/Core/GameEngine/Model/Config/SkillClassifingConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SkillClassifingConfig
{
diff --git a/Core/GameEngine/Model/Config/SkillConfig.cs b/Core/GameEngine/Model/Config/SkillConfig.cs
index 9d073f0..1b1dca1 100644
--- a/Core/GameEngine/Model/Config/SkillConfig.cs
+++ b/Core/GameEngine/Model/Config/SkillConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SkillConfig
{
diff --git a/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs b/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs
index cb2f9e3..95e716e 100644
--- a/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs
+++ b/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SkillFrameAnimationConfig
{
diff --git a/Core/GameEngine/Model/Config/SkyTowerConfig.cs b/Core/GameEngine/Model/Config/SkyTowerConfig.cs
index ff476c8..563cb95 100644
--- a/Core/GameEngine/Model/Config/SkyTowerConfig.cs
+++ b/Core/GameEngine/Model/Config/SkyTowerConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SkyTowerConfig
{
diff --git a/Core/GameEngine/Model/Config/SkyTowerServerChallengeConfig.cs b/Core/GameEngine/Model/Config/SkyTowerServerChallengeConfig.cs
index 1a3f056..f4d6598 100644
--- a/Core/GameEngine/Model/Config/SkyTowerServerChallengeConfig.cs
+++ b/Core/GameEngine/Model/Config/SkyTowerServerChallengeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SkyTowerServerChallengeConfig
{
diff --git a/Core/GameEngine/Model/Config/SpiritWeaponConfig.cs b/Core/GameEngine/Model/Config/SpiritWeaponConfig.cs
index b8feb3a..91fc666 100644
--- a/Core/GameEngine/Model/Config/SpiritWeaponConfig.cs
+++ b/Core/GameEngine/Model/Config/SpiritWeaponConfig.cs
@@ -9,21 +9,21 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SpiritWeaponConfig
{
- public readonly int ItemID;
- public readonly int Level;
- public readonly int[] AttrIDList;
- public readonly int[] AttrValueList;
- public readonly int[] AttrColorList;
- public readonly int AttrScore;
- public readonly Int2[] UpCostItem;
- public readonly int NextItemID;
- public readonly int NPCID;
- public readonly Vector3 Rotation;
- public readonly float scale;
+ public readonly int ItemID;
+ public readonly int Level;
+ public readonly int[] AttrIDList;
+ public readonly int[] AttrValueList;
+ public readonly int[] AttrColorList;
+ public readonly int AttrScore;
+ public readonly Int2[] UpCostItem;
+ public readonly int NextItemID;
+ public readonly int NPCID;
+ public readonly Vector3 Rotation;
+ public readonly float scale;
public readonly Vector3 RawImgPos;
public SpiritWeaponConfig()
@@ -36,48 +36,48 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out ItemID);
-
- int.TryParse(tables[1],out Level);
-
+ int.TryParse(tables[0],out ItemID);
+
+ int.TryParse(tables[1],out Level);
+
string[] AttrIDListStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
AttrIDList = new int[AttrIDListStringArray.Length];
for (int i=0;i<AttrIDListStringArray.Length;i++)
{
int.TryParse(AttrIDListStringArray[i],out AttrIDList[i]);
- }
-
+ }
+
string[] AttrValueListStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
AttrValueList = new int[AttrValueListStringArray.Length];
for (int i=0;i<AttrValueListStringArray.Length;i++)
{
int.TryParse(AttrValueListStringArray[i],out AttrValueList[i]);
- }
-
+ }
+
string[] AttrColorListStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
AttrColorList = new int[AttrColorListStringArray.Length];
for (int i=0;i<AttrColorListStringArray.Length;i++)
{
int.TryParse(AttrColorListStringArray[i],out AttrColorList[i]);
- }
-
- int.TryParse(tables[5],out AttrScore);
-
+ }
+
+ int.TryParse(tables[5],out AttrScore);
+
string[] UpCostItemStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
UpCostItem = new Int2[UpCostItemStringArray.Length];
for (int i=0;i<UpCostItemStringArray.Length;i++)
{
Int2.TryParse(UpCostItemStringArray[i],out UpCostItem[i]);
- }
-
- int.TryParse(tables[7],out NextItemID);
-
- int.TryParse(tables[8],out NPCID);
-
- Rotation=tables[9].Vector3Parse();
-
- float.TryParse(tables[10],out scale);
-
+ }
+
+ int.TryParse(tables[7],out NextItemID);
+
+ int.TryParse(tables[8],out NPCID);
+
+ Rotation=tables[9].Vector3Parse();
+
+ float.TryParse(tables[10],out scale);
+
RawImgPos=tables[11].Vector3Parse();
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/StoreConfig.cs b/Core/GameEngine/Model/Config/StoreConfig.cs
index f9dd119..1fb399c 100644
--- a/Core/GameEngine/Model/Config/StoreConfig.cs
+++ b/Core/GameEngine/Model/Config/StoreConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class StoreConfig
{
@@ -51,11 +51,11 @@
int.TryParse(tables[1],out ShopType);
- string[] SecondTypeStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- SecondType = new int[SecondTypeStringArray.Length];
- for (int i=0;i<SecondTypeStringArray.Length;i++)
- {
- int.TryParse(SecondTypeStringArray[i],out SecondType[i]);
+ string[] SecondTypeStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ SecondType = new int[SecondTypeStringArray.Length];
+ for (int i=0;i<SecondTypeStringArray.Length;i++)
+ {
+ int.TryParse(SecondTypeStringArray[i],out SecondType[i]);
}
int.TryParse(tables[3],out ShopSort);
@@ -74,22 +74,22 @@
int.TryParse(tables[10],out RefreshType);
- string[] VIPLVStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- VIPLV = new int[VIPLVStringArray.Length];
- for (int i=0;i<VIPLVStringArray.Length;i++)
- {
- int.TryParse(VIPLVStringArray[i],out VIPLV[i]);
+ string[] VIPLVStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ VIPLV = new int[VIPLVStringArray.Length];
+ for (int i=0;i<VIPLVStringArray.Length;i++)
+ {
+ int.TryParse(VIPLVStringArray[i],out VIPLV[i]);
}
int.TryParse(tables[12],out LV);
int.TryParse(tables[13],out LVSee);
- string[] PurchaseNumberStringArray = tables[14].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- PurchaseNumber = new int[PurchaseNumberStringArray.Length];
- for (int i=0;i<PurchaseNumberStringArray.Length;i++)
- {
- int.TryParse(PurchaseNumberStringArray[i],out PurchaseNumber[i]);
+ string[] PurchaseNumberStringArray = tables[14].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ PurchaseNumber = new int[PurchaseNumberStringArray.Length];
+ for (int i=0;i<PurchaseNumberStringArray.Length;i++)
+ {
+ int.TryParse(PurchaseNumberStringArray[i],out PurchaseNumber[i]);
}
int.TryParse(tables[15],out MoneyType);
diff --git a/Core/GameEngine/Model/Config/StoryMissionsConfig.cs b/Core/GameEngine/Model/Config/StoryMissionsConfig.cs
index 81489e6..4f05abd 100644
--- a/Core/GameEngine/Model/Config/StoryMissionsConfig.cs
+++ b/Core/GameEngine/Model/Config/StoryMissionsConfig.cs
@@ -9,17 +9,17 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class StoryMissionsConfig
{
- public readonly int id;
- public readonly int TaskID;
- public readonly int state;
- public readonly int NpcID;
- public readonly int[] TalkNum;
- public readonly string content;
- public readonly int[] Speaker1;
+ public readonly int id;
+ public readonly int TaskID;
+ public readonly int state;
+ public readonly int NpcID;
+ public readonly int[] TalkNum;
+ public readonly string content;
+ public readonly int[] Speaker1;
public readonly int[] TaskMusic;
public StoryMissionsConfig()
@@ -32,30 +32,30 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out id);
-
- int.TryParse(tables[1],out TaskID);
-
- int.TryParse(tables[2],out state);
-
- int.TryParse(tables[3],out NpcID);
-
+ int.TryParse(tables[0],out id);
+
+ int.TryParse(tables[1],out TaskID);
+
+ int.TryParse(tables[2],out state);
+
+ int.TryParse(tables[3],out NpcID);
+
string[] TalkNumStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
TalkNum = new int[TalkNumStringArray.Length];
for (int i=0;i<TalkNumStringArray.Length;i++)
{
int.TryParse(TalkNumStringArray[i],out TalkNum[i]);
- }
-
- content = tables[5];
-
+ }
+
+ content = tables[5];
+
string[] Speaker1StringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
Speaker1 = new int[Speaker1StringArray.Length];
for (int i=0;i<Speaker1StringArray.Length;i++)
{
int.TryParse(Speaker1StringArray[i],out Speaker1[i]);
- }
-
+ }
+
string[] TaskMusicStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
TaskMusic = new int[TaskMusicStringArray.Length];
for (int i=0;i<TaskMusicStringArray.Length;i++)
diff --git a/Core/GameEngine/Model/Config/SuccessConfig.cs b/Core/GameEngine/Model/Config/SuccessConfig.cs
index 679c177..bedad5a 100644
--- a/Core/GameEngine/Model/Config/SuccessConfig.cs
+++ b/Core/GameEngine/Model/Config/SuccessConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SuccessConfig
{
@@ -52,11 +52,11 @@
int.TryParse(tables[3],out NeedCnt);
- string[] ConditionStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- Condition = new int[ConditionStringArray.Length];
- for (int i=0;i<ConditionStringArray.Length;i++)
- {
- int.TryParse(ConditionStringArray[i],out Condition[i]);
+ string[] ConditionStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ Condition = new int[ConditionStringArray.Length];
+ for (int i=0;i<ConditionStringArray.Length;i++)
+ {
+ int.TryParse(ConditionStringArray[i],out Condition[i]);
}
Condition2 = tables[5];
@@ -71,11 +71,11 @@
int.TryParse(tables[10],out Exp);
- string[] AwardAttributeStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- AwardAttribute = new int[AwardAttributeStringArray.Length];
- for (int i=0;i<AwardAttributeStringArray.Length;i++)
- {
- int.TryParse(AwardAttributeStringArray[i],out AwardAttribute[i]);
+ string[] AwardAttributeStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ AwardAttribute = new int[AwardAttributeStringArray.Length];
+ for (int i=0;i<AwardAttributeStringArray.Length;i++)
+ {
+ int.TryParse(AwardAttributeStringArray[i],out AwardAttribute[i]);
}
int.TryParse(tables[12],out RedPacketID);
diff --git a/Core/GameEngine/Model/Config/SuitEffectConfig.cs b/Core/GameEngine/Model/Config/SuitEffectConfig.cs
index 0150272..e63e098 100644
--- a/Core/GameEngine/Model/Config/SuitEffectConfig.cs
+++ b/Core/GameEngine/Model/Config/SuitEffectConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SuitEffectConfig
{
diff --git a/Core/GameEngine/Model/Config/SuperUpRechargeConfig.cs b/Core/GameEngine/Model/Config/SuperUpRechargeConfig.cs
index 17b6d9a..632b740 100644
--- a/Core/GameEngine/Model/Config/SuperUpRechargeConfig.cs
+++ b/Core/GameEngine/Model/Config/SuperUpRechargeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SuperUpRechargeConfig
{
diff --git a/Core/GameEngine/Model/Config/SysInfoConfig.cs b/Core/GameEngine/Model/Config/SysInfoConfig.cs
index 5fc9867..2bd3c9b 100644
--- a/Core/GameEngine/Model/Config/SysInfoConfig.cs
+++ b/Core/GameEngine/Model/Config/SysInfoConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class SysInfoConfig
{
@@ -36,11 +36,11 @@
effect = tables[2];
- string[] typeStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- type = new int[typeStringArray.Length];
- for (int i=0;i<typeStringArray.Length;i++)
- {
- int.TryParse(typeStringArray[i],out type[i]);
+ string[] typeStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ type = new int[typeStringArray.Length];
+ for (int i=0;i<typeStringArray.Length;i++)
+ {
+ int.TryParse(typeStringArray[i],out type[i]);
}
richText = tables[4];
diff --git a/Core/GameEngine/Model/Config/TASKINFOConfig.cs b/Core/GameEngine/Model/Config/TASKINFOConfig.cs
index 2ab555e..c5c67e0 100644
--- a/Core/GameEngine/Model/Config/TASKINFOConfig.cs
+++ b/Core/GameEngine/Model/Config/TASKINFOConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TASKINFOConfig
{
diff --git a/Core/GameEngine/Model/Config/TalentConfig.cs b/Core/GameEngine/Model/Config/TalentConfig.cs
index 255c840..eb1ffa6 100644
--- a/Core/GameEngine/Model/Config/TalentConfig.cs
+++ b/Core/GameEngine/Model/Config/TalentConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TalentConfig
{
diff --git a/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs b/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
index 79e5e3d..d06b8cc 100644
--- a/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
+++ b/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
@@ -9,22 +9,22 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TaskFeedbackConfig
{
- public readonly int taskId;
- public readonly int type;
- public readonly int condition;
- public readonly string equips;
- public readonly string items;
- public readonly string sideTasks;
- public readonly string reikiRoot;
- public readonly int succGuide;
- public readonly int jump;
- public readonly string[] funcTitles;
- public readonly string failFuncs;
- public readonly int[] onlyOneFunc;
+ public readonly int taskId;
+ public readonly int type;
+ public readonly int condition;
+ public readonly string equips;
+ public readonly string items;
+ public readonly string sideTasks;
+ public readonly string reikiRoot;
+ public readonly int succGuide;
+ public readonly int jump;
+ public readonly string[] funcTitles;
+ public readonly string failFuncs;
+ public readonly int[] onlyOneFunc;
public readonly string[] remind;
public TaskFeedbackConfig()
@@ -37,35 +37,35 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out taskId);
-
- int.TryParse(tables[1],out type);
-
- int.TryParse(tables[2],out condition);
-
- equips = tables[3];
-
- items = tables[4];
-
- sideTasks = tables[5];
-
- reikiRoot = tables[6];
-
- int.TryParse(tables[7],out succGuide);
-
- int.TryParse(tables[8],out jump);
-
- funcTitles = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
-
- failFuncs = tables[10];
-
+ int.TryParse(tables[0],out taskId);
+
+ int.TryParse(tables[1],out type);
+
+ int.TryParse(tables[2],out condition);
+
+ equips = tables[3];
+
+ items = tables[4];
+
+ sideTasks = tables[5];
+
+ reikiRoot = tables[6];
+
+ int.TryParse(tables[7],out succGuide);
+
+ int.TryParse(tables[8],out jump);
+
+ funcTitles = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+
+ failFuncs = tables[10];
+
string[] onlyOneFuncStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
onlyOneFunc = new int[onlyOneFuncStringArray.Length];
for (int i=0;i<onlyOneFuncStringArray.Length;i++)
{
int.TryParse(onlyOneFuncStringArray[i],out onlyOneFunc[i]);
- }
-
+ }
+
remind = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs b/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs
index 8c19096..f079b9f 100644
--- a/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs
+++ b/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs
@@ -9,18 +9,18 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TaskFeedbackFuncConfig
{
- public readonly int id;
- public readonly string name;
- public readonly int jump;
- public readonly int guide;
- public readonly int type;
- public readonly int condition;
- public readonly Int2[] itemCondition;
- public readonly int[] excludeFuncs;
+ public readonly int id;
+ public readonly string name;
+ public readonly int jump;
+ public readonly int guide;
+ public readonly int type;
+ public readonly int condition;
+ public readonly Int2[] itemCondition;
+ public readonly int[] excludeFuncs;
public readonly Int3[] expertSkills;
public TaskFeedbackFuncConfig()
@@ -33,32 +33,32 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out id);
-
- name = tables[1];
-
- int.TryParse(tables[2],out jump);
-
- int.TryParse(tables[3],out guide);
-
- int.TryParse(tables[4],out type);
-
- int.TryParse(tables[5],out condition);
-
+ int.TryParse(tables[0],out id);
+
+ name = tables[1];
+
+ int.TryParse(tables[2],out jump);
+
+ int.TryParse(tables[3],out guide);
+
+ int.TryParse(tables[4],out type);
+
+ int.TryParse(tables[5],out condition);
+
string[] itemConditionStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
itemCondition = new Int2[itemConditionStringArray.Length];
for (int i=0;i<itemConditionStringArray.Length;i++)
{
Int2.TryParse(itemConditionStringArray[i],out itemCondition[i]);
- }
-
+ }
+
string[] excludeFuncsStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
excludeFuncs = new int[excludeFuncsStringArray.Length];
for (int i=0;i<excludeFuncsStringArray.Length;i++)
{
int.TryParse(excludeFuncsStringArray[i],out excludeFuncs[i]);
- }
-
+ }
+
string[] expertSkillsStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
expertSkills = new Int3[expertSkillsStringArray.Length];
for (int i=0;i<expertSkillsStringArray.Length;i++)
diff --git a/Core/GameEngine/Model/Config/TaskListConfig.cs b/Core/GameEngine/Model/Config/TaskListConfig.cs
index 6d1bd11..7005e38 100644
--- a/Core/GameEngine/Model/Config/TaskListConfig.cs
+++ b/Core/GameEngine/Model/Config/TaskListConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TaskListConfig
{
@@ -50,11 +50,11 @@
TaskTarget = tables[6];
- string[] CollectNPCStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- CollectNPC = new int[CollectNPCStringArray.Length];
- for (int i=0;i<CollectNPCStringArray.Length;i++)
- {
- int.TryParse(CollectNPCStringArray[i],out CollectNPC[i]);
+ string[] CollectNPCStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ CollectNPC = new int[CollectNPCStringArray.Length];
+ for (int i=0;i<CollectNPCStringArray.Length;i++)
+ {
+ int.TryParse(CollectNPCStringArray[i],out CollectNPC[i]);
}
int.TryParse(tables[8],out FabaoID);
diff --git a/Core/GameEngine/Model/Config/TaskPowerConfig.cs b/Core/GameEngine/Model/Config/TaskPowerConfig.cs
index e4c4928..caec6f3 100644
--- a/Core/GameEngine/Model/Config/TaskPowerConfig.cs
+++ b/Core/GameEngine/Model/Config/TaskPowerConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TaskPowerConfig
{
diff --git a/Core/GameEngine/Model/Config/TeamTargetConfig.cs b/Core/GameEngine/Model/Config/TeamTargetConfig.cs
index e1c7bb5..6512422 100644
--- a/Core/GameEngine/Model/Config/TeamTargetConfig.cs
+++ b/Core/GameEngine/Model/Config/TeamTargetConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TeamTargetConfig
{
diff --git a/Core/GameEngine/Model/Config/TreasureChapterConfig.cs b/Core/GameEngine/Model/Config/TreasureChapterConfig.cs
index 2b6db7c..6b3b438 100644
--- a/Core/GameEngine/Model/Config/TreasureChapterConfig.cs
+++ b/Core/GameEngine/Model/Config/TreasureChapterConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TreasureChapterConfig
{
diff --git a/Core/GameEngine/Model/Config/TreasureConfig.cs b/Core/GameEngine/Model/Config/TreasureConfig.cs
index 6518e83..e46fe8d 100644
--- a/Core/GameEngine/Model/Config/TreasureConfig.cs
+++ b/Core/GameEngine/Model/Config/TreasureConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TreasureConfig
{
diff --git a/Core/GameEngine/Model/Config/TreasureDungeonConfig.cs b/Core/GameEngine/Model/Config/TreasureDungeonConfig.cs
index b5ce15f..25878f4 100644
--- a/Core/GameEngine/Model/Config/TreasureDungeonConfig.cs
+++ b/Core/GameEngine/Model/Config/TreasureDungeonConfig.cs
@@ -9,18 +9,18 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TreasureDungeonConfig
{
- public readonly int ID;
- public readonly int MWID;
- public readonly int LineID;
- public readonly int Level;
- public readonly string Attr;
- public readonly int fightPower;
- public readonly string icon;
- public readonly string bossName;
+ public readonly int ID;
+ public readonly int MWID;
+ public readonly int LineID;
+ public readonly int Level;
+ public readonly string Attr;
+ public readonly int fightPower;
+ public readonly string icon;
+ public readonly string bossName;
public readonly int defense;
public TreasureDungeonConfig()
@@ -33,22 +33,22 @@
{
var tables = input.Split('\t');
- int.TryParse(tables[0],out ID);
-
- int.TryParse(tables[1],out MWID);
-
- int.TryParse(tables[2],out LineID);
-
- int.TryParse(tables[3],out Level);
-
- Attr = tables[4];
-
- int.TryParse(tables[5],out fightPower);
-
- icon = tables[6];
-
- bossName = tables[7];
-
+ int.TryParse(tables[0],out ID);
+
+ int.TryParse(tables[1],out MWID);
+
+ int.TryParse(tables[2],out LineID);
+
+ int.TryParse(tables[3],out Level);
+
+ Attr = tables[4];
+
+ int.TryParse(tables[5],out fightPower);
+
+ icon = tables[6];
+
+ bossName = tables[7];
+
int.TryParse(tables[8],out defense);
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/TreasureFindHostConfig.cs b/Core/GameEngine/Model/Config/TreasureFindHostConfig.cs
index 47eb91c..728b581 100644
--- a/Core/GameEngine/Model/Config/TreasureFindHostConfig.cs
+++ b/Core/GameEngine/Model/Config/TreasureFindHostConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TreasureFindHostConfig
{
diff --git a/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs b/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs
index 616eaa8..3a06132 100644
--- a/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs
+++ b/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TreasurePrivilegeConfig
{
@@ -52,11 +52,11 @@
itemAward = tables[6];
- string[] successListStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- successList = new int[successListStringArray.Length];
- for (int i=0;i<successListStringArray.Length;i++)
- {
- int.TryParse(successListStringArray[i],out successList[i]);
+ string[] successListStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ successList = new int[successListStringArray.Length];
+ for (int i=0;i<successListStringArray.Length;i++)
+ {
+ int.TryParse(successListStringArray[i],out successList[i]);
}
int.TryParse(tables[8],out treasureId);
diff --git a/Core/GameEngine/Model/Config/TreasureSkillConfig.cs b/Core/GameEngine/Model/Config/TreasureSkillConfig.cs
index 36a99e8..ccec117 100644
--- a/Core/GameEngine/Model/Config/TreasureSkillConfig.cs
+++ b/Core/GameEngine/Model/Config/TreasureSkillConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TreasureSkillConfig
{
diff --git a/Core/GameEngine/Model/Config/TreasureUpConfig.cs b/Core/GameEngine/Model/Config/TreasureUpConfig.cs
index c51423a..23ad790 100644
--- a/Core/GameEngine/Model/Config/TreasureUpConfig.cs
+++ b/Core/GameEngine/Model/Config/TreasureUpConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TreasureUpConfig
{
@@ -43,11 +43,11 @@
AddAttr = tables[4];
- string[] UnLockSkillStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- UnLockSkill = new int[UnLockSkillStringArray.Length];
- for (int i=0;i<UnLockSkillStringArray.Length;i++)
- {
- int.TryParse(UnLockSkillStringArray[i],out UnLockSkill[i]);
+ string[] UnLockSkillStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ UnLockSkill = new int[UnLockSkillStringArray.Length];
+ for (int i=0;i<UnLockSkillStringArray.Length;i++)
+ {
+ int.TryParse(UnLockSkillStringArray[i],out UnLockSkill[i]);
}
int.TryParse(tables[6],out UnLockFuncID);
diff --git a/Core/GameEngine/Model/Config/TrialRewardsConfig.cs b/Core/GameEngine/Model/Config/TrialRewardsConfig.cs
index cf45eae..5ccde8b 100644
--- a/Core/GameEngine/Model/Config/TrialRewardsConfig.cs
+++ b/Core/GameEngine/Model/Config/TrialRewardsConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class TrialRewardsConfig
{
diff --git a/Core/GameEngine/Model/Config/UnionLivenConfig.cs b/Core/GameEngine/Model/Config/UnionLivenConfig.cs
index ad9627e..37d7392 100644
--- a/Core/GameEngine/Model/Config/UnionLivenConfig.cs
+++ b/Core/GameEngine/Model/Config/UnionLivenConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class UnionLivenConfig
{
diff --git a/Core/GameEngine/Model/Config/UniquenessArriveConfig.cs b/Core/GameEngine/Model/Config/UniquenessArriveConfig.cs
index 3989c0b..12e3d29 100644
--- a/Core/GameEngine/Model/Config/UniquenessArriveConfig.cs
+++ b/Core/GameEngine/Model/Config/UniquenessArriveConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class UniquenessArriveConfig
{
diff --git a/Core/GameEngine/Model/Config/VIPAwardConfig.cs b/Core/GameEngine/Model/Config/VIPAwardConfig.cs
index 71e5aec..b37efa1 100644
--- a/Core/GameEngine/Model/Config/VIPAwardConfig.cs
+++ b/Core/GameEngine/Model/Config/VIPAwardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class VIPAwardConfig
{
diff --git a/Core/GameEngine/Model/Config/VIPKillNPCConfig.cs b/Core/GameEngine/Model/Config/VIPKillNPCConfig.cs
index 62bcd58..26c0681 100644
--- a/Core/GameEngine/Model/Config/VIPKillNPCConfig.cs
+++ b/Core/GameEngine/Model/Config/VIPKillNPCConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class VIPKillNPCConfig
{
diff --git a/Core/GameEngine/Model/Config/ViewRoleFuncConfig.cs b/Core/GameEngine/Model/Config/ViewRoleFuncConfig.cs
index c0313a4..fbe10f5 100644
--- a/Core/GameEngine/Model/Config/ViewRoleFuncConfig.cs
+++ b/Core/GameEngine/Model/Config/ViewRoleFuncConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class ViewRoleFuncConfig
{
@@ -35,11 +35,11 @@
compareTip = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- string[] conditionStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- condition = new int[conditionStringArray.Length];
- for (int i=0;i<conditionStringArray.Length;i++)
- {
- int.TryParse(conditionStringArray[i],out condition[i]);
+ string[] conditionStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ condition = new int[conditionStringArray.Length];
+ for (int i=0;i<conditionStringArray.Length;i++)
+ {
+ int.TryParse(conditionStringArray[i],out condition[i]);
}
Icon = tables[4];
diff --git a/Core/GameEngine/Model/Config/VipPrivilegeConfig.cs b/Core/GameEngine/Model/Config/VipPrivilegeConfig.cs
index 9fab1ff..dd241c4 100644
--- a/Core/GameEngine/Model/Config/VipPrivilegeConfig.cs
+++ b/Core/GameEngine/Model/Config/VipPrivilegeConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class VipPrivilegeConfig
{
diff --git a/Core/GameEngine/Model/Config/VipPrivilegeInfoConfig.cs b/Core/GameEngine/Model/Config/VipPrivilegeInfoConfig.cs
index eb8125f..a16f390 100644
--- a/Core/GameEngine/Model/Config/VipPrivilegeInfoConfig.cs
+++ b/Core/GameEngine/Model/Config/VipPrivilegeInfoConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class VipPrivilegeInfoConfig
{
@@ -44,11 +44,11 @@
int.TryParse(tables[5],out privilegeId);
- string[] datasStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- datas = new int[datasStringArray.Length];
- for (int i=0;i<datasStringArray.Length;i++)
- {
- int.TryParse(datasStringArray[i],out datas[i]);
+ string[] datasStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ datas = new int[datasStringArray.Length];
+ for (int i=0;i<datasStringArray.Length;i++)
+ {
+ int.TryParse(datasStringArray[i],out datas[i]);
}
int.TryParse(tables[7],out important);
diff --git a/Core/GameEngine/Model/Config/WHYJRewardConfig.cs b/Core/GameEngine/Model/Config/WHYJRewardConfig.cs
index 2474906..432636e 100644
--- a/Core/GameEngine/Model/Config/WHYJRewardConfig.cs
+++ b/Core/GameEngine/Model/Config/WHYJRewardConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class WHYJRewardConfig
{
@@ -29,18 +29,18 @@
int.TryParse(tables[0],out ID);
- string[] RewardStringArray = tables[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- Reward = new int[RewardStringArray.Length];
- for (int i=0;i<RewardStringArray.Length;i++)
- {
- int.TryParse(RewardStringArray[i],out Reward[i]);
+ string[] RewardStringArray = tables[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ Reward = new int[RewardStringArray.Length];
+ for (int i=0;i<RewardStringArray.Length;i++)
+ {
+ int.TryParse(RewardStringArray[i],out Reward[i]);
}
- string[] QuantityStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- Quantity = new int[QuantityStringArray.Length];
- for (int i=0;i<QuantityStringArray.Length;i++)
- {
- int.TryParse(QuantityStringArray[i],out Quantity[i]);
+ string[] QuantityStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ Quantity = new int[QuantityStringArray.Length];
+ for (int i=0;i<QuantityStringArray.Length;i++)
+ {
+ int.TryParse(QuantityStringArray[i],out Quantity[i]);
}
}
catch (Exception ex)
diff --git a/Core/GameEngine/Model/Config/WashLevelMaxConfig.cs b/Core/GameEngine/Model/Config/WashLevelMaxConfig.cs
index 7e3ac8f..43577f7 100644
--- a/Core/GameEngine/Model/Config/WashLevelMaxConfig.cs
+++ b/Core/GameEngine/Model/Config/WashLevelMaxConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class WashLevelMaxConfig
{
diff --git a/Core/GameEngine/Model/Config/WeatherConfig.cs b/Core/GameEngine/Model/Config/WeatherConfig.cs
index 723dd19..8483e49 100644
--- a/Core/GameEngine/Model/Config/WeatherConfig.cs
+++ b/Core/GameEngine/Model/Config/WeatherConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class WeatherConfig
{
diff --git a/Core/GameEngine/Model/Config/WeekPartyConfig.cs b/Core/GameEngine/Model/Config/WeekPartyConfig.cs
index b04d348..26bc324 100644
--- a/Core/GameEngine/Model/Config/WeekPartyConfig.cs
+++ b/Core/GameEngine/Model/Config/WeekPartyConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class WeekPartyConfig
{
diff --git a/Core/GameEngine/Model/Config/WeekPartyPointConfig.cs b/Core/GameEngine/Model/Config/WeekPartyPointConfig.cs
index 271e748..de4f5d5 100644
--- a/Core/GameEngine/Model/Config/WeekPartyPointConfig.cs
+++ b/Core/GameEngine/Model/Config/WeekPartyPointConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class WeekPartyPointConfig
{
diff --git a/Core/GameEngine/Model/Config/WindowSearchConfig.cs b/Core/GameEngine/Model/Config/WindowSearchConfig.cs
index 56e6a61..31a16f7 100644
--- a/Core/GameEngine/Model/Config/WindowSearchConfig.cs
+++ b/Core/GameEngine/Model/Config/WindowSearchConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class WindowSearchConfig
{
diff --git a/Core/GameEngine/Model/Config/WingRefineAttrConfig.cs b/Core/GameEngine/Model/Config/WingRefineAttrConfig.cs
index 294065c..fc24368 100644
--- a/Core/GameEngine/Model/Config/WingRefineAttrConfig.cs
+++ b/Core/GameEngine/Model/Config/WingRefineAttrConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class WingRefineAttrConfig
{
diff --git a/Core/GameEngine/Model/Config/WingRefineExpConfig.cs b/Core/GameEngine/Model/Config/WingRefineExpConfig.cs
index 85b9a82..4b9a42e 100644
--- a/Core/GameEngine/Model/Config/WingRefineExpConfig.cs
+++ b/Core/GameEngine/Model/Config/WingRefineExpConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class WingRefineExpConfig
{
diff --git a/Core/GameEngine/Model/Config/WorldBossConfig.cs b/Core/GameEngine/Model/Config/WorldBossConfig.cs
index 182c32f..45c3f1c 100644
--- a/Core/GameEngine/Model/Config/WorldBossConfig.cs
+++ b/Core/GameEngine/Model/Config/WorldBossConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class WorldBossConfig
{
diff --git a/Core/GameEngine/Model/Config/XBGetItemConfig.cs b/Core/GameEngine/Model/Config/XBGetItemConfig.cs
index bdbff4e..2884ec2 100644
--- a/Core/GameEngine/Model/Config/XBGetItemConfig.cs
+++ b/Core/GameEngine/Model/Config/XBGetItemConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class XBGetItemConfig
{
diff --git a/Core/GameEngine/Model/Config/XMZZAchievementConfig.cs b/Core/GameEngine/Model/Config/XMZZAchievementConfig.cs
index e0ab3e9..3aff5e5 100644
--- a/Core/GameEngine/Model/Config/XMZZAchievementConfig.cs
+++ b/Core/GameEngine/Model/Config/XMZZAchievementConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class XMZZAchievementConfig
{
diff --git a/Core/GameEngine/Model/Config/bossSkillTipsConfig.cs b/Core/GameEngine/Model/Config/bossSkillTipsConfig.cs
index 853f816..e17f232 100644
--- a/Core/GameEngine/Model/Config/bossSkillTipsConfig.cs
+++ b/Core/GameEngine/Model/Config/bossSkillTipsConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class bossSkillTipsConfig
{
diff --git a/Core/GameEngine/Model/Config/mapAreaConfig.cs b/Core/GameEngine/Model/Config/mapAreaConfig.cs
index 94ebaef..6f4d6f3 100644
--- a/Core/GameEngine/Model/Config/mapAreaConfig.cs
+++ b/Core/GameEngine/Model/Config/mapAreaConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class mapAreaConfig
{
diff --git a/Core/GameEngine/Model/Config/mapbornConfig.cs b/Core/GameEngine/Model/Config/mapbornConfig.cs
index 6311757..38f7a32 100644
--- a/Core/GameEngine/Model/Config/mapbornConfig.cs
+++ b/Core/GameEngine/Model/Config/mapbornConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class mapbornConfig
{
diff --git a/Core/GameEngine/Model/Config/mapnpcConfig.cs b/Core/GameEngine/Model/Config/mapnpcConfig.cs
index a877abd..4bb6837 100644
--- a/Core/GameEngine/Model/Config/mapnpcConfig.cs
+++ b/Core/GameEngine/Model/Config/mapnpcConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class mapnpcConfig
{
diff --git a/Core/GameEngine/Model/Config/maptransportConfig.cs b/Core/GameEngine/Model/Config/maptransportConfig.cs
index c62ee80..8e9469b 100644
--- a/Core/GameEngine/Model/Config/maptransportConfig.cs
+++ b/Core/GameEngine/Model/Config/maptransportConfig.cs
@@ -9,7 +9,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public partial class maptransportConfig
{
diff --git a/Core/GameEngine/Model/Player/PlayerDatas.cs b/Core/GameEngine/Model/Player/PlayerDatas.cs
index 1f3c949..99ae328 100644
--- a/Core/GameEngine/Model/Player/PlayerDatas.cs
+++ b/Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -4,7 +4,7 @@
using Snxxz.UI;
using LitJson;
-[XLua.LuaCallCSharp]
+
public class PlayerDatas : Singleton<PlayerDatas>
{
public GA_Hero hero = null;
diff --git a/Core/GameEngine/SnxxzGame.cs b/Core/GameEngine/SnxxzGame.cs
index 16f42ac..07661ad 100644
--- a/Core/GameEngine/SnxxzGame.cs
+++ b/Core/GameEngine/SnxxzGame.cs
@@ -3,7 +3,7 @@
using UnityEngine.Events;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class SnxxzGame : SingletonMonobehaviour<SnxxzGame>
{
private event UnityAction m_UpdateActions;
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs b/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs
index 5ea2e5d..a6606ee 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs
@@ -35,8 +35,6 @@
beforePlayerDataInitializeEvent();
}
- CSharpCallLua.OnBeforePlayerDataInitialize();
-
try
{
RedpointCenter.Instance.ResetAllRedpointState();
@@ -61,7 +59,6 @@
switchAccountEvent();
}
- CSharpCallLua.OnSwitchAccount();
}
playerIdBuf = PlayerDatas.Instance.baseData.PlayerID;
@@ -70,7 +67,6 @@
afterPlayerDataInitializeEvent();
}
- CSharpCallLua.OnAfterPlayerDataInitialize();
}
var clientDungeonInfo = new Dungeon()
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
index 9c604de..993a393 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
@@ -53,8 +53,6 @@
{
playerLoginOkEvent();
}
-
- CSharpCallLua.OnPlayerLoginOk();
}
}
catch (Exception ex)
@@ -72,7 +70,6 @@
mapInitOkEvent();
}
- CSharpCallLua.OnMapInitOk();
//锟叫碉拷图锟斤拷锟斤拷pk boss状态
PlayerDatas.Instance.extersion.bossState = 2;
diff --git a/Core/NetworkPackage/GameNetSystem.cs b/Core/NetworkPackage/GameNetSystem.cs
index ef04ae8..6a40c2c 100644
--- a/Core/NetworkPackage/GameNetSystem.cs
+++ b/Core/NetworkPackage/GameNetSystem.cs
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class GameNetSystem : Singleton<GameNetSystem>
{
NetUpdateBehaviour m_NetUpdateBehaviour;
@@ -16,11 +16,9 @@
DisconnectState disconnectState;
NetState m_NetState;
- public NetState netState
- {
+ public NetState netState {
get { return this.m_NetState; }
- set
- {
+ set {
if (this.m_NetState != value)
{
switch (m_NetState)
@@ -74,8 +72,7 @@
private ClientSocket mainSocket;
public bool mainSocketConnected { get { return mainSocket == null ? false : mainSocket.connected; } }
- public float timeSinceMainSocketLastProtocol
- {
+ public float timeSinceMainSocketLastProtocol {
get { return mainSocket == null ? Time.time : (float)(DateTime.Now - mainSocket.lastPackageTime).TotalSeconds; }
}
@@ -83,8 +80,7 @@
private ClientSocket crossServerSocket;
public bool crossServerSocketConnected { get { return crossServerConnected_Loigc && (crossServerSocket == null ? false : crossServerSocket.connected); } }
- public float timeSinceCrossServerSocketLastProtocol
- {
+ public float timeSinceCrossServerSocketLastProtocol {
get { return crossServerSocket == null ? Time.time : (float)(DateTime.Now - crossServerSocket.lastPackageTime).TotalSeconds; }
}
@@ -207,7 +203,7 @@
return;
}
- if (PackageRegedit.Contain(protocol.cmd) || PackageRegedit.ContainLua(protocol.cmd) || PackageRegedit.ContainIL(protocol.cmd))
+ if (PackageRegedit.Contain(protocol.cmd) || PackageRegedit.ContainIL(protocol.cmd))
{
switch (type)
{
diff --git a/Core/NetworkPackage/LuaGameNetPack.cs b/Core/NetworkPackage/LuaGameNetPack.cs
deleted file mode 100644
index 714b048..0000000
--- a/Core/NetworkPackage/LuaGameNetPack.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/**
-* Lua 鐨勫皝鍖�
-*/
-public class LuaGameNetPack : GameNetPackBasic
-{
-
- private byte[] _packBytes;
-
- public byte[] PackBytes
- {
- get { return _packBytes; }
- }
-
- public LuaGameNetPack(ushort cmd, byte[] packBytes)
- {
- this._cmd = cmd;
- this._packBytes = packBytes;
- }
- public override void ReadFromBytes(byte[] vBytes)
- {
- this._packBytes = vBytes;
- }
-
-}
\ No newline at end of file
diff --git a/Core/NetworkPackage/LuaGameNetPack.cs.meta b/Core/NetworkPackage/LuaGameNetPack.cs.meta
deleted file mode 100644
index d67f83e..0000000
--- a/Core/NetworkPackage/LuaGameNetPack.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 2fc9b0c856f4a7643977f364f64f6567
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/Socket/ClientSocket.cs b/Core/NetworkPackage/Socket/ClientSocket.cs
index 065aafb..0383f69 100644
--- a/Core/NetworkPackage/Socket/ClientSocket.cs
+++ b/Core/NetworkPackage/Socket/ClientSocket.cs
@@ -343,18 +343,6 @@
}
}
- //澶勭悊lua鐨勫垎鍖�
- if (PackageRegedit.ContainLua(cmd))
- {
-#if UNITY_EDITOR
- PackageRegedit.TransPack(socketType, cmd, vPackBytes);
-#endif
- var luaNetPack = new LuaGameNetPack(cmd, vPackBytes);
- luaNetPack.socketType = this.socketType;
- GameNetSystem.Instance.PushPackage(luaNetPack, this.socketType);
- isRegist = true;
- }
-
vReadIndex += 6 + vBodyLeng;
// 鏈敞鍐屽皝鍖呭鐞�
diff --git a/Core/ResModule/AnimatorControllerLoader.cs b/Core/ResModule/AnimatorControllerLoader.cs
index 2f06e1a..babb809 100644
--- a/Core/ResModule/AnimatorControllerLoader.cs
+++ b/Core/ResModule/AnimatorControllerLoader.cs
@@ -5,7 +5,7 @@
using UnityEditor;
#endif
-[XLua.LuaCallCSharp]
+
public class AnimatorControllerLoader
{
public static readonly string controllerSuffix = "AnimatorController_";
diff --git a/Core/ResModule/AssetBundle/AssetBundleUtility.cs b/Core/ResModule/AssetBundle/AssetBundleUtility.cs
index d89f98d..8ddb156 100644
--- a/Core/ResModule/AssetBundle/AssetBundleUtility.cs
+++ b/Core/ResModule/AssetBundle/AssetBundleUtility.cs
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class AssetBundleUtility : SingletonMonobehaviour<AssetBundleUtility>
{
private List<AssetBundleInfo> m_AssetBundleInfoList = new List<AssetBundleInfo>();
diff --git a/Core/ResModule/GameObjectPoolManager.cs b/Core/ResModule/GameObjectPoolManager.cs
index 37ab93e..dc0ac8d 100644
--- a/Core/ResModule/GameObjectPoolManager.cs
+++ b/Core/ResModule/GameObjectPoolManager.cs
@@ -3,7 +3,7 @@
using System;
-[XLua.LuaCallCSharp]
+
public class GameObjectPoolManager : SingletonMonobehaviour<GameObjectPoolManager>
{
#if UNITY_EDITOR
diff --git a/Core/ResModule/InstanceResourcesLoader.cs b/Core/ResModule/InstanceResourcesLoader.cs
index 086b21a..89a67df 100644
--- a/Core/ResModule/InstanceResourcesLoader.cs
+++ b/Core/ResModule/InstanceResourcesLoader.cs
@@ -5,7 +5,7 @@
using UnityEditor;
#endif
-[XLua.LuaCallCSharp]
+
public class InstanceResourcesLoader
{
public static readonly string raceSuffix = "Prefab_Race_";
diff --git a/Core/ResModule/UILoader.cs b/Core/ResModule/UILoader.cs
index 5d00c90..d58ae56 100644
--- a/Core/ResModule/UILoader.cs
+++ b/Core/ResModule/UILoader.cs
@@ -5,7 +5,7 @@
using System.IO;
-[XLua.LuaCallCSharp]
+
public class UILoader
{
readonly static string PREFAB_EXTERSION = ".prefab";
diff --git a/Core/SDK/SDKUtility.cs b/Core/SDK/SDKUtility.cs
index 304632f..558ac93 100644
--- a/Core/SDK/SDKUtility.cs
+++ b/Core/SDK/SDKUtility.cs
@@ -7,7 +7,7 @@
using System;
using UnityEngine.Android;
-[XLua.LuaCallCSharp]
+
public class SDKUtility : SingletonMonobehaviour<SDKUtility>
{
diff --git a/Core/SFX/SFXPlayUtility.cs b/Core/SFX/SFXPlayUtility.cs
index 64c8713..0d1a7c6 100644
--- a/Core/SFX/SFXPlayUtility.cs
+++ b/Core/SFX/SFXPlayUtility.cs
@@ -4,7 +4,7 @@
using System;
using System.Collections;
-[XLua.LuaCallCSharp]
+
public class SFXPlayUtility : SingletonMonobehaviour<SFXPlayUtility>
{
diff --git a/Core/Utilities/AnyCountDownUtility.cs b/Core/Utilities/AnyCountDownUtility.cs
index fb4032b..a870143 100644
--- a/Core/Utilities/AnyCountDownUtility.cs
+++ b/Core/Utilities/AnyCountDownUtility.cs
@@ -2,7 +2,7 @@
using UnityEngine.Events;
using System.Collections.Generic;
-[XLua.LuaCallCSharp]
+
public class AnyCountDownUtility : SingletonMonobehaviour<AnyCountDownUtility>
{
private Stack<CDItem> m_FreeStack = new Stack<CDItem>();
diff --git a/Fight/Actor/Skill/FlyObject/FlyObjectManager.cs b/Fight/Actor/Skill/FlyObject/FlyObjectManager.cs
index e27d14a..2ae139b 100644
--- a/Fight/Actor/Skill/FlyObject/FlyObjectManager.cs
+++ b/Fight/Actor/Skill/FlyObject/FlyObjectManager.cs
@@ -1,6 +1,6 @@
锘縰sing System.Collections.Generic;
-[XLua.LuaCallCSharp]
+
public class FlyObjectManager : Singleton<FlyObjectManager>
{
diff --git a/Fight/Actor/Skill/SkillHelper.cs b/Fight/Actor/Skill/SkillHelper.cs
index 81c993d..439219b 100644
--- a/Fight/Actor/Skill/SkillHelper.cs
+++ b/Fight/Actor/Skill/SkillHelper.cs
@@ -6,7 +6,7 @@
/// <summary>
/// 瀵规墍鏈夋妧鑳芥暟鎹繘琛屽鐞嗗拰缂撳瓨鐨勭被
/// </summary>
-[XLua.LuaCallCSharp]
+
public class SkillHelper : Singleton<SkillHelper>
{
private TreasureSkillModel m_TreasureSkillModel;
diff --git a/Fight/Actor/Status/StatusMgr.cs b/Fight/Actor/Status/StatusMgr.cs
index a155ab7..70a4016 100644
--- a/Fight/Actor/Status/StatusMgr.cs
+++ b/Fight/Actor/Status/StatusMgr.cs
@@ -4,7 +4,7 @@
using UnityEngine;
using UnityEngine.Events;
-[XLua.LuaCallCSharp]
+
public class StatusMgr : SingletonMonobehaviour<StatusMgr>
{
public struct ZhongJiInfo
diff --git a/Fight/BossFakeLineUtility.cs b/Fight/BossFakeLineUtility.cs
index d558230..741eb7e 100644
--- a/Fight/BossFakeLineUtility.cs
+++ b/Fight/BossFakeLineUtility.cs
@@ -5,7 +5,7 @@
using System;
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class BossFakeLineUtility : Singleton<BossFakeLineUtility>
{
diff --git a/Fight/GameActor/BattleEffectPlayRule.cs b/Fight/GameActor/BattleEffectPlayRule.cs
index 650bd59..d22b965 100644
--- a/Fight/GameActor/BattleEffectPlayRule.cs
+++ b/Fight/GameActor/BattleEffectPlayRule.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class BattleEffectPlayRule : Singleton<BattleEffectPlayRule>
{
public readonly List<uint> sortPlayerList = new List<uint>();
diff --git a/Fight/GameActor/GAMgr.cs b/Fight/GameActor/GAMgr.cs
index d2ee0d1..a678879 100644
--- a/Fight/GameActor/GAMgr.cs
+++ b/Fight/GameActor/GAMgr.cs
@@ -6,7 +6,7 @@
using System.Collections;
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class GAMgr : SingletonMonobehaviour<GAMgr>
{
private List<GActor> reAdjustPosList = new List<GActor>();
diff --git a/Fight/GameActor/HeroRoundGird.cs b/Fight/GameActor/HeroRoundGird.cs
index 9370708..155a7fa 100644
--- a/Fight/GameActor/HeroRoundGird.cs
+++ b/Fight/GameActor/HeroRoundGird.cs
@@ -2,10 +2,10 @@
using System.Collections.Generic;
using UnityEngine.AI;
-[XLua.LuaCallCSharp]
+
public class HeroRoundGird : Singleton<HeroRoundGird>
{
- [XLua.LuaCallCSharp]
+
public class GirdNode
{
public int index;
diff --git a/Fight/MapTransferUtility.cs b/Fight/MapTransferUtility.cs
index a9abed0..f8ff309 100644
--- a/Fight/MapTransferUtility.cs
+++ b/Fight/MapTransferUtility.cs
@@ -4,7 +4,7 @@
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class MapTransferUtility : SingletonMonobehaviour<MapTransferUtility>
{
public static UnityEngine.Events.UnityAction s_OnHeroLeaveFuncNpc;
diff --git a/Fight/PreFightMission.cs b/Fight/PreFightMission.cs
index 42504d8..566f435 100644
--- a/Fight/PreFightMission.cs
+++ b/Fight/PreFightMission.cs
@@ -5,7 +5,7 @@
using System.Collections;
-[XLua.LuaCallCSharp]
+
public class PreFightMission : Singleton<PreFightMission>
{
diff --git a/Fight/PrepareHandler.cs b/Fight/PrepareHandler.cs
index 5098f92..15fb9b9 100644
--- a/Fight/PrepareHandler.cs
+++ b/Fight/PrepareHandler.cs
@@ -4,7 +4,7 @@
using UnityEngine.Events;
using System;
-[XLua.LuaCallCSharp]
+
public class PrepareHandler : Singleton<PrepareHandler>
{
diff --git a/Fight/Stage/MapEditor/GuideDialogueModel.cs b/Fight/Stage/MapEditor/GuideDialogueModel.cs
index 78502a3..7d1b9a4 100644
--- a/Fight/Stage/MapEditor/GuideDialogueModel.cs
+++ b/Fight/Stage/MapEditor/GuideDialogueModel.cs
@@ -1,7 +1,7 @@
锘縰sing UnityEngine;
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class GuideDialogueModel : Model
{
public int dialogID;
diff --git a/Fight/Stage/MapEditor/GuideMessageModel.cs b/Fight/Stage/MapEditor/GuideMessageModel.cs
index bd35f8d..7da9e86 100644
--- a/Fight/Stage/MapEditor/GuideMessageModel.cs
+++ b/Fight/Stage/MapEditor/GuideMessageModel.cs
@@ -2,7 +2,7 @@
using System.Collections;
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class GuideMessageModel : Model
{
public string content;
diff --git a/Fight/Stage/MapEditor/NewGuideModel.cs b/Fight/Stage/MapEditor/NewGuideModel.cs
index cda45a6..ab58dc1 100644
--- a/Fight/Stage/MapEditor/NewGuideModel.cs
+++ b/Fight/Stage/MapEditor/NewGuideModel.cs
@@ -2,7 +2,7 @@
using UnityEngine.Events;
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class NewGuideModel : Model
{
public string content;
diff --git a/Fight/Stage/MapEditor/StoryHintModel.cs b/Fight/Stage/MapEditor/StoryHintModel.cs
index bed300b..e81363a 100644
--- a/Fight/Stage/MapEditor/StoryHintModel.cs
+++ b/Fight/Stage/MapEditor/StoryHintModel.cs
@@ -1,7 +1,7 @@
锘縰sing UnityEngine.Events;
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class StoryHintModel : Model
{
public string name;
diff --git a/Fight/Stage/StageLoad.cs b/Fight/Stage/StageLoad.cs
index b109961..0fbfca3 100644
--- a/Fight/Stage/StageLoad.cs
+++ b/Fight/Stage/StageLoad.cs
@@ -4,7 +4,7 @@
using UnityEngine;
using UnityEngine.Events;
-[XLua.LuaCallCSharp]
+
public class StageLoad : SingletonMonobehaviour<StageLoad>
{
StageLoadProcessor stageLoadProcessor;
diff --git a/Lua.meta b/Lua.meta
deleted file mode 100644
index 79df084..0000000
--- a/Lua.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 721b752538034ae47ba4f5d730c93524
-folderAsset: yes
-timeCreated: 1533301968
-licenseType: Pro
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/BuildInInit.cs b/Lua/BuildInInit.cs
deleted file mode 100644
index 1475d8d..0000000
--- a/Lua/BuildInInit.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace XLua.LuaDLL
-{
- using System.Runtime.InteropServices;
-
- public partial class Lua
- {
- [DllImport(LUADLL, CallingConvention = CallingConvention.Cdecl)]
- public static extern int luaopen_rapidjson(System.IntPtr L);
-
- [MonoPInvokeCallback(typeof(LuaDLL.lua_CSFunction))]
- public static int LoadRapidJson(System.IntPtr L)
- {
- return luaopen_rapidjson(L);
- }
-
- [DllImport(LUADLL, CallingConvention = CallingConvention.Cdecl)]
- public static extern int luaopen_lpeg(System.IntPtr L);
-
- [MonoPInvokeCallback(typeof(LuaDLL.lua_CSFunction))]
- public static int LoadLpeg(System.IntPtr L)
- {
- return luaopen_lpeg(L);
- }
-
- [DllImport(LUADLL, CallingConvention = CallingConvention.Cdecl)]
- public static extern int luaopen_pb(System.IntPtr L);
-
- [MonoPInvokeCallback(typeof(LuaDLL.lua_CSFunction))]
- public static int LoadLuaProfobuf(System.IntPtr L)
- {
- return luaopen_pb(L);
- }
- }
-}
\ No newline at end of file
diff --git a/Lua/BuildInInit.cs.meta b/Lua/BuildInInit.cs.meta
deleted file mode 100644
index a17d933..0000000
--- a/Lua/BuildInInit.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 98a554915a6754b42910d4f1c6330bc4
-timeCreated: 1540804487
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/CSharpCallLua.cs b/Lua/CSharpCallLua.cs
deleted file mode 100644
index 0aad5bf..0000000
--- a/Lua/CSharpCallLua.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using XLua;
-using System;
-
-
-[CSharpCallLua]
-public class CSharpCallLua
-{
- [CSharpCallLua]
- public delegate void OnRecieveNetPackage(ushort cmd, byte[] bytes, ServerType socketType);
- [CSharpCallLua]
- public delegate void OnAssetLoadFinished(bool isOk, UnityEngine.Object asset);
- static OnRecieveNetPackage onRecieveLuaNetPackage;
-
- [CSharpCallLua]
- public delegate void GeneralDelegate();
-
- static GeneralDelegate beforePlayerDataInitialize;
- static GeneralDelegate afterPlayerDataInitialize;
- static GeneralDelegate switchAccount;
- static GeneralDelegate playerLoginOk;
- static GeneralDelegate mapInitOk;
-
- [CSharpCallLua]
- public delegate bool boolReturnedValueDelegate(int integer);
- static boolReturnedValueDelegate isLuaDungeonVictoryWin;
- static boolReturnedValueDelegate isLuaDungeonDefeatWin;
-
- static boolReturnedValueDelegate isLuaDailyQuest;
- static boolReturnedValueDelegate gotoLuaDailyQuest;
-
- public static void RegisterLuaEvent()
- {
- LuaUtility.DoString("protocol.manager.LuaProtocalRegister");
- onRecieveLuaNetPackage = LuaUtility.Global.Get<OnRecieveNetPackage>("OnRecieveNetPackage");
- //娉ㄥ唽lua鐨勫皝鍖�
- var luaProtocalRegister = LuaUtility.Global.Get<Dictionary<ushort, Action>>("ProtocalRegister");
- PackageRegedit.RegisterLua(luaProtocalRegister);
-
- LuaUtility.DoString("event.AfterPlayerDataInitialize");
- afterPlayerDataInitialize = LuaUtility.Global.Get<GeneralDelegate>("OnAfterPlayerDataInitialize");
-
- LuaUtility.DoString("event.BeforePlayerDataInitialize");
- beforePlayerDataInitialize = LuaUtility.Global.Get<GeneralDelegate>("OnBeforePlayerDataInitialize");
-
- LuaUtility.DoString("event.MapInitOk");
- mapInitOk = LuaUtility.Global.Get<GeneralDelegate>("OnMapInitOk");
-
- LuaUtility.DoString("event.SwitchAccount");
- switchAccount = LuaUtility.Global.Get<GeneralDelegate>("OnSwitchAccount");
-
- LuaUtility.DoString("event.PlayerLoginOk");
- playerLoginOk = LuaUtility.Global.Get<GeneralDelegate>("OnPlayerLoginOk");
-
- LuaUtility.DoString("interface.DungeonInterface");
- isLuaDungeonVictoryWin = LuaUtility.Global.Get<boolReturnedValueDelegate>("IsLuaDungeonVictoryWin");
- isLuaDungeonDefeatWin = LuaUtility.Global.Get<boolReturnedValueDelegate>("IsLuaDungeonDefeatWin");
-
- LuaUtility.DoString("interface.DailyQuestInterface");
- isLuaDailyQuest = LuaUtility.Global.Get<boolReturnedValueDelegate>("IsLuaDailyQuest");
- gotoLuaDailyQuest = LuaUtility.Global.Get<boolReturnedValueDelegate>("GotoDailyQuest");
-
- }
-
- static object lockojb1 = new object();
- public static void OnRecieveLuaNetPackage(LuaGameNetPack pack)
- {
- lock (lockojb1)
- {
- if (onRecieveLuaNetPackage != null)
- {
- onRecieveLuaNetPackage(pack.cmd, pack.PackBytes, pack.socketType);
- }
- }
- }
-
- public static void OnBeforePlayerDataInitialize()
- {
- if (beforePlayerDataInitialize != null)
- {
- beforePlayerDataInitialize();
- }
- }
-
- public static void OnAfterPlayerDataInitialize()
- {
- if (afterPlayerDataInitialize != null)
- {
- afterPlayerDataInitialize();
- }
- }
-
- public static void OnSwitchAccount()
- {
- if (switchAccount != null)
- {
- switchAccount();
- }
- }
-
- public static void OnPlayerLoginOk()
- {
- if (playerLoginOk != null)
- {
- playerLoginOk();
- }
- }
-
- public static void OnMapInitOk()
- {
- if (mapInitOk != null)
- {
- mapInitOk();
- }
- }
-
- public static bool IsLuaDungeonVictoryWin(int dataMapId)
- {
- if (isLuaDungeonVictoryWin != null)
- {
- return isLuaDungeonVictoryWin(dataMapId);
- }
-
- return false;
- }
-
- public static bool IsLuaDungeonDefeatWin(int dataMapId)
- {
- if (isLuaDungeonDefeatWin != null)
- {
- return isLuaDungeonDefeatWin(dataMapId);
- }
-
- return false;
- }
-
- public static bool IsLuaDailyQuest(int dailyQuest)
- {
- if (isLuaDailyQuest != null)
- {
- return isLuaDailyQuest(dailyQuest);
- }
-
- return false;
- }
-
- public static void GotoLuaDailyQuest(int dailyquest)
- {
- if (gotoLuaDailyQuest != null)
- {
- gotoLuaDailyQuest(dailyquest);
- }
- }
-
- public static void LaunchStart()
- {
- LuaUtility.DoString("manager.Launch", "Launch");
- var launchAction = LuaUtility.Global.Get<GeneralDelegate>("LaunchStart");
- if (launchAction != null)
- {
- launchAction();
- }
-
- if (!Application.isEditor)
- {
- LuaUtility.Do("hotfix.hotfix");
- }
- }
-
- public static void LaunchPostProcess()
- {
- var action = LuaUtility.Global.Get<GeneralDelegate>("LaunchPostProcess");
- if (action != null)
- {
- action();
- }
- }
-
- public static void ConfigInit()
- {
- LuaUtility.DoString("config.ConfigInit", "ConfigInit");
- var configInit = LuaUtility.Global.Get<GeneralDelegate>("ConfigInit");
- if (configInit != null)
- {
- configInit();
- }
- }
-
-}
diff --git a/Lua/CSharpCallLua.cs.meta b/Lua/CSharpCallLua.cs.meta
deleted file mode 100644
index 684bb9c..0000000
--- a/Lua/CSharpCallLua.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: af00ba7cb648cba4686e8ec2bae4acaf
-timeCreated: 1540557470
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/LuaBehaviour.cs b/Lua/LuaBehaviour.cs
deleted file mode 100644
index ff544a6..0000000
--- a/Lua/LuaBehaviour.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-锘縰sing UnityEngine;
-using XLua;
-using System;
-
-[LuaCallCSharp]
-public class LuaBehaviour : WidgetBehavior
-{
- [CSharpCallLua]
- public delegate void generalDelegate();
-
- public string fileName;
-
- private Action luaOnEnable;
- private Action luaStart;
- private Action luaFixedUpdate;
- private Action luaUpdate;
- private Action luaLateUpdate;
- private Action luaOnDisable;
- private Action luaOnDestroy;
-
- private LuaTable table;
-
- void Awake()
- {
- InitWidgts();
-
- table = LuaUtility.GetNewTable();
- var meta = LuaUtility.GetNewTable();
- meta.Set("__index", LuaUtility.Global);
- table.SetMetaTable(meta);
- meta.Dispose();
-
- table.Set("transform", this.transform);
- table.Set("behavior", this);
- LuaUtility.DoString(fileName, fileName, table);
-
- var luaAwake = table.Get<Action>("Awake");
- table.Get("OnEnable", out luaOnEnable);
- table.Get("Start", out luaStart);
- table.Get("FixedUpdate", out luaFixedUpdate);
- table.Get("Update", out luaUpdate);
- table.Get("LateUpdate", out luaLateUpdate);
- table.Get("OnDisable", out luaOnDisable);
- table.Get("OnDestroy", out luaOnDestroy);
-
- if (luaAwake != null)
- {
- luaAwake();
- }
- }
-
- private void OnEnable()
- {
- if (luaOnEnable != null)
- {
- luaOnEnable();
- }
- }
-
- void Start()
- {
- if (luaStart != null)
- {
- luaStart();
- }
- }
-
- void FixedUpdate()
- {
- if (luaFixedUpdate != null)
- {
- luaFixedUpdate();
- }
- }
-
- void Update()
- {
- if (luaUpdate != null)
- {
- luaUpdate();
- }
- }
-
- void LateUpdate()
- {
- if (luaLateUpdate != null)
- {
- luaLateUpdate();
- }
- }
-
- private void OnDisable()
- {
- if (luaOnDisable != null)
- {
- luaOnDisable();
- }
- }
-
- void OnDestroy()
- {
- if (luaOnDestroy != null)
- {
- luaOnDestroy();
- }
-
- luaOnDisable = null;
- luaOnEnable = null;
- luaOnDestroy = null;
- luaUpdate = null;
- luaStart = null;
- table.Dispose();
- }
-
-}
diff --git a/Lua/LuaBehaviour.cs.meta b/Lua/LuaBehaviour.cs.meta
deleted file mode 100644
index 262463e..0000000
--- a/Lua/LuaBehaviour.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 028ad9d0c327569419d2e22210b67d2d
-timeCreated: 1540173220
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/LuaGameNetSystem.cs b/Lua/LuaGameNetSystem.cs
deleted file mode 100644
index 5c899c0..0000000
--- a/Lua/LuaGameNetSystem.cs
+++ /dev/null
@@ -1,310 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using System;
-using System.Text;
-
-[XLua.LuaCallCSharp]
-public class LuaGameNetPackBase
-{
- public ushort cmd = 0;
- public ushort combineCmd = 0;
-
- List<byte> sendBytes = new List<byte>();
- Action writeBytesAction;
-
- public void RegistWriteToBytes(Action action)
- {
- writeBytesAction = action;
- }
-
- public void WriteShortBytes(ushort value, LuaGameNetSystem.NetDataType type)
- {
- byte[] bytes;
- switch (type)
- {
- case LuaGameNetSystem.NetDataType.BYTE:
- bytes = new byte[1];
- bytes[0] = (byte)(value & 0xFF);
- break;
- case LuaGameNetSystem.NetDataType.WORD:
- bytes = BitConverter.GetBytes((short)value);
- break;
- default:
- bytes = BitConverter.GetBytes((int)value);
- break;
- }
- sendBytes.AddRange(bytes);
- }
-
- public void WriteUintsBytes(uint value, LuaGameNetSystem.NetDataType type)
- {
- byte[] bytes;
- switch (type)
- {
- case LuaGameNetSystem.NetDataType.BYTE:
- bytes = new byte[1];
- bytes[0] = (byte)(value & 0xFF);
- break;
- case LuaGameNetSystem.NetDataType.WORD:
- bytes = BitConverter.GetBytes((short)value);
- break;
- default:
- bytes = BitConverter.GetBytes((int)value);
- break;
- }
- sendBytes.AddRange(bytes);
- }
-
- public void WriteIntsBytes(int value, LuaGameNetSystem.NetDataType type)
- {
- byte[] bytes;
- switch (type)
- {
- case LuaGameNetSystem.NetDataType.BYTE:
- bytes = new byte[1];
- bytes[0] = (byte)(value & 0xFF);
- break;
- case LuaGameNetSystem.NetDataType.WORD:
- bytes = BitConverter.GetBytes((short)value);
- break;
- default:
- bytes = BitConverter.GetBytes((int)value);
- break;
- }
- sendBytes.AddRange(bytes);
- }
-
- public void WriteStringBytes(string value, LuaGameNetSystem.NetDataType type, int length)
- {
- var bytes = stringEncoding.GetBytes(value);
- if (bytes.Length != length)
- {
- Array.Resize(ref bytes, length);
- }
-
- sendBytes.AddRange(bytes);
- }
-
- public void WriteShortsWriteLenBytes(ushort[] values, LuaGameNetSystem.NetDataType type)
- {
- for (var i = 0; i < values.Length; i++)
- {
- WriteShortBytes(values[i], type);
- }
- }
-
- public void WriteIntsWriteLenBytes(int[] values, LuaGameNetSystem.NetDataType type)
- {
- for (var i = 0; i < values.Length; i++)
- {
- WriteIntsBytes(values[i], type);
- }
- }
-
- public void WriteUintsWriteLenBytes(uint[] values, LuaGameNetSystem.NetDataType type)
- {
- for (var i = 0; i < values.Length; i++)
- {
- WriteUintsBytes(values[i], type);
- }
- }
-
- public void Send()
- {
- sendBytes.Add((byte)((cmd & 0xFF00) >> 8));
- sendBytes.Add((byte)(cmd & 0xFF));
-
- if (writeBytesAction != null)
- {
- writeBytesAction();
- }
-
- if (combineCmd != 0)
- {
- var lengthBytes = BitConverter.GetBytes((ushort)sendBytes.Count);
- sendBytes.Insert(0, lengthBytes[1]);
- sendBytes.Insert(0, lengthBytes[0]);
- sendBytes.Insert(0, (byte)(combineCmd & 0xFF));
- sendBytes.Insert(0, (byte)((combineCmd & 0xFF00) >> 8));
- }
-
- GameNetSystem.Instance.SendInfo(sendBytes.ToArray());
- }
-
- int readIndex = 2;
- public uint TransUintBytes(byte[] value, LuaGameNetSystem.NetDataType type)
- {
- var length = GetBytesLength(type);
- var result = 0u;
- switch (type)
- {
- case LuaGameNetSystem.NetDataType.BYTE:
- result = (uint)value[readIndex];
- break;
- case LuaGameNetSystem.NetDataType.WORD:
- result = (ushort)BitConverter.ToUInt16(value, readIndex);
- break;
- case LuaGameNetSystem.NetDataType.DWORD:
- result = BitConverter.ToUInt32(value, readIndex);
- break;
- case LuaGameNetSystem.NetDataType.Int:
- result = (uint)BitConverter.ToInt32(value, readIndex);
- break;
- default:
- Debug.LogError("璇锋寚瀹氭纭殑绫诲瀷銆�");
- break;
- }
-
- readIndex += length;
- return result;
- }
-
- public int TransIntBytes(byte[] value, LuaGameNetSystem.NetDataType type)
- {
- var length = GetBytesLength(type);
- var result = 0;
- switch (type)
- {
- case LuaGameNetSystem.NetDataType.BYTE:
- result = (int)value[readIndex];
- break;
- case LuaGameNetSystem.NetDataType.WORD:
- result = (int)BitConverter.ToUInt16(value, readIndex);
- break;
- case LuaGameNetSystem.NetDataType.DWORD:
- result = (int)BitConverter.ToUInt32(value, readIndex);
- break;
- case LuaGameNetSystem.NetDataType.Int:
- result = BitConverter.ToInt32(value, readIndex);
- break;
- default:
- Debug.LogError("璇锋寚瀹氭纭殑绫诲瀷銆�");
- break;
- }
-
- readIndex += length;
- return result;
- }
-
- public ushort TransUshortBytes(byte[] value, LuaGameNetSystem.NetDataType type)
- {
- var length = GetBytesLength(type);
- var result = (ushort)0;
- switch (type)
- {
- case LuaGameNetSystem.NetDataType.BYTE:
- result = (ushort)value[readIndex];
- readIndex += length;
- break;
- case LuaGameNetSystem.NetDataType.WORD:
- result = BitConverter.ToUInt16(value, readIndex);
- readIndex += length;
- break;
- default:
- Debug.LogError("璇锋寚瀹氭纭殑绫诲瀷銆�");
- break;
- }
-
- return result;
- }
-
- public byte TransByteBytes(byte[] value, LuaGameNetSystem.NetDataType type)
- {
- var result = value[readIndex];
- readIndex += GetBytesLength(type);
- return result;
- }
-
- static Encoding stringEncoding = Encoding.UTF8;
- public string TransStringBytes(byte[] value, LuaGameNetSystem.NetDataType type, int length)
- {
- if (value.Length < readIndex + length)
- {
- DebugEx.LogError("灏佸寘闀垮害涓嶈冻銆�");
- return string.Empty;
- }
- else
- {
- var result = stringEncoding.GetString(value, readIndex, length);
- readIndex += length;
- return result;
- }
- }
-
- public uint[] TransVShortsBytes(byte[] value, LuaGameNetSystem.NetDataType type, int length)
- {
- var array = new uint[length];
- for (var i = 0; i < length; i++)
- {
- switch (type)
- {
- case LuaGameNetSystem.NetDataType.BYTE:
- array[i] = TransByteBytes(value, type);
- break;
- case LuaGameNetSystem.NetDataType.WORD:
- array[i] = TransUshortBytes(value, type);
- break;
- case LuaGameNetSystem.NetDataType.Int:
- array[i] = (uint)TransIntBytes(value, type);
- break;
- case LuaGameNetSystem.NetDataType.DWORD:
- array[i] = TransUintBytes(value, type);
- break;
- default:
- Debug.LogError("璇锋寚瀹氭纭殑绫诲瀷銆�");
- break;
- }
- }
-
- return array;
- }
-
- static int GetBytesLength(LuaGameNetSystem.NetDataType type)
- {
- var step = 1;
- switch (type)
- {
- case LuaGameNetSystem.NetDataType.BYTE:
- step = 1;
- break;
- case LuaGameNetSystem.NetDataType.WORD:
- step = 2;
- break;
- case LuaGameNetSystem.NetDataType.DWORD:
- step = 4;
- break;
- case LuaGameNetSystem.NetDataType.Int:
- step = 4;
- break;
- case LuaGameNetSystem.NetDataType.Double:
- step = 4;
- break;
- default:
- break;
- }
-
- return step;
- }
-}
-
-[XLua.LuaCallCSharp]
-public class LuaGameNetSystem
-{
-
- public static LuaGameNetPackBase New()
- {
- return new LuaGameNetPackBase();
- }
-
- public enum NetDataType
- {
- BYTE,
- WORD,
- DWORD,
- Chars,
- Int,
- Double
- }
-
-}
diff --git a/Lua/LuaGameNetSystem.cs.meta b/Lua/LuaGameNetSystem.cs.meta
deleted file mode 100644
index 75d6424..0000000
--- a/Lua/LuaGameNetSystem.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 5e300c360f92a7a4a8f55568a5346e98
-timeCreated: 1540260844
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/LuaGenEx.cs b/Lua/LuaGenEx.cs
deleted file mode 100644
index 98a76c6..0000000
--- a/Lua/LuaGenEx.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using System;
-using XLua;
-using UnityEngine.UI;
-using Snxxz.UI;
-
-public static class LuaGenEx
-{
-
- //lua涓浣跨敤鍒癈#搴撶殑閰嶇疆锛屾瘮濡侰#鏍囧噯搴擄紝鎴栬�匲nity API锛岀涓夋柟搴撶瓑銆�
- [LuaCallCSharp]
- public static List<Type> LuaCallCSharp = new List<Type>() {
- typeof(System.Object),
- typeof(UnityEngine.Object),
- typeof(Vector2),
- typeof(Vector3),
- typeof(Vector4),
- typeof(Quaternion),
- typeof(Color),
- typeof(Ray),
- typeof(Bounds),
- typeof(Ray2D),
- typeof(Time),
- typeof(GameObject),
- typeof(Component),
- typeof(Behaviour),
- typeof(Transform),
- typeof(Resources),
- typeof(TextAsset),
- typeof(Keyframe),
- typeof(AnimationCurve),
- typeof(AnimationClip),
- typeof(MonoBehaviour),
- typeof(ParticleSystem),
- typeof(SkinnedMeshRenderer),
- typeof(Renderer),
- typeof(WWW),
- typeof(Light),
- typeof(Mathf),
- typeof(System.Collections.Generic.List<int>),
- typeof(Action<string>),
- typeof(Debug),
- typeof(ScrollRect),
- typeof(Button),
- typeof(Image),
- typeof(Text),
- typeof(RawImage),
- typeof(InputField),
- typeof(Enum),
- typeof(RectTransformUtility),
- typeof(Input),
- };
-
- //C#闈欐�佽皟鐢↙ua鐨勯厤缃紙鍖呮嫭浜嬩欢鐨勫師鍨嬶級锛屼粎鍙互閰峝elegate锛宨nterface
- [CSharpCallLua]
- public static List<Type> CSharpCallLua = new List<Type>() {
- typeof(Action),
- typeof(Func<double, double, double>),
- typeof(Action<string>),
- typeof(Action<double>),
- typeof(Action<PlayerDataType>),
- typeof(Action<int>),
- typeof(UnityEngine.Events.UnityAction),
- typeof(System.Collections.IEnumerator),
- typeof( Action<PackType, int, int> ),
- typeof(System.Action<Window>),
- typeof(System.Action<bool>),
- };
-
- //榛戝悕鍗�
- [BlackList]
- public static List<List<string>> BlackList = new List<List<string>>() {
- new List<string>(){"System.Xml.XmlNodeList", "ItemOf"},
- new List<string>(){"UnityEngine.WWW", "movie"},
- new List<string>(){ "UnityEngine.UI.Text","OnRebuildRequested"},
- new List<string>(){ "UnityEngine.Input","IsJoystickPreconfigured","System.String"},
- #if UNITY_WEBGL
- new List<string>(){"UnityEngine.WWW", "threadPriority"},
- #endif
- new List<string>(){"UnityEngine.Texture2D", "alphaIsTransparency"},
- new List<string>(){"UnityEngine.Security", "GetChainOfTrustValue"},
- new List<string>(){"UnityEngine.CanvasRenderer", "onRequestRebuild"},
- new List<string>(){"UnityEngine.Light", "areaSize"},
- #if UNITY_2017_1_OR_NEWER
- new List<string>(){"UnityEngine.Light", "lightmapBakeType"},
- new List<string>(){"UnityEngine.WWW", "MovieTexture"},
- new List<string>(){"UnityEngine.WWW", "GetMovieTexture"},
- #endif
- new List<string>(){"UnityEngine.AnimatorOverrideController", "PerformOverrideClipListCleanup"},
- #if !UNITY_WEBPLAYER
- new List<string>(){"UnityEngine.Application", "ExternalEval"},
- #endif
- new List<string>(){"UnityEngine.GameObject", "networkView"}, //4.6.2 not support
- new List<string>(){"UnityEngine.Component", "networkView"}, //4.6.2 not support
- new List<string>(){"System.IO.FileInfo", "GetAccessControl", "System.Security.AccessControl.AccessControlSections"},
- new List<string>(){"System.IO.FileInfo", "SetAccessControl", "System.Security.AccessControl.FileSecurity"},
- new List<string>(){"System.IO.DirectoryInfo", "GetAccessControl", "System.Security.AccessControl.AccessControlSections"},
- new List<string>(){"System.IO.DirectoryInfo", "SetAccessControl", "System.Security.AccessControl.DirectorySecurity"},
- new List<string>(){"System.IO.DirectoryInfo", "CreateSubdirectory", "System.String", "System.Security.AccessControl.DirectorySecurity"},
- new List<string>(){"System.IO.DirectoryInfo", "Create", "System.Security.AccessControl.DirectorySecurity"},
- new List<string>(){"UnityEngine.MonoBehaviour", "runInEditMode"},
- #if !UNITY_5_6_OR_NEWER
-
- #endif
- };
-}
diff --git a/Lua/LuaGenEx.cs.meta b/Lua/LuaGenEx.cs.meta
deleted file mode 100644
index 74c2f0c..0000000
--- a/Lua/LuaGenEx.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 32d66d052e577804b82262f75985c9c8
-timeCreated: 1540964674
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/LuaLaunch.cs b/Lua/LuaLaunch.cs
deleted file mode 100644
index 56ebf6a..0000000
--- a/Lua/LuaLaunch.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class LuaLaunch : MonoBehaviour
-{
-
- void Awake()
- {
- }
-
-}
diff --git a/Lua/LuaLaunch.cs.meta b/Lua/LuaLaunch.cs.meta
deleted file mode 100644
index 7b1e551..0000000
--- a/Lua/LuaLaunch.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: a1c7a84d58094b247ac2f6da3b5b224f
-timeCreated: 1533283530
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/LuaModelUtility.cs b/Lua/LuaModelUtility.cs
deleted file mode 100644
index 686d35f..0000000
--- a/Lua/LuaModelUtility.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using Snxxz.UI;
-
-[XLua.LuaCallCSharp]
-public class ModelUtility
-{
-
- public static DungeonModel dungeonModel {
- get {
- return ModelCenter.Instance.GetModel<DungeonModel>();
- }
- }
-
- public static VipModel vipModel {
- get {
- return ModelCenter.Instance.GetModel<VipModel>();
- }
- }
-
-}
diff --git a/Lua/LuaModelUtility.cs.meta b/Lua/LuaModelUtility.cs.meta
deleted file mode 100644
index 65d13cd..0000000
--- a/Lua/LuaModelUtility.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 10b5a3c7eda80df4eafde3d6f8dab159
-timeCreated: 1540180766
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/LuaOneLevelWindow.cs b/Lua/LuaOneLevelWindow.cs
deleted file mode 100644
index 3ca06c5..0000000
--- a/Lua/LuaOneLevelWindow.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-锘縰sing UnityEngine;
-using System.Collections;
-using System.Collections.Generic;
-using XLua;
-using System;
-using System.IO;
-using Snxxz.UI;
-
-[LuaCallCSharp]
-public class LuaOneLevelWindow : OneLevelWin
-{
-
- public string filePath = "";
-
- Action luaOnDestroy;
-
- Action onBindController;
- Action onAddListeners;
- Action onPreOpen;
- Action onAfterOpen;
- Action onPreClose;
- Action onAfterClose;
- Action onActived;
- Action onLateUpdate;
-
- private LuaTable table;
-
- private void Init()
- {
- table = LuaUtility.GetNewTable();
- var meta = LuaUtility.GetNewTable();
- meta.Set("__index", LuaUtility.Global);
- table.SetMetaTable(meta);
- meta.Dispose();
-
- LuaUtility.DoString(filePath, this.gameObject.name, table);
-
- table.Get("BindController", out onBindController);
- table.Get("AddListeners", out onAddListeners);
- table.Get("OnPreOpen", out onPreOpen);
- table.Get("OnAfterOpen", out onAfterOpen);
- table.Get("OnPreClose", out onPreClose);
- table.Get("OnAfterClose", out onAfterClose);
- table.Get("OnActived", out onActived);
- table.Get("LateUpdate", out onLateUpdate);
-
- table.Get("OnDestroy", out luaOnDestroy);
- }
-
- public void CloseAllChildWindow()
- {
- CloseSubWindows();
- }
-
- void OnDestroy()
- {
- if (luaOnDestroy != null)
- {
- luaOnDestroy();
- }
-
- luaOnDestroy = null;
- onBindController = null;
- onAddListeners = null;
- onPreOpen = null;
- onAfterOpen = null;
- onPreClose = null;
- onAfterClose = null;
- onActived = null;
- onLateUpdate = null;
-
- if (table != null)
- {
- table.Dispose();
- }
- }
-
- protected override void BindController()
- {
- Init();
-
- base.BindController();
- if (onBindController != null)
- {
- onBindController();
- }
- }
-
- protected override void AddListeners()
- {
- base.AddListeners();
- if (onAddListeners != null)
- {
- onAddListeners();
- }
- }
-
- protected override void OnPreOpen()
- {
- base.OnPreOpen();
- if (onPreOpen != null)
- {
- onPreOpen();
- }
- }
-
- protected override void OnAfterOpen()
- {
- base.OnAfterOpen();
- if (onAfterOpen != null)
- {
- onAfterOpen();
- }
- }
-
- protected override void OnPreClose()
- {
- if (onPreClose != null)
- {
- onPreClose();
- }
-
- base.OnPreClose();
- }
-
- protected override void OnAfterClose()
- {
- if (onAfterClose != null)
- {
- onAfterClose();
- }
-
- base.OnAfterClose();
- }
-
- protected override void OnActived()
- {
- base.OnActived();
-
- if (onActived != null)
- {
- onActived();
- }
- }
-
- protected override void LateUpdate()
- {
- base.LateUpdate();
-
- if (onLateUpdate != null)
- {
- onLateUpdate();
- }
- }
-
-}
diff --git a/Lua/LuaOneLevelWindow.cs.meta b/Lua/LuaOneLevelWindow.cs.meta
deleted file mode 100644
index e5aff74..0000000
--- a/Lua/LuaOneLevelWindow.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: a523987fed173424e9cb9692b9b7ce49
-timeCreated: 1534318225
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/LuaUtility.cs b/Lua/LuaUtility.cs
deleted file mode 100644
index ee9ab3c..0000000
--- a/Lua/LuaUtility.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using XLua;
-using System.IO;
-
-public class LuaUtility : SingletonMonobehaviour<LuaUtility>
-{
- public readonly static LuaEnv env = new LuaEnv();
- static float lastGCTime = 0;
- const float GCInterval = 1;//1 second
-
- static LuaUtility()
- {
- env.AddLoader(new LuaEnv.CustomLoader(LoadAssetBytes));
-
- env.AddBuildin("rapidjson", XLua.LuaDLL.Lua.LoadRapidJson);
- env.AddBuildin("lpeg", XLua.LuaDLL.Lua.LoadLpeg);
- env.AddBuildin("pb", XLua.LuaDLL.Lua.LoadLuaProfobuf);
- }
-
- public static LuaTable GetNewTable()
- {
- return env.NewTable();
- }
-
- public static LuaTable Global {
- get { return env.Global; }
- }
-
- public static void Init()
- {
- }
-
- void Update()
- {
- if (Time.time - lastGCTime > GCInterval)
- {
- env.Tick();
- lastGCTime = Time.time;
- }
- }
-
- public static void Do(string _file, string chunkName = "chunk", LuaTable _table = null)
- {
- var command = string.Format("require '{0}'", _file);
- env.DoString(command, chunkName, _table);
- }
-
- public static void DoString(string _file, string chunkName = "chunk", LuaTable _table = null)
- {
- var content = LoadAsset(ref _file);
- env.DoString(content, chunkName, _table);
- }
-
- private static string LoadAsset(ref string file)
- {
- file = file.Replace('.', '/');
-
- var path = string.Empty;
- if (AssetSource.luaFromEditor)
- {
- path = ResourcesPath.LUA_FODLER + "/" + file + ".lua";
- return File.ReadAllText(path);
- }
- else
- {
- var index = file.LastIndexOf("/");
- var assetBundle = StringUtility.Contact("lua/", file.Substring(0, index)).ToLower();
- var assetName = file.Substring(index + 1, file.Length - (index + 1));
- var asset = AssetBundleUtility.Instance.Sync_LoadAsset(assetBundle, assetName) as TextAsset;
- return asset.text;
- }
- }
-
- private static byte[] LoadAssetBytes(ref string _fileName)
- {
- return System.Text.Encoding.UTF8.GetBytes(LoadAsset(ref _fileName));
- }
-}
diff --git a/Lua/LuaUtility.cs.meta b/Lua/LuaUtility.cs.meta
deleted file mode 100644
index 8571dd4..0000000
--- a/Lua/LuaUtility.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 1cda39260931b2f4690636dbfa36287a
-timeCreated: 1533282695
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/LuaWindow.cs b/Lua/LuaWindow.cs
deleted file mode 100644
index ca1de06..0000000
--- a/Lua/LuaWindow.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-锘縰sing UnityEngine;
-using System.Collections;
-using System.Collections.Generic;
-using XLua;
-using System;
-using System.IO;
-using Snxxz.UI;
-
-[XLua.LuaCallCSharp]
-public class LuaWindow : Window
-{
-
- public string filePath = "";
-
- Action luaOnDestroy;
-
- Action onBindController;
- Action onAddListeners;
- Action onPreOpen;
- Action onAfterOpen;
- Action onPreClose;
- Action onAfterClose;
- Action onActived;
- Action onLateUpdate;
-
- private LuaTable table;
-
- private void Init()
- {
- table = LuaUtility.GetNewTable();
- var meta = LuaUtility.GetNewTable();
- meta.Set("__index", LuaUtility.Global);
- table.SetMetaTable(meta);
- meta.Dispose();
-
- LuaUtility.DoString(filePath, this.gameObject.name, table);
-
- table.Get("BindController", out onBindController);
- table.Get("AddListeners", out onAddListeners);
- table.Get("OnPreOpen", out onPreOpen);
- table.Get("OnAfterOpen", out onAfterOpen);
- table.Get("OnPreClose", out onPreClose);
- table.Get("OnAfterClose", out onAfterClose);
- table.Get("OnActived", out onActived);
- table.Get("LateUpdate", out onLateUpdate);
- table.Get("OnDestroy", out luaOnDestroy);
- }
-
- void OnDestroy()
- {
- if (luaOnDestroy != null)
- {
- luaOnDestroy();
- }
-
- luaOnDestroy = null;
- onBindController = null;
- onAddListeners = null;
- onPreOpen = null;
- onAfterOpen = null;
- onPreClose = null;
- onAfterClose = null;
- onActived = null;
- onLateUpdate = null;
-
- if (table != null)
- {
- table.Dispose();
- }
- }
-
- protected override void BindController()
- {
- Init();
-
- if (onBindController != null)
- {
- onBindController();
- }
- }
-
- protected override void AddListeners()
- {
- if (onAddListeners != null)
- {
- onAddListeners();
- }
- }
-
- protected override void OnPreOpen()
- {
- if (onPreOpen != null)
- {
- onPreOpen();
- }
- }
-
- protected override void OnAfterOpen()
- {
- if (onAfterOpen != null)
- {
- onAfterOpen();
- }
- }
-
- protected override void OnPreClose()
- {
- if (onPreClose != null)
- {
- onPreClose();
- }
- }
-
- protected override void OnAfterClose()
- {
- if (onAfterClose != null)
- {
- onAfterClose();
- }
- }
-
- protected override void OnActived()
- {
- base.OnActived();
-
- if (onActived != null)
- {
- onActived();
- }
- }
-
- protected override void LateUpdate()
- {
- base.LateUpdate();
-
- if (onLateUpdate != null)
- {
- onLateUpdate();
- }
- }
-
-}
diff --git a/Lua/LuaWindow.cs.meta b/Lua/LuaWindow.cs.meta
deleted file mode 100644
index 55ed257..0000000
--- a/Lua/LuaWindow.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: f203b48cd7ee2084fa734cc0b287c02d
-timeCreated: 1534318225
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/LuaWindowUtility.cs b/Lua/LuaWindowUtility.cs
deleted file mode 100644
index 2665c71..0000000
--- a/Lua/LuaWindowUtility.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using Snxxz.UI;
-
-[XLua.LuaCallCSharp]
-public class LuaWindowUtility
-{
- public static void Open(string _name, bool _forceSync = false, int _functionalOrder = 0)
- {
- WindowCenter.Instance.Open(_name, _forceSync, _functionalOrder);
- }
-
- public static Window Get(string _name)
- {
- return WindowCenter.Instance.Get(_name);
- }
-
- public static void Close(string _name)
- {
- WindowCenter.Instance.Close(_name);
- }
-
- public static void CloseAll()
- {
- WindowCenter.Instance.CloseAll();
- }
-
- public static void DestroyWin(string _name)
- {
- WindowCenter.Instance.DestroyWin(_name);
- }
-
- public static bool IsOpen(string _name)
- {
- return WindowCenter.Instance.IsOpen(_name);
- }
-
-}
diff --git a/Lua/LuaWindowUtility.cs.meta b/Lua/LuaWindowUtility.cs.meta
deleted file mode 100644
index 438fd3a..0000000
--- a/Lua/LuaWindowUtility.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: d01a9255dd1b980498b7f0296c9d7a4d
-timeCreated: 1534342506
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Achievement/AchievementModel.cs b/System/Achievement/AchievementModel.cs
index 968c92b..e0157fe 100644
--- a/System/Achievement/AchievementModel.cs
+++ b/System/Achievement/AchievementModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class AchievementModel : Model, IBeforePlayerDataInitialize
{
public event Action<int> achievementProgressUpdateEvent;
diff --git a/System/Activity/ActivityModel.cs b/System/Activity/ActivityModel.cs
index c19e68a..877ac0c 100644
--- a/System/Activity/ActivityModel.cs
+++ b/System/Activity/ActivityModel.cs
@@ -8,7 +8,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ActivityModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize
{
HeavenBattleModel battleModel { get { return ModelCenter.Instance.GetModel<HeavenBattleModel>(); } }
diff --git a/System/Alchemy/AlchemyModel.cs b/System/Alchemy/AlchemyModel.cs
index 460d6c6..29d1522 100644
--- a/System/Alchemy/AlchemyModel.cs
+++ b/System/Alchemy/AlchemyModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class AlchemyModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, AlchemyTime> m_AlchemyTimes = new Dictionary<int, AlchemyTime>();
diff --git a/System/AssetVersion/AssetVersionUtility.cs b/System/AssetVersion/AssetVersionUtility.cs
index e61531e..5905325 100644
--- a/System/AssetVersion/AssetVersionUtility.cs
+++ b/System/AssetVersion/AssetVersionUtility.cs
@@ -7,7 +7,7 @@
using System.Threading;
-[XLua.LuaCallCSharp]
+
public class AssetVersionUtility
{
public static string assetVersionsLocalMd5
diff --git a/System/AssetVersion/DownLoadAndDiscompressTask.cs b/System/AssetVersion/DownLoadAndDiscompressTask.cs
index 3665782..e43b699 100644
--- a/System/AssetVersion/DownLoadAndDiscompressTask.cs
+++ b/System/AssetVersion/DownLoadAndDiscompressTask.cs
@@ -5,7 +5,7 @@
using Snxxz.UI;
using System.Threading;
-[XLua.LuaCallCSharp]
+
public class DownLoadAndDiscompressTask : Singleton<DownLoadAndDiscompressTask>
{
diff --git a/System/AssetVersion/DownloadMgr.cs b/System/AssetVersion/DownloadMgr.cs
index d160c02..4335cf6 100644
--- a/System/AssetVersion/DownloadMgr.cs
+++ b/System/AssetVersion/DownloadMgr.cs
@@ -9,7 +9,7 @@
using UnityEngine;
using UnityEngine.Networking;
-[XLua.LuaCallCSharp]
+
public class DownloadMgr : SingletonMonobehaviour<DownloadMgr>
{
#region 閰嶇疆
@@ -176,7 +176,7 @@
}
-[XLua.LuaCallCSharp]
+
public class DownloadTask
{
//涓嬭浇浠诲姟鐘舵��
diff --git a/System/AssetVersion/InGameDownLoad.cs b/System/AssetVersion/InGameDownLoad.cs
index 3bbce7a..8009989 100644
--- a/System/AssetVersion/InGameDownLoad.cs
+++ b/System/AssetVersion/InGameDownLoad.cs
@@ -5,7 +5,7 @@
using Snxxz.UI;
using System.Text.RegularExpressions;
-[XLua.LuaCallCSharp]
+
public class InGameDownLoad : SingletonMonobehaviour<InGameDownLoad>
{
public const int BYTE_PER_KILOBYTE = 1024;//b 杞� kb
diff --git a/System/Auction/AuctionNewGetShowModel.cs b/System/Auction/AuctionNewGetShowModel.cs
index 3c4e297..6b7dab0 100644
--- a/System/Auction/AuctionNewGetShowModel.cs
+++ b/System/Auction/AuctionNewGetShowModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class AuctionNewGetShowModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
List<string> newAuctions = new List<string>();
diff --git a/System/BetterItemGet/BetterEquipGetModel.cs b/System/BetterItemGet/BetterEquipGetModel.cs
index e895eb2..8d1cbfd 100644
--- a/System/BetterItemGet/BetterEquipGetModel.cs
+++ b/System/BetterItemGet/BetterEquipGetModel.cs
@@ -10,7 +10,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class BetterEquipGetModel : Model, IBeforePlayerDataInitialize, ISwitchAccount
{
PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
diff --git a/System/BetterItemGet/ItemUseModel.cs b/System/BetterItemGet/ItemUseModel.cs
index 9f1d4ac..9d6d794 100644
--- a/System/BetterItemGet/ItemUseModel.cs
+++ b/System/BetterItemGet/ItemUseModel.cs
@@ -9,7 +9,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ItemUseModel : Model, IBeforePlayerDataInitialize, ISwitchAccount
{
Dictionary<string, UseItem> itemStack = new Dictionary<string, UseItem>();
diff --git a/System/BetterItemGet/PreciousItemGetModel.cs b/System/BetterItemGet/PreciousItemGetModel.cs
index f33f037..e828fb1 100644
--- a/System/BetterItemGet/PreciousItemGetModel.cs
+++ b/System/BetterItemGet/PreciousItemGetModel.cs
@@ -9,7 +9,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class PreciousItemGetModel : Model, IBeforePlayerDataInitialize, ISwitchAccount, IPlayerLoginOk
{
Dictionary<string, PreciousItem> itemStack = new Dictionary<string, PreciousItem>();
diff --git a/System/BetterItemGet/RealmBetterEquipModel .cs b/System/BetterItemGet/RealmBetterEquipModel .cs
index 85bb125..e909264 100644
--- a/System/BetterItemGet/RealmBetterEquipModel .cs
+++ b/System/BetterItemGet/RealmBetterEquipModel .cs
@@ -10,7 +10,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RealmBetterEquipModel : Model, IBeforePlayerDataInitialize, ISwitchAccount,IPlayerLoginOk
{
PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
diff --git a/System/BossReborn/BossRebornModel.cs b/System/BossReborn/BossRebornModel.cs
index 8bdb951..9e59d8e 100644
--- a/System/BossReborn/BossRebornModel.cs
+++ b/System/BossReborn/BossRebornModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class BossRebornModel : Model, IOpenServerActivity
{
int m_BossRebornIntegral = 0;
@@ -107,16 +107,16 @@
get {
return OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.BossReborn);
}
- }
-
- public bool IsAdvance
- {
- get
- {
- return OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.BossReborn);
- }
- }
-
+ }
+
+ public bool IsAdvance
+ {
+ get
+ {
+ return OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.BossReborn);
+ }
+ }
+
public void UpdateTaskBaseInfos(HAB04_tagMCBossRebornInfo.tagMCBossRebornTaskInfo[] _tasks)
{
foreach (var task in _tasks)
diff --git a/System/BossShow/BossShowModel.cs b/System/BossShow/BossShowModel.cs
index 260bbd0..08d9a45 100644
--- a/System/BossShow/BossShowModel.cs
+++ b/System/BossShow/BossShowModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class BossShowModel : Singleton<BossShowModel>
{
public BossShowModel()
diff --git a/System/Chat/ChatBubbleModel.cs b/System/Chat/ChatBubbleModel.cs
index 3aa8856..eb9f6b1 100644
--- a/System/Chat/ChatBubbleModel.cs
+++ b/System/Chat/ChatBubbleModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ChatBubbleModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public Dictionary<int, ChatBubble> chatBubbles = new Dictionary<int, ChatBubble>();
diff --git a/System/Chat/ChatCenter.cs b/System/Chat/ChatCenter.cs
index c1bb504..d13cb1b 100644
--- a/System/Chat/ChatCenter.cs
+++ b/System/Chat/ChatCenter.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ChatCenter : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, ISwitchAccount
{
RealmModel realmModel { get { return ModelCenter.Instance.GetModel<RealmModel>(); } }
diff --git a/System/Chat/UIFrame.cs b/System/Chat/UIFrame.cs
index 40d8f16..ea778ee 100644
--- a/System/Chat/UIFrame.cs
+++ b/System/Chat/UIFrame.cs
@@ -4,7 +4,7 @@
using UnityEngine;
using UnityEngine.UI;
[RequireComponent(typeof(Image))]
-[XLua.LuaCallCSharp]
+
public class UIFrame : MonoBehaviour {
[SerializeField]
private string frameKey = string.Empty;
diff --git a/System/Chat/UIFrameMgr.cs b/System/Chat/UIFrameMgr.cs
index b302715..7a5b142 100644
--- a/System/Chat/UIFrameMgr.cs
+++ b/System/Chat/UIFrameMgr.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class UIFrameMgr {
private static UIFrameMgr _inst = null;
public static UIFrameMgr Inst {
diff --git a/System/Chat/VoiceHttpRequest.cs b/System/Chat/VoiceHttpRequest.cs
index e8e20e6..000c38f 100644
--- a/System/Chat/VoiceHttpRequest.cs
+++ b/System/Chat/VoiceHttpRequest.cs
@@ -4,7 +4,7 @@
using System.Text;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class VoiceHttpRequest : SingletonMonobehaviour<VoiceHttpRequest>
{
diff --git a/System/ClientVersion/VersionConfig.cs b/System/ClientVersion/VersionConfig.cs
index b9f0007..ac1b702 100644
--- a/System/ClientVersion/VersionConfig.cs
+++ b/System/ClientVersion/VersionConfig.cs
@@ -8,7 +8,7 @@
#endif
[CreateAssetMenu(menuName = "Config/VersionConfig")]
-[XLua.LuaCallCSharp]
+
public class VersionConfig : ScriptableObject
{
public const string VERSION_ALTERNATIVE = "1.100.1";
diff --git a/System/ClientVersion/VersionUtility.cs b/System/ClientVersion/VersionUtility.cs
index afcdef4..db66354 100644
--- a/System/ClientVersion/VersionUtility.cs
+++ b/System/ClientVersion/VersionUtility.cs
@@ -13,7 +13,7 @@
using System.Text;
-[XLua.LuaCallCSharp]
+
public class VersionUtility : Singleton<VersionUtility>
{
//娓彴 pub.hkgame2鍜� pub.hkgame鎸囧悜鍚屼竴涓狪P锛屽洜涓哄悗鍙拌縼绉绘湇鍔″櫒鐢ㄤ袱涓煙鍚嶄繚璇佽縼绉讳笉浼氬嚭闂
diff --git a/System/Compose/New/ComposeWinModel.cs b/System/Compose/New/ComposeWinModel.cs
index 9435c12..ee9413f 100644
--- a/System/Compose/New/ComposeWinModel.cs
+++ b/System/Compose/New/ComposeWinModel.cs
@@ -6,7 +6,7 @@
using LitJson;
-[XLua.LuaCallCSharp]
+
public class ComposeWinModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public event Action UpdateSendComposeEvent;
diff --git a/System/Compose/New/SelectEquipModel.cs b/System/Compose/New/SelectEquipModel.cs
index 2a6da7e..e7bd7c1 100644
--- a/System/Compose/New/SelectEquipModel.cs
+++ b/System/Compose/New/SelectEquipModel.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Linq;
-[XLua.LuaCallCSharp]
+
public class SelectEquipModel : Model
{
ComposeWinModel composeWinModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } }
diff --git a/System/CrossServer/CrossServerUtility.cs b/System/CrossServer/CrossServerUtility.cs
index a58254b..04a11b8 100644
--- a/System/CrossServer/CrossServerUtility.cs
+++ b/System/CrossServer/CrossServerUtility.cs
@@ -3,7 +3,7 @@
using UnityEngine;
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class CrossServerUtility
{
diff --git a/System/CrossServerBoss/CrossServerBossModel.cs b/System/CrossServerBoss/CrossServerBossModel.cs
index 158abe8..6a8a772 100644
--- a/System/CrossServerBoss/CrossServerBossModel.cs
+++ b/System/CrossServerBoss/CrossServerBossModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class CrossServerBossModel : Model, IMapInitOk, IPlayerLoginOk
{
public const int DATA_MAPID = 32020;
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index b145c47..65554ce 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -9,7 +9,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class CrossServerOneVsOneModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, ISwitchAccount, IPlayerLoginOk
{
public string PkResultLocalSaveKey { get; private set; }
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
index 25b2089..233c283 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
@@ -6,7 +6,7 @@
using System.Collections.Generic;
using Snxxz.UI;
//璺ㄦ湇PK濂栧姳淇℃伅
-[XLua.LuaCallCSharp]
+
public class Item_Class
{
public int ItemId;
diff --git a/System/CrossServerOneVsOne/OpponentInformation.cs b/System/CrossServerOneVsOne/OpponentInformation.cs
index e2bd70e..5e36247 100644
--- a/System/CrossServerOneVsOne/OpponentInformation.cs
+++ b/System/CrossServerOneVsOne/OpponentInformation.cs
@@ -1,17 +1,17 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Friday, December 28, 2018
-//--------------------------------------------------------
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Friday, December 28, 2018
+//--------------------------------------------------------
using System;
using System.Collections.Generic;
-using Snxxz.UI;
-
+using Snxxz.UI;
+
namespace Snxxz.UI
-{
- [XLua.LuaCallCSharp]
-
- //瀵规墜淇℃伅
+{
+
+
+ //瀵规墜淇℃伅
public class OpponentInformation : Singleton<OpponentInformation>
{
public int PlayerID { get; private set; } // 鐜╁ID
@@ -45,9 +45,9 @@
ShieldUpdate((int)info.PlayerID, (int)info.ExAttr4);
}
}
- }
-
-}
-
-
-
+ }
+
+}
+
+
+
diff --git a/System/DailyQuest/DailyQuestActionTimer.cs b/System/DailyQuest/DailyQuestActionTimer.cs
index 253d30a..c3c6fce 100644
--- a/System/DailyQuest/DailyQuestActionTimer.cs
+++ b/System/DailyQuest/DailyQuestActionTimer.cs
@@ -10,7 +10,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class DailyQuestActionTimer : SingletonMonobehaviour<DailyQuestActionTimer>
{
diff --git a/System/DailyQuest/DailyQuestModel.cs b/System/DailyQuest/DailyQuestModel.cs
index d1e3f77..dc14a2f 100644
--- a/System/DailyQuest/DailyQuestModel.cs
+++ b/System/DailyQuest/DailyQuestModel.cs
@@ -10,7 +10,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class DailyQuestModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize, IMapInitOk, IAfterPlayerDataInitialize
{
const int DAILYQUEST_REDPOINTID = 78000;
@@ -1499,7 +1499,6 @@
WindowCenter.Instance.Open<CrossServerWin>(false, 1);
break;
default:
- CSharpCallLua.GotoLuaDailyQuest(_id);
break;
}
diff --git a/System/DailyQuest/DayRemind.cs b/System/DailyQuest/DayRemind.cs
index 74c5d78..f5f274a 100644
--- a/System/DailyQuest/DayRemind.cs
+++ b/System/DailyQuest/DayRemind.cs
@@ -3,7 +3,7 @@
using UnityEngine;
using System;
-[XLua.LuaCallCSharp]
+
public class DayRemind
{
diff --git a/System/DailyQuest/ResourcesBackModel.cs b/System/DailyQuest/ResourcesBackModel.cs
index 46ad72a..86d7e79 100644
--- a/System/DailyQuest/ResourcesBackModel.cs
+++ b/System/DailyQuest/ResourcesBackModel.cs
@@ -68,7 +68,7 @@
item,
sp,
}
- [XLua.LuaCallCSharp]
+
public class ResourcesBackModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/Debug/DebugUtility.cs b/System/Debug/DebugUtility.cs
index 1e3fb47..0391584 100644
--- a/System/Debug/DebugUtility.cs
+++ b/System/Debug/DebugUtility.cs
@@ -6,7 +6,7 @@
using System.IO;
using UnityEngine.UI;
-[XLua.LuaCallCSharp]
+
public class DebugUtility : Singleton<DebugUtility>
{
const string url = "http://pub.hkgame2.secondworld.net.cn:11000/dbg_player/?";
diff --git a/System/Dogz/DogzModel.cs b/System/Dogz/DogzModel.cs
index f5d3b20..af19fb9 100644
--- a/System/Dogz/DogzModel.cs
+++ b/System/Dogz/DogzModel.cs
@@ -6,7 +6,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class DogzModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk
{
Dictionary<int, string> m_StarLevelLabels;
diff --git a/System/Dogz/DogzPackModel.cs b/System/Dogz/DogzPackModel.cs
index 0f029e9..2581fbc 100644
--- a/System/Dogz/DogzPackModel.cs
+++ b/System/Dogz/DogzPackModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class DogzPackModel : Model
{
PackModel m_PlayerPackModel
diff --git a/System/Dungeon/DungeonAssistModel.cs b/System/Dungeon/DungeonAssistModel.cs
index cf35fb6..80f06a7 100644
--- a/System/Dungeon/DungeonAssistModel.cs
+++ b/System/Dungeon/DungeonAssistModel.cs
@@ -9,7 +9,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class DungeonAssistModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk
{
//public string helpInfoLocalSave { get; private set; }
diff --git a/System/Dungeon/DungeonData.cs b/System/Dungeon/DungeonData.cs
index 56e86e0..9cda57a 100644
--- a/System/Dungeon/DungeonData.cs
+++ b/System/Dungeon/DungeonData.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public struct Dungeon
{
public int mapId;
diff --git a/System/Dungeon/DungeonLiquidModel.cs b/System/Dungeon/DungeonLiquidModel.cs
index 4b6789e..1c47a73 100644
--- a/System/Dungeon/DungeonLiquidModel.cs
+++ b/System/Dungeon/DungeonLiquidModel.cs
@@ -4,7 +4,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class DungeonLiquidModel : Model
{
public Dictionary<int, Dictionary<int, StoreConfig>> liquidStoreDict = new Dictionary<int, Dictionary<int, StoreConfig>>();
diff --git a/System/Dungeon/DungeonModel.cs b/System/Dungeon/DungeonModel.cs
index 2e48a35..1776443 100644
--- a/System/Dungeon/DungeonModel.cs
+++ b/System/Dungeon/DungeonModel.cs
@@ -8,7 +8,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class DungeonModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize
{
Dictionary<int, Dictionary<int, int>> dungeonMap = new Dictionary<int, Dictionary<int, int>>();//mapid,lineId,DungeonId;
diff --git a/System/Dungeon/DungeonNuwaModel.cs b/System/Dungeon/DungeonNuwaModel.cs
index 0d5ab90..fe60359 100644
--- a/System/Dungeon/DungeonNuwaModel.cs
+++ b/System/Dungeon/DungeonNuwaModel.cs
@@ -1,9 +1,9 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class DungeonNuwaModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, List<Item>> floorRewardDict = new Dictionary<int, List<Item>>();
@@ -155,5 +155,5 @@
return false;
}
}
-}
-
+}
+
diff --git a/System/Dungeon/DungeonUseBuffModel.cs b/System/Dungeon/DungeonUseBuffModel.cs
index 8dee2ff..8a1b0b5 100644
--- a/System/Dungeon/DungeonUseBuffModel.cs
+++ b/System/Dungeon/DungeonUseBuffModel.cs
@@ -1,10 +1,10 @@
锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class DungeonUseBuffModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, List<int>> m_UseBuffMaps = new Dictionary<int, List<int>>();
@@ -93,5 +93,5 @@
}
}
}
-}
-
+}
+
diff --git a/System/Dungeon/IceCrystalVeinModel.cs b/System/Dungeon/IceCrystalVeinModel.cs
index a21144d..7db71d7 100644
--- a/System/Dungeon/IceCrystalVeinModel.cs
+++ b/System/Dungeon/IceCrystalVeinModel.cs
@@ -7,7 +7,7 @@
using System.Collections.Generic;
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class IceLodeStarAwardClass
{
public int Index;
diff --git a/System/Dungeon/TrialDungeonModel.cs b/System/Dungeon/TrialDungeonModel.cs
index f56b4d7..c6d6c43 100644
--- a/System/Dungeon/TrialDungeonModel.cs
+++ b/System/Dungeon/TrialDungeonModel.cs
@@ -6,7 +6,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class TrialDungeonModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, Dictionary<int, Item[]>> trialRewardDict = new Dictionary<int, Dictionary<int, Item[]>>();
diff --git a/System/Equip/EquipFightPower.cs b/System/Equip/EquipFightPower.cs
index 330df0f..7cd36d4 100644
--- a/System/Equip/EquipFightPower.cs
+++ b/System/Equip/EquipFightPower.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class EquipFightPower : Singleton<EquipFightPower>
{
PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
diff --git a/System/Equip/EquipModel.cs b/System/Equip/EquipModel.cs
index 268308a..7a66cf8 100644
--- a/System/Equip/EquipModel.cs
+++ b/System/Equip/EquipModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class EquipModel : Model, IAfterPlayerDataInitialize, IPlayerLoginOk
{
public static readonly List<int> realmEquipTypes = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
diff --git a/System/EquipGem/EquipGemModel.cs b/System/EquipGem/EquipGemModel.cs
index bffd914..df43b45 100644
--- a/System/EquipGem/EquipGemModel.cs
+++ b/System/EquipGem/EquipGemModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class EquipGemModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/EquipGem/EquipStrengthModel.cs b/System/EquipGem/EquipStrengthModel.cs
index 83cbfac..89d4bcc 100644
--- a/System/EquipGem/EquipStrengthModel.cs
+++ b/System/EquipGem/EquipStrengthModel.cs
@@ -45,7 +45,7 @@
public string AttrName;
}
- [XLua.LuaCallCSharp]
+
public class EquipStrengthModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public Dictionary<int, EquipStrength> EquipStrengthDic = new Dictionary<int, EquipStrength>();//寮哄寲鏁版嵁
diff --git a/System/EquipStar/EquipStarModel.cs b/System/EquipStar/EquipStarModel.cs
index 3cfc952..25ce5d1 100644
--- a/System/EquipStar/EquipStarModel.cs
+++ b/System/EquipStar/EquipStarModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class EquipStarModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize
{
public readonly LogicInt selectedLevel = new LogicInt();
diff --git a/System/EquipTrain/EquipTrainModel.cs b/System/EquipTrain/EquipTrainModel.cs
index 4f8d1ca..f2e9a0a 100644
--- a/System/EquipTrain/EquipTrainModel.cs
+++ b/System/EquipTrain/EquipTrainModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class EquipTrainModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize
{
public readonly LogicInt selectedLevel = new LogicInt();
diff --git a/System/FairyAu/AllianceBossModel.cs b/System/FairyAu/AllianceBossModel.cs
index 8758c6b..9fb84c3 100644
--- a/System/FairyAu/AllianceBossModel.cs
+++ b/System/FairyAu/AllianceBossModel.cs
@@ -4,7 +4,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class AllianceBossModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/FairyAu/FairyBossModel.cs b/System/FairyAu/FairyBossModel.cs
index dab668a..f0677e8 100644
--- a/System/FairyAu/FairyBossModel.cs
+++ b/System/FairyAu/FairyBossModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FairyBossModel : Model
{
public override void Init()
@@ -76,9 +76,9 @@
for (int i = 0; i < configs.Count; i++)
{
fairyBossWeekCntDict.Add(configs[i].familyLV, configs[i].bossFBCnt);
- if (fairyLevelLimit == 0 && configs[i].bossFBCnt > 0)
- {
- fairyLevelLimit = configs[i].familyLV;
+ if (fairyLevelLimit == 0 && configs[i].bossFBCnt > 0)
+ {
+ fairyLevelLimit = configs[i].familyLV;
}
}
diff --git a/System/FairyAu/FairyFeastModel.cs b/System/FairyAu/FairyFeastModel.cs
index 2ede5c6..d653856 100644
--- a/System/FairyAu/FairyFeastModel.cs
+++ b/System/FairyAu/FairyFeastModel.cs
@@ -1,11 +1,11 @@
锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections;
+using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FairyFeastModel : Model, IBeforePlayerDataInitialize
{
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
@@ -187,5 +187,5 @@
}
}
}
-}
-
+}
+
diff --git a/System/FairyAu/FairyLeagueModel.cs b/System/FairyAu/FairyLeagueModel.cs
index 2fd3592..4bb7880 100644
--- a/System/FairyAu/FairyLeagueModel.cs
+++ b/System/FairyAu/FairyLeagueModel.cs
@@ -10,7 +10,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FairyLeagueModel : Model, IAfterPlayerDataInitialize, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
public event Action OnRefreshFairyLeagueEvent;
diff --git a/System/FairyAu/FairyModel.cs b/System/FairyAu/FairyModel.cs
index 53cdf82..2bf4f7e 100644
--- a/System/FairyAu/FairyModel.cs
+++ b/System/FairyAu/FairyModel.cs
@@ -6,7 +6,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FairyModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public int changeNotifyLevelLimit { get; private set; }
diff --git a/System/FairyAu/KingFairyModel.cs b/System/FairyAu/KingFairyModel.cs
index f1e8b36..81a28cf 100644
--- a/System/FairyAu/KingFairyModel.cs
+++ b/System/FairyAu/KingFairyModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class KingFairyModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public override void Init()
diff --git a/System/FairyAu/UnionTaskModel.cs b/System/FairyAu/UnionTaskModel.cs
index cfce7db..2c9381d 100644
--- a/System/FairyAu/UnionTaskModel.cs
+++ b/System/FairyAu/UnionTaskModel.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
-[XLua.LuaCallCSharp]
+
public class UnionTaskModel : Model,IBeforePlayerDataInitialize
{
private FuncConfigConfig _tagFuncModel;
diff --git a/System/FairylandCeremony/FairylandCeremonyModel.cs b/System/FairylandCeremony/FairylandCeremonyModel.cs
index 0cfb170..7dfdf9d 100644
--- a/System/FairylandCeremony/FairylandCeremonyModel.cs
+++ b/System/FairylandCeremony/FairylandCeremonyModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FairylandCeremonyModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk
{
public ReceiveState receiveState { get; private set; }
diff --git a/System/FakeDungeon/FakeDungeonUtility.cs b/System/FakeDungeon/FakeDungeonUtility.cs
index 239c6cd..0c73d5c 100644
--- a/System/FakeDungeon/FakeDungeonUtility.cs
+++ b/System/FakeDungeon/FakeDungeonUtility.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class FakeDungeonUtility : Singleton<FakeDungeonUtility>
{
diff --git a/System/FashionDress/FashionDecomposeModel.cs b/System/FashionDress/FashionDecomposeModel.cs
index 948d68c..964ae48 100644
--- a/System/FashionDress/FashionDecomposeModel.cs
+++ b/System/FashionDress/FashionDecomposeModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FashionDecomposeModel : Singleton<FashionDecomposeModel>
{
diff --git a/System/FashionDress/FashionDressModel.cs b/System/FashionDress/FashionDressModel.cs
index db0d06a..8863e73 100644
--- a/System/FashionDress/FashionDressModel.cs
+++ b/System/FashionDress/FashionDressModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FashionDressModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, FashionDress> fashionDressDict = new Dictionary<int, FashionDress>();
diff --git a/System/FindPrecious/BossHomeModel.cs b/System/FindPrecious/BossHomeModel.cs
index 3c1ddf0..d2af942 100644
--- a/System/FindPrecious/BossHomeModel.cs
+++ b/System/FindPrecious/BossHomeModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class BossHomeModel : Model
{
public const int BOSSHOME_MAPID = 31270;
diff --git a/System/FindPrecious/DemonJarModel.cs b/System/FindPrecious/DemonJarModel.cs
index 2e4c31b..5c1834d 100644
--- a/System/FindPrecious/DemonJarModel.cs
+++ b/System/FindPrecious/DemonJarModel.cs
@@ -9,7 +9,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class DemonJarModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, ISwitchAccount, IPlayerLoginOk
{
public const int TOTALTIME_LIMIT = 3;
diff --git a/System/FindPrecious/ElderGodAreaModel.cs b/System/FindPrecious/ElderGodAreaModel.cs
index cc0aa42..8593b35 100644
--- a/System/FindPrecious/ElderGodAreaModel.cs
+++ b/System/FindPrecious/ElderGodAreaModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ElderGodAreaModel : Model, IMapInitOk
{
diff --git a/System/FindPrecious/FindPreciousModel.cs b/System/FindPrecious/FindPreciousModel.cs
index d3a2cc5..1b5e278 100644
--- a/System/FindPrecious/FindPreciousModel.cs
+++ b/System/FindPrecious/FindPreciousModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FindPreciousModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk, IMapInitOk, ISwitchAccount
{
public const int PREPOSE_SECONDS = 120;
diff --git a/System/FindPrecious/FindPreciousTimer.cs b/System/FindPrecious/FindPreciousTimer.cs
index bdd15bb..bf29f67 100644
--- a/System/FindPrecious/FindPreciousTimer.cs
+++ b/System/FindPrecious/FindPreciousTimer.cs
@@ -11,7 +11,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FindPreciousTimer : SingletonMonobehaviour<FindPreciousTimer>
{
diff --git a/System/FindPrecious/PersonalBossModel.cs b/System/FindPrecious/PersonalBossModel.cs
index 52a0ad1..4ffe88d 100644
--- a/System/FindPrecious/PersonalBossModel.cs
+++ b/System/FindPrecious/PersonalBossModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class PersonalBossModel : Model
{
public const int PERSONALBOSS_MAPID = 31240;
diff --git a/System/FindPrecious/RewardPreviewGroup.cs b/System/FindPrecious/RewardPreviewGroup.cs
index 8b96220..0d023a2 100644
--- a/System/FindPrecious/RewardPreviewGroup.cs
+++ b/System/FindPrecious/RewardPreviewGroup.cs
@@ -10,7 +10,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RewardPreviewGroup : MonoBehaviour
{
[SerializeField] ItemBehaviour[] m_ItemBehaviours;
diff --git a/System/FindPrecious/WorldBossModel.cs b/System/FindPrecious/WorldBossModel.cs
index 757eaf8..12423b6 100644
--- a/System/FindPrecious/WorldBossModel.cs
+++ b/System/FindPrecious/WorldBossModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class WorldBossModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public const int WORLDBOSS_REDPOINT = 76001;
diff --git a/System/FriendSystem/FriendsModel.cs b/System/FriendSystem/FriendsModel.cs
index f228367..e20f891 100644
--- a/System/FriendSystem/FriendsModel.cs
+++ b/System/FriendSystem/FriendsModel.cs
@@ -36,7 +36,7 @@
None,
}
-[XLua.LuaCallCSharp]
+
public class FriendsModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize
{
TeamModel _teamModel;
diff --git a/System/GMCommand/GMCmdModel.cs b/System/GMCommand/GMCmdModel.cs
index aabbe9b..1395bb4 100644
--- a/System/GMCommand/GMCmdModel.cs
+++ b/System/GMCommand/GMCmdModel.cs
@@ -4,7 +4,7 @@
using System.Text;
using System;
-[XLua.LuaCallCSharp]
+
public class GMCmdModel : Model
{
public const string Record_CmdKey = "Record_CmdKey";
diff --git a/System/GatheringSoul/GatherSoulComposeModel.cs b/System/GatheringSoul/GatherSoulComposeModel.cs
index 2fa6945..ab02bd9 100644
--- a/System/GatheringSoul/GatherSoulComposeModel.cs
+++ b/System/GatheringSoul/GatherSoulComposeModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class GatherSoulComposeModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, Compose> composeDict = new Dictionary<int, Compose>();
diff --git a/System/GatheringSoul/GatherSoulDungeonModel.cs b/System/GatheringSoul/GatherSoulDungeonModel.cs
index 2ff496e..14af1f0 100644
--- a/System/GatheringSoul/GatherSoulDungeonModel.cs
+++ b/System/GatheringSoul/GatherSoulDungeonModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class GatherSoulDungeonModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public const int DUNGEON_MAPID = 31340;
diff --git a/System/GatheringSoul/GatheringSoulModel.cs b/System/GatheringSoul/GatheringSoulModel.cs
index bf2c1c0..f8a5ad4 100644
--- a/System/GatheringSoul/GatheringSoulModel.cs
+++ b/System/GatheringSoul/GatheringSoulModel.cs
@@ -7,7 +7,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class GatheringSoulModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/GatheringSoul/VirtualPackModel.cs b/System/GatheringSoul/VirtualPackModel.cs
index ebea997..f7e5a0b 100644
--- a/System/GatheringSoul/VirtualPackModel.cs
+++ b/System/GatheringSoul/VirtualPackModel.cs
@@ -6,7 +6,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class VirtualPackModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/Guard/GuardModel.cs b/System/Guard/GuardModel.cs
index 636e616..1b7ff9d 100644
--- a/System/Guard/GuardModel.cs
+++ b/System/Guard/GuardModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class GuardModel : Model, IAfterPlayerDataInitialize, IPlayerLoginOk
{
List<int> fairyLandGuardItems = new List<int>();
diff --git a/System/HappyXB/HappyXBModel.cs b/System/HappyXB/HappyXBModel.cs
index 4eac3ff..894b67a 100644
--- a/System/HappyXB/HappyXBModel.cs
+++ b/System/HappyXB/HappyXBModel.cs
@@ -9,7 +9,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class HappyXBModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk
{
private Dictionary<string, XBGetItemConfig> xbGetItemDict = new Dictionary<string, XBGetItemConfig>();
diff --git a/System/HazyRegion/HazyDemonKingModel.cs b/System/HazyRegion/HazyDemonKingModel.cs
index b55e5c2..7f983b5 100644
--- a/System/HazyRegion/HazyDemonKingModel.cs
+++ b/System/HazyRegion/HazyDemonKingModel.cs
@@ -1,10 +1,10 @@
锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class HazyDemonKingModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<uint, HazyDemonKingPlayerInfo> m_PlayerInfos = new Dictionary<uint, HazyDemonKingPlayerInfo>();
@@ -333,5 +333,5 @@
public ulong hp;
public ulong maxHp;
}
-}
-
+}
+
diff --git a/System/HazyRegion/HazyGrassModel.cs b/System/HazyRegion/HazyGrassModel.cs
index 8e0edca..a18fd7c 100644
--- a/System/HazyRegion/HazyGrassModel.cs
+++ b/System/HazyRegion/HazyGrassModel.cs
@@ -1,10 +1,10 @@
锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class HazyGrassModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, int> m_MapNpcCount = new Dictionary<int, int>();
@@ -225,9 +225,9 @@
if (config != null)
{
var collectCount = dungeonModel.GetDugneonNpcCollectCount(npcId);
- var hintId = dungeonModel.GetDungeonHintId(config.dungeonId, config.lineId);
- var hintConfig = DungeonHintConfig.Get(hintId);
-
+ var hintId = dungeonModel.GetDungeonHintId(config.dungeonId, config.lineId);
+ var hintConfig = DungeonHintConfig.Get(hintId);
+
if (hintConfig != null)
{
if (hintConfig.NPC1ID.Length > 1
@@ -249,7 +249,7 @@
{
return collectCount < hintConfig.targetValue2[0];
}
- }
+ }
}
}
return true;
@@ -303,5 +303,5 @@
ClientDungeonStageUtility.GotoNormalClientDungeon(mapId, config.dungeonId, config.lineId);
}
}
-}
-
+}
+
diff --git a/System/HazyRegion/HazyRegionModel.cs b/System/HazyRegion/HazyRegionModel.cs
index 42ccd36..dfec664 100644
--- a/System/HazyRegion/HazyRegionModel.cs
+++ b/System/HazyRegion/HazyRegionModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class HazyRegionModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, Incident> m_Incidents = new Dictionary<int, Incident>();
diff --git a/System/HeavenBattle/HeavenBattleInfo.cs b/System/HeavenBattle/HeavenBattleInfo.cs
index ef47040..8b6bfd6 100644
--- a/System/HeavenBattle/HeavenBattleInfo.cs
+++ b/System/HeavenBattle/HeavenBattleInfo.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class HeavenBattleInfo : Singleton<HeavenBattleInfo>
{
diff --git a/System/HeavenBattle/HeavenBattleModel.cs b/System/HeavenBattle/HeavenBattleModel.cs
index 52858a5..bb1cd3e 100644
--- a/System/HeavenBattle/HeavenBattleModel.cs
+++ b/System/HeavenBattle/HeavenBattleModel.cs
@@ -7,7 +7,7 @@
using System.Collections;
using System.Linq;
-[XLua.LuaCallCSharp]
+
public class HeavenBattleModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk
{
public const int HEAVEBATTLE_MAPID = 31010;
diff --git a/System/HttpRequest/HttpRequest.cs b/System/HttpRequest/HttpRequest.cs
index acb99ea..501e435 100644
--- a/System/HttpRequest/HttpRequest.cs
+++ b/System/HttpRequest/HttpRequest.cs
@@ -1,14 +1,14 @@
-锘縰sing System;
+锘縰sing System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Text;
-using UnityEngine;
-
-[XLua.LuaCallCSharp]
-public class HttpRequest : SingletonMonobehaviour<HttpRequest>
-
+using UnityEngine;
+
+
+public class HttpRequest : SingletonMonobehaviour<HttpRequest>
+
{
public const string defaultHttpContentType = "application/x-www-form-urlencoded";
public const string jsonHttpContentType = "application/json ; charset=utf-8";
@@ -48,6 +48,6 @@
}
string result = buffer.ToString();
return result;
- }
-
+ }
+
}
\ No newline at end of file
diff --git a/System/ItemTip/ItemTipUtility.cs b/System/ItemTip/ItemTipUtility.cs
index c56dc33..c14e9de 100644
--- a/System/ItemTip/ItemTipUtility.cs
+++ b/System/ItemTip/ItemTipUtility.cs
@@ -10,7 +10,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ItemTipUtility
{
public enum TipType
diff --git a/System/JadeDynastyBoss/JadeDynastyBossModel.cs b/System/JadeDynastyBoss/JadeDynastyBossModel.cs
index 5a4fe95..ae125b5 100644
--- a/System/JadeDynastyBoss/JadeDynastyBossModel.cs
+++ b/System/JadeDynastyBoss/JadeDynastyBossModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class JadeDynastyBossModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IAfterPlayerDataInitialize
{
List<JadeDynastyBossData> jadeDynastyBosses = new List<JadeDynastyBossData>();
diff --git a/System/JadeDynastySkill/JadeDynastySkillModel.cs b/System/JadeDynastySkill/JadeDynastySkillModel.cs
index 3b3c14a..eb2f32e 100644
--- a/System/JadeDynastySkill/JadeDynastySkillModel.cs
+++ b/System/JadeDynastySkill/JadeDynastySkillModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class JadeDynastySkillModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, List<int>> jadeDynastySkills = new Dictionary<int, List<int>>();
diff --git a/System/KnapSack/FBHelpPointExchageModel.cs b/System/KnapSack/FBHelpPointExchageModel.cs
index 558a7e3..e191d9b 100644
--- a/System/KnapSack/FBHelpPointExchageModel.cs
+++ b/System/KnapSack/FBHelpPointExchageModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FBHelpPointExchageModel : Model,IBeforePlayerDataInitialize,IPlayerLoginOk
{
public List<int> todayShoplist { get; private set; }
diff --git a/System/KnapSack/KnapsackTimeCDMgr.cs b/System/KnapSack/KnapsackTimeCDMgr.cs
index 287ea26..b3b895c 100644
--- a/System/KnapSack/KnapsackTimeCDMgr.cs
+++ b/System/KnapSack/KnapsackTimeCDMgr.cs
@@ -6,9 +6,9 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class KnapsackTimeCDMgr : SingletonMonobehaviour<KnapsackTimeCDMgr>
-
+
{
private List<ItemCDCool> itemCDList = new List<ItemCDCool>();
private List<NormalCDCool> normalCDList = new List<NormalCDCool>();
diff --git a/System/KnapSack/Logic/BoxGetItemModel.cs b/System/KnapSack/Logic/BoxGetItemModel.cs
index a47daaf..5e9f254 100644
--- a/System/KnapSack/Logic/BoxGetItemModel.cs
+++ b/System/KnapSack/Logic/BoxGetItemModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class BoxGetItemModel : Model, IBeforePlayerDataInitialize
{
public string guid { get; private set; }
diff --git a/System/KnapSack/Logic/ItemLogicUtility.cs b/System/KnapSack/Logic/ItemLogicUtility.cs
index 639b410..b07eae3 100644
--- a/System/KnapSack/Logic/ItemLogicUtility.cs
+++ b/System/KnapSack/Logic/ItemLogicUtility.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ItemLogicUtility : Singleton<ItemLogicUtility>
{
private string dogzGSFormula;
diff --git a/System/KnapSack/Logic/ItemOperateUtility.cs b/System/KnapSack/Logic/ItemOperateUtility.cs
index d608983..5f1f555 100644
--- a/System/KnapSack/Logic/ItemOperateUtility.cs
+++ b/System/KnapSack/Logic/ItemOperateUtility.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ItemOperateUtility : Singleton<ItemOperateUtility>
{
EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
diff --git a/System/KnapSack/Logic/ItemOverdueModel.cs b/System/KnapSack/Logic/ItemOverdueModel.cs
index cf94c21..9f6efad 100644
--- a/System/KnapSack/Logic/ItemOverdueModel.cs
+++ b/System/KnapSack/Logic/ItemOverdueModel.cs
@@ -8,7 +8,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ItemOverdueModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, ISwitchAccount
{
private List<ItemModel> overdueGuardPushlist = new List<ItemModel>();
diff --git a/System/KnapSack/Logic/ItemTipsModel.cs b/System/KnapSack/Logic/ItemTipsModel.cs
index 9f05c5b..0a5bac7 100644
--- a/System/KnapSack/Logic/ItemTipsModel.cs
+++ b/System/KnapSack/Logic/ItemTipsModel.cs
@@ -9,7 +9,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ItemTipsModel : Model, IBeforePlayerDataInitialize
{
public Dictionary<int, PetInfoConfig> unlockPetDict { get; private set; }
diff --git a/System/KnapSack/Logic/PackModel.cs b/System/KnapSack/Logic/PackModel.cs
index f006494..0654469 100644
--- a/System/KnapSack/Logic/PackModel.cs
+++ b/System/KnapSack/Logic/PackModel.cs
@@ -8,7 +8,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class PackModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk
{
public static string StrengthAttrShift_RecordKey = "";
diff --git a/System/KnapSack/Logic/TreasureEffectModel.cs b/System/KnapSack/Logic/TreasureEffectModel.cs
index 151f342..9e5ba09 100644
--- a/System/KnapSack/Logic/TreasureEffectModel.cs
+++ b/System/KnapSack/Logic/TreasureEffectModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class TreasureEffectModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk
{
public List<int> treasureAddAtklist { get; private set; }
diff --git a/System/KnapSack/New/BatchUseModel.cs b/System/KnapSack/New/BatchUseModel.cs
index ffa8001..9f2e42b 100644
--- a/System/KnapSack/New/BatchUseModel.cs
+++ b/System/KnapSack/New/BatchUseModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class BatchUseModel : Singleton<BatchUseModel>
{
#region 鎵归噺浣跨敤鏁版嵁
diff --git a/System/KnapSack/New/KingTreasureShowModel.cs b/System/KnapSack/New/KingTreasureShowModel.cs
index fca15e9..05820fe 100644
--- a/System/KnapSack/New/KingTreasureShowModel.cs
+++ b/System/KnapSack/New/KingTreasureShowModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class KingTreasureShowModel : Model,IBeforePlayerDataInitialize,IPlayerLoginOk
{
diff --git a/System/KnapSack/New/KnapSackEventMgr.cs b/System/KnapSack/New/KnapSackEventMgr.cs
index 02550b0..a4edd18 100644
--- a/System/KnapSack/New/KnapSackEventMgr.cs
+++ b/System/KnapSack/New/KnapSackEventMgr.cs
@@ -2,7 +2,7 @@
using UnityEngine;
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class KnapSackEventMgr : Singleton<KnapSackEventMgr>
{
public Action<GameObject> AddEquipWinTempObjEvent;
diff --git a/System/Language/Language.cs b/System/Language/Language.cs
index 644a6c9..f314273 100644
--- a/System/Language/Language.cs
+++ b/System/Language/Language.cs
@@ -3,7 +3,7 @@
using System;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public static class Language
{
public static int languageNumber
diff --git a/System/Login/CrossServerLogin.cs b/System/Login/CrossServerLogin.cs
index 3cd774c..b824cfd 100644
--- a/System/Login/CrossServerLogin.cs
+++ b/System/Login/CrossServerLogin.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class CrossServerLogin : Singleton<CrossServerLogin>
{
bool m_Busy = false;
diff --git a/System/Login/LoginModel.cs b/System/Login/LoginModel.cs
index 5f52f2f..4cfd941 100644
--- a/System/Login/LoginModel.cs
+++ b/System/Login/LoginModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class LoginModel : Model
{
public const uint DwVersionNo = 153518004;
diff --git a/System/Login/ServerData.cs b/System/Login/ServerData.cs
index c51f638..1fee113 100644
--- a/System/Login/ServerData.cs
+++ b/System/Login/ServerData.cs
@@ -9,7 +9,7 @@
using System;
using LitJson;
-[XLua.LuaCallCSharp]
+
public class ServerInfoCommon
{
public ServerGroup recommend;
@@ -34,17 +34,17 @@
_serverData = default(ServerData);
return false;
}
-
-}
-
-[XLua.LuaCallCSharp]
+
+}
+
+
public class ServerInfoPlayer
{
public ServerGroup player;
public ServerGroup gametest;
-}
+}
-[XLua.LuaCallCSharp]
+
public class ServerGroup
{
public string group_title;
@@ -72,7 +72,7 @@
}
}
-[XLua.LuaCallCSharp]
+
public struct ServerData
{
public int region_flag;
diff --git a/System/Login/ServerListCenter.cs b/System/Login/ServerListCenter.cs
index f7359d3..2fb3ffb 100644
--- a/System/Login/ServerListCenter.cs
+++ b/System/Login/ServerListCenter.cs
@@ -6,7 +6,7 @@
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class ServerListCenter : Singleton<ServerListCenter>
{
diff --git a/System/LoginAd/LoginAdModel.cs b/System/LoginAd/LoginAdModel.cs
index 33eb31f..b8e4bda 100644
--- a/System/LoginAd/LoginAdModel.cs
+++ b/System/LoginAd/LoginAdModel.cs
@@ -4,7 +4,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class LoginAdModel : Model, IPlayerLoginOk,IBeforePlayerDataInitialize
{
FairyJadeInvestmentModel moneyInvestModel { get { return ModelCenter.Instance.GetModel<FairyJadeInvestmentModel>(); } }
diff --git a/System/MainInterfacePanel/CapacityDelayModel.cs b/System/MainInterfacePanel/CapacityDelayModel.cs
index 69bfdee..550e721 100644
--- a/System/MainInterfacePanel/CapacityDelayModel.cs
+++ b/System/MainInterfacePanel/CapacityDelayModel.cs
@@ -10,7 +10,7 @@
using System.Collections.Generic;
//鐢ㄤ簬鑾峰緱娉曞疂鎶�鑳界殑鎴樻枟鍔涘欢杩�
-[XLua.LuaCallCSharp]
+
public class CapacityDelayModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
TreasureModel m_treasureModel;
diff --git a/System/MainInterfacePanel/CoinTaskTipModel.cs b/System/MainInterfacePanel/CoinTaskTipModel.cs
index 8249ec1..3343959 100644
--- a/System/MainInterfacePanel/CoinTaskTipModel.cs
+++ b/System/MainInterfacePanel/CoinTaskTipModel.cs
@@ -10,7 +10,7 @@
using Snxxz.UI;
using System;
-[XLua.LuaCallCSharp]
+
public class CoinTaskTipModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/MainInterfacePanel/FeatureNoticeModel.cs b/System/MainInterfacePanel/FeatureNoticeModel.cs
index 0b43700..c28e62c 100644
--- a/System/MainInterfacePanel/FeatureNoticeModel.cs
+++ b/System/MainInterfacePanel/FeatureNoticeModel.cs
@@ -11,7 +11,7 @@
using Snxxz.UI;
//鍔熻兘棰勫憡绾㈢偣
-[XLua.LuaCallCSharp]
+
public class FeatureNoticeModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public List<FunctionForecastConfig> FunctionList = new List<FunctionForecastConfig>();
diff --git a/System/MainInterfacePanel/MainRedDot.cs b/System/MainInterfacePanel/MainRedDot.cs
index 987516f..ed63060 100644
--- a/System/MainInterfacePanel/MainRedDot.cs
+++ b/System/MainInterfacePanel/MainRedDot.cs
@@ -11,7 +11,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class MainRedDot : Singleton<MainRedDot>
{
public const int RedPoint_key = 1;
diff --git a/System/MainInterfacePanel/OffLineOnHookModel.cs b/System/MainInterfacePanel/OffLineOnHookModel.cs
index 9fe2195..6328166 100644
--- a/System/MainInterfacePanel/OffLineOnHookModel.cs
+++ b/System/MainInterfacePanel/OffLineOnHookModel.cs
@@ -24,7 +24,7 @@
}
- [XLua.LuaCallCSharp]
+
public class OffLineOnHookModel : Model, IBeforePlayerDataInitialize
{
public MCTJGInfoClass mCTJGInfoClass = new MCTJGInfoClass();
diff --git a/System/MainInterfacePanel/PKModel.cs b/System/MainInterfacePanel/PKModel.cs
index e0a1235..2a3d53a 100644
--- a/System/MainInterfacePanel/PKModel.cs
+++ b/System/MainInterfacePanel/PKModel.cs
@@ -12,7 +12,7 @@
namespace Snxxz.UI {
- [XLua.LuaCallCSharp]
+
public class PKModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize
{
BuffModel m_BuffModel;
diff --git a/System/MainInterfacePanel/StoryMissionsModel.cs b/System/MainInterfacePanel/StoryMissionsModel.cs
index 943151f..7350753 100644
--- a/System/MainInterfacePanel/StoryMissionsModel.cs
+++ b/System/MainInterfacePanel/StoryMissionsModel.cs
@@ -20,7 +20,7 @@
public int TaskID;
public int TaskType;//(0,鏈畬鎴愶紝1,姝ｅ湪杩涜涓�)
}
- [XLua.LuaCallCSharp]
+
public class StoryMissionsModel : Model, IBeforePlayerDataInitialize
{
public Dictionary<int, int> StoryMissionsDic = new Dictionary<int, int>();//(value,0鏈畬鎴愶紝1瀹屾垚)
diff --git a/System/MainInterfacePanel/TaskAllocation.cs b/System/MainInterfacePanel/TaskAllocation.cs
index b2fdc42..36f801b 100644
--- a/System/MainInterfacePanel/TaskAllocation.cs
+++ b/System/MainInterfacePanel/TaskAllocation.cs
@@ -13,9 +13,9 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class TaskAllocation : Singleton<TaskAllocation>
-
+
{
private static StringBuilder textBuilder = new StringBuilder();
diff --git a/System/MainInterfacePanel/TipPanel.cs b/System/MainInterfacePanel/TipPanel.cs
index ff93ad5..af402ca 100644
--- a/System/MainInterfacePanel/TipPanel.cs
+++ b/System/MainInterfacePanel/TipPanel.cs
@@ -12,7 +12,7 @@
{
//鐢ㄤ簬涓荤晫闈㈢殑Tip鐨勫紩瀵肩粨鏉熷悗鍑虹幇
- [XLua.LuaCallCSharp]
+
public class TipPanel : Singleton<TipPanel>
{
diff --git a/System/Message/BattleHint.cs b/System/Message/BattleHint.cs
index 8d52b4f..15ee9d3 100644
--- a/System/Message/BattleHint.cs
+++ b/System/Message/BattleHint.cs
@@ -4,7 +4,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class BattleHint : Singleton<BattleHint>
{
diff --git a/System/Message/GMNotify.cs b/System/Message/GMNotify.cs
index 227153f..88c5b66 100644
--- a/System/Message/GMNotify.cs
+++ b/System/Message/GMNotify.cs
@@ -4,7 +4,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class GMNotify : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/Message/SysNotifyMgr.cs b/System/Message/SysNotifyMgr.cs
index 4b9fba0..5be1123 100644
--- a/System/Message/SysNotifyMgr.cs
+++ b/System/Message/SysNotifyMgr.cs
@@ -7,7 +7,7 @@
using UnityEngine;
using UnityEngine.UI;
-[XLua.LuaCallCSharp]
+
public class SysNotifyMgr : SingletonMonobehaviour<SysNotifyMgr>
{
diff --git a/System/Mount/MountModel.cs b/System/Mount/MountModel.cs
index 894fcf9..c0b15e5 100644
--- a/System/Mount/MountModel.cs
+++ b/System/Mount/MountModel.cs
@@ -6,7 +6,7 @@
using LitJson;
using UnityEngine;
//鐢ㄤ簬鍧愰獞
-[XLua.LuaCallCSharp]
+
public class HorseClass
{
public int Lv;//鍧愰獞绛夌骇
@@ -28,7 +28,7 @@
public int HorseLV;//鎵�闇�绛夌骇
}
-[XLua.LuaCallCSharp]
+
public class MountModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public string _HorseIDNow = string.Empty;//鑾峰彇褰撳墠鐨勫潗楠慖D
diff --git a/System/NewBieGuidance/FunctionalGuideCenter.cs b/System/NewBieGuidance/FunctionalGuideCenter.cs
index c669132..a2e5fda 100644
--- a/System/NewBieGuidance/FunctionalGuideCenter.cs
+++ b/System/NewBieGuidance/FunctionalGuideCenter.cs
@@ -10,7 +10,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FunctionalGuideCenter : Singleton<FunctionalGuideCenter>
{
public event Action<int> beginGuideEvent;
diff --git a/System/NewBieGuidance/NewBieCenter.cs b/System/NewBieGuidance/NewBieCenter.cs
index 6ee6710..94e41c7 100644
--- a/System/NewBieGuidance/NewBieCenter.cs
+++ b/System/NewBieGuidance/NewBieCenter.cs
@@ -12,7 +12,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class NewBieCenter : Singleton<NewBieCenter>
{
int m_CurrentGuide = 0;
diff --git a/System/NewYearFairylandCeremony/NewYearFairylandCeremonyModel.cs b/System/NewYearFairylandCeremony/NewYearFairylandCeremonyModel.cs
index 4826097..cfc9943 100644
--- a/System/NewYearFairylandCeremony/NewYearFairylandCeremonyModel.cs
+++ b/System/NewYearFairylandCeremony/NewYearFairylandCeremonyModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class NewYearFairylandCeremonyModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk
{
public ReceiveState receiveState { get; private set; }
diff --git a/System/OffLineTime/OffLineTimeLackModel.cs b/System/OffLineTime/OffLineTimeLackModel.cs
index f5aa0fa..cf86393 100644
--- a/System/OffLineTime/OffLineTimeLackModel.cs
+++ b/System/OffLineTime/OffLineTimeLackModel.cs
@@ -9,7 +9,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class OffLineTimeLackModel : Model, ISwitchAccount, IPlayerLoginOk
{
public bool hasRemindOffLineTimeLack { get; set; }
diff --git a/System/OpenServerActivity/AccumulateRechargeModel.cs b/System/OpenServerActivity/AccumulateRechargeModel.cs
index f0fd6d1..487be67 100644
--- a/System/OpenServerActivity/AccumulateRechargeModel.cs
+++ b/System/OpenServerActivity/AccumulateRechargeModel.cs
@@ -4,7 +4,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class AccumulateRechargeModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
public bool IsOpen
diff --git a/System/OpenServerActivity/BossFirstBloodModel.cs b/System/OpenServerActivity/BossFirstBloodModel.cs
index 7ed91bb..5116102 100644
--- a/System/OpenServerActivity/BossFirstBloodModel.cs
+++ b/System/OpenServerActivity/BossFirstBloodModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class BossFirstBloodModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
diff --git a/System/OpenServerActivity/DaysAccumulateRechargeModel.cs b/System/OpenServerActivity/DaysAccumulateRechargeModel.cs
index ff2df27..4746dd1 100644
--- a/System/OpenServerActivity/DaysAccumulateRechargeModel.cs
+++ b/System/OpenServerActivity/DaysAccumulateRechargeModel.cs
@@ -4,7 +4,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class DaysAccumulateRechargeModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
public int jchd_id = 26;
diff --git a/System/OpenServerActivity/FestivalRedpackModel.cs b/System/OpenServerActivity/FestivalRedpackModel.cs
index decc2ee..2e58216 100644
--- a/System/OpenServerActivity/FestivalRedpackModel.cs
+++ b/System/OpenServerActivity/FestivalRedpackModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FestivalRedpackModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
Dictionary<int, FestivalRedpack> festivalRedpacks = new Dictionary<int, FestivalRedpack>();
diff --git a/System/OpenServerActivity/FlashRushToBuyModel.cs b/System/OpenServerActivity/FlashRushToBuyModel.cs
index ac75605..4e4c6e6 100644
--- a/System/OpenServerActivity/FlashRushToBuyModel.cs
+++ b/System/OpenServerActivity/FlashRushToBuyModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FlashRushToBuyModel : Model,IBeforePlayerDataInitialize,IPlayerLoginOk,IOpenServerActivity
{
StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
diff --git a/System/OpenServerActivity/FlashSaleModel.cs b/System/OpenServerActivity/FlashSaleModel.cs
index 43c0778..519df40 100644
--- a/System/OpenServerActivity/FlashSaleModel.cs
+++ b/System/OpenServerActivity/FlashSaleModel.cs
@@ -4,7 +4,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FlashSaleModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize, IOpenServerActivity
{
StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index 4088b35..2a62ce3 100644
--- a/System/OpenServerActivity/ImpactRankModel.cs
+++ b/System/OpenServerActivity/ImpactRankModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ImpactRankModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
readonly List<RankType> s_ImpactRankTypes = new List<RankType>()
diff --git a/System/OpenServerActivity/InSevenDayModel.cs b/System/OpenServerActivity/InSevenDayModel.cs
index 0277c5c..e6dd168 100644
--- a/System/OpenServerActivity/InSevenDayModel.cs
+++ b/System/OpenServerActivity/InSevenDayModel.cs
@@ -16,7 +16,7 @@
public int Money;//濂栧姳浠峰��
}
-[XLua.LuaCallCSharp]
+
public class InSevenDayModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/OpenServerActivity/LoginRewardModel.cs b/System/OpenServerActivity/LoginRewardModel.cs
index e459eef..501804c 100644
--- a/System/OpenServerActivity/LoginRewardModel.cs
+++ b/System/OpenServerActivity/LoginRewardModel.cs
@@ -1,13 +1,13 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Monday, December 10, 2018
-//--------------------------------------------------------
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Monday, December 10, 2018
+//--------------------------------------------------------
using System;
using System.Collections.Generic;
-using Snxxz.UI;
-
-//鐧诲綍濂栧姳
-[XLua.LuaCallCSharp]
+using Snxxz.UI;
+
+//鐧诲綍濂栧姳
+
public class LoginRewardModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
public event Action LoginAwardInfoUpdate;//棰嗗璁板綍鍙樻洿
@@ -426,7 +426,7 @@
}
return Isbool;
}
-}
-
-
-
+}
+
+
+
diff --git a/System/OpenServerActivity/LuckyTreasureModel.cs b/System/OpenServerActivity/LuckyTreasureModel.cs
index 49a904f..35cda22 100644
--- a/System/OpenServerActivity/LuckyTreasureModel.cs
+++ b/System/OpenServerActivity/LuckyTreasureModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class LuckyTreasureModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
public event Action<int> onStateUpdate;
diff --git a/System/OpenServerActivity/MysticalPurchaseModel.cs b/System/OpenServerActivity/MysticalPurchaseModel.cs
index 2cea41e..36bdf5d 100644
--- a/System/OpenServerActivity/MysticalPurchaseModel.cs
+++ b/System/OpenServerActivity/MysticalPurchaseModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class MysticalPurchaseModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk,IOpenServerActivity
{
public event Action UpdateMysticalShopEvent;
diff --git a/System/OpenServerActivity/OSGiftModel.cs b/System/OpenServerActivity/OSGiftModel.cs
index 5856fc1..30c633c 100644
--- a/System/OpenServerActivity/OSGiftModel.cs
+++ b/System/OpenServerActivity/OSGiftModel.cs
@@ -1,11 +1,11 @@
锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections;
+using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class OSGiftModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize, IOpenServerActivity
{
VipModel vipModel
@@ -339,5 +339,5 @@
public int limit;
}
}
-}
-
+}
+
diff --git a/System/OpenServerActivity/OSRedEnvelopeModel.cs b/System/OpenServerActivity/OSRedEnvelopeModel.cs
index ec866b1..6ac7114 100644
--- a/System/OpenServerActivity/OSRedEnvelopeModel.cs
+++ b/System/OpenServerActivity/OSRedEnvelopeModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class OSRedEnvelopeModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
AchievementModel m_AchievementModel;
diff --git a/System/OpenServerActivity/OpenServerActivityCenter.cs b/System/OpenServerActivity/OpenServerActivityCenter.cs
index f3d03e6..f6a9a80 100644
--- a/System/OpenServerActivity/OpenServerActivityCenter.cs
+++ b/System/OpenServerActivity/OpenServerActivityCenter.cs
@@ -1,11 +1,11 @@
锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
namespace Snxxz.UI
{
//淇敼鎴愭帶鍒跺涓椿鍔ㄦā鍧楋紝濡傜簿褰╂椿鍔ㄦā鏉�1锛岀簿褰╂椿鍔ㄦā鏉�2
- [XLua.LuaCallCSharp]
+
public class OpenServerActivityCenter : Singleton<OpenServerActivityCenter>
{
public event Action openServerActivityStateChange;
@@ -149,7 +149,6 @@
}
}
- [XLua.CSharpCallLua]
public interface IOpenServerActivity
{
bool IsOpen { get; }
@@ -159,5 +158,5 @@
event Action<int> onStateUpdate;
}
-}
-
+}
+
diff --git a/System/OpenServerActivity/OpenServerActivityNotifyModel.cs b/System/OpenServerActivity/OpenServerActivityNotifyModel.cs
index c86c8b6..7ef1d51 100644
--- a/System/OpenServerActivity/OpenServerActivityNotifyModel.cs
+++ b/System/OpenServerActivity/OpenServerActivityNotifyModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class OpenServerActivityNotifyModel : Model,IBeforePlayerDataInitialize,IPlayerLoginOk
{
public override void Init()
diff --git a/System/OpenServerActivity/OpenServiceAchievementModel.cs b/System/OpenServerActivity/OpenServiceAchievementModel.cs
index d5e3050..4752595 100644
--- a/System/OpenServerActivity/OpenServiceAchievementModel.cs
+++ b/System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -1,14 +1,14 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, January 08, 2019
-//--------------------------------------------------------
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Tuesday, January 08, 2019
+//--------------------------------------------------------
using System;
using System.Collections.Generic;
using Snxxz.UI;
using System.Linq;
-[XLua.LuaCallCSharp]
+
public class ActionTypeClass
{
public int TemplateID; // 妯℃澘ID
@@ -649,9 +649,9 @@
|| OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.OpenServiceAchievement));
return Isbool;
}
-}
-
-
-
-
-
+}
+
+
+
+
+
diff --git a/System/OpenServerActivity/RedEnvelopeModel.cs b/System/OpenServerActivity/RedEnvelopeModel.cs
index f6d93e1..2c641b2 100644
--- a/System/OpenServerActivity/RedEnvelopeModel.cs
+++ b/System/OpenServerActivity/RedEnvelopeModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RedEnvelopeModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, string> redpackSfxDict = new Dictionary<int, string>();
diff --git a/System/OpenServerActivity/SpringFestivalModel.cs b/System/OpenServerActivity/SpringFestivalModel.cs
index 89fa3a7..8878a49 100644
--- a/System/OpenServerActivity/SpringFestivalModel.cs
+++ b/System/OpenServerActivity/SpringFestivalModel.cs
@@ -1,15 +1,15 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Monday, January 21, 2019
-//--------------------------------------------------------
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Monday, January 21, 2019
+//--------------------------------------------------------
using System;
using System.Collections.Generic;
using Snxxz.UI;
-using System.Linq;
-
-
-[XLua.LuaCallCSharp]
+using System.Linq;
+
+
+
//鏄ヨ妭娲诲姩宸＄ぜ
public class SpringFestivalModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
@@ -402,9 +402,9 @@
}
return Isbool;
}
-}
-
-
-
-
-
+}
+
+
+
+
+
diff --git a/System/OpenServerActivity/WishingPoolModel.cs b/System/OpenServerActivity/WishingPoolModel.cs
index 805fa46..73f138d 100644
--- a/System/OpenServerActivity/WishingPoolModel.cs
+++ b/System/OpenServerActivity/WishingPoolModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class WishingPoolModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
public event Action<int> UpdateWishingDataEvent;
diff --git a/System/Pet/PetModel.cs b/System/Pet/PetModel.cs
index 64cf78f..6e5bf8f 100644
--- a/System/Pet/PetModel.cs
+++ b/System/Pet/PetModel.cs
@@ -22,7 +22,6 @@
PetStone = 2,//鐏靛疇榄傜煶
}
- [XLua.CSharpCallLua]
public interface IPetHorseAwaking
{
event Action onFuncStateUpdate;
@@ -31,7 +30,7 @@
string GetPetHorseEffectNode(int id, int skinIndex);
}
- [XLua.LuaCallCSharp]
+
public class PetModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public Dictionary<int, int> _TagPetItem = new Dictionary<int, int>();//鍏充簬鐏靛吔榄傜煶
@@ -61,8 +60,7 @@
private int PetDanExp = 0;//鐏靛疇涓圭粡楠�
public List<int> ListEffectSkill = new List<int>();
PackModel _playerPack;
- PackModel playerPack
- {
+ PackModel playerPack {
get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }
}
@@ -397,15 +395,15 @@
{
foreach (var key in CultivateRedPoint.Keys)
{
- CultivateRedPoint[key].state = RedPointState.None;
+ CultivateRedPoint[key].state = RedPointState.None;
}
if (!FuncOpen.Instance.IsFuncOpen(6))
{
- return;
+ return;
}
if (_DicPetBack.Count <= 0)
{
- return;
+ return;
}
int GetPetId = 0;
int petLv = 100;
@@ -413,70 +411,70 @@
List<int> ListInt = new List<int>();
for (int i = 0; i < Sortpet.Count; i++)
{
- int petID = Sortpet[i].ID;
- int MaxLv = PetInfoConfig.Get(petID).MaxRank;
- if (_DicPetBack.ContainsKey(petID) && _DicPetBack[petID].PetClass < MaxLv)
- {
- int _NeedExp = PetClassCostConfig.GetPetIdAndRank(petID, _DicPetBack[petID].PetClass).UpNeedExp;
- int NeedExp = _NeedExp - _DicPetBack[petID].petExp;
- int NeedNumber = Mathf.CeilToInt((float)NeedExp / PetDanExp);
- if (itemCount >= NeedNumber)
- {
- ListInt.Add(petID);
- }
- }
+ int petID = Sortpet[i].ID;
+ int MaxLv = PetInfoConfig.Get(petID).MaxRank;
+ if (_DicPetBack.ContainsKey(petID) && _DicPetBack[petID].PetClass < MaxLv)
+ {
+ int _NeedExp = PetClassCostConfig.GetPetIdAndRank(petID, _DicPetBack[petID].PetClass).UpNeedExp;
+ int NeedExp = _NeedExp - _DicPetBack[petID].petExp;
+ int NeedNumber = Mathf.CeilToInt((float)NeedExp / PetDanExp);
+ if (itemCount >= NeedNumber)
+ {
+ ListInt.Add(petID);
+ }
+ }
}
foreach (var key in _DicPetBack.Keys)//鍥犱负鏈夋垚灏变换鍔￠檺鍒舵墍鏈� 绗竴鍙潗楠戠孩鐐归�昏緫鐗规畩鍐�
{
- if (DicDefaultPet.ContainsKey(key) && DicDefaultPet[key] > _DicPetBack[key].PetClass
- && itemCount > 0 && CultivateRedPoint.ContainsKey(key))
- {
- CultivateRedPoint[key].state = RedPointState.Simple;
- return;
- }
+ if (DicDefaultPet.ContainsKey(key) && DicDefaultPet[key] > _DicPetBack[key].PetClass
+ && itemCount > 0 && CultivateRedPoint.ContainsKey(key))
+ {
+ CultivateRedPoint[key].state = RedPointState.Simple;
+ return;
+ }
}
List<int> IntListSkill = new List<int>();
for (int i = 0; i < ListInt.Count; i++)//閫夋嫨鍑哄崌绾х伒瀹犵瓑绾ф渶浣庝笖鏈夋妧鑳芥湭瑙ｉ攣鐨勪笖缁忛獙鏈�鎺ヨ繎
{
- if (_DicPetBack.ContainsKey(ListInt[i]))
- {
- var PetConfig = PetInfoConfig.Get(ListInt[i]);
- if (PetConfig == null)
- {
- return;
- }
- int[] SkillUnLockInt = PetConfig.SkillUnLock;
- int SkillLvMax = SkillUnLockInt[(SkillUnLockInt.Length - 1)];
- if (_DicPetBack[(ListInt[i])].PetClass < SkillLvMax)
- {
- IntListSkill.Add((ListInt[i]));
- }
- }
+ if (_DicPetBack.ContainsKey(ListInt[i]))
+ {
+ var PetConfig = PetInfoConfig.Get(ListInt[i]);
+ if (PetConfig == null)
+ {
+ return;
+ }
+ int[] SkillUnLockInt = PetConfig.SkillUnLock;
+ int SkillLvMax = SkillUnLockInt[(SkillUnLockInt.Length - 1)];
+ if (_DicPetBack[(ListInt[i])].PetClass < SkillLvMax)
+ {
+ IntListSkill.Add((ListInt[i]));
+ }
+ }
}
int SkillPetId = GetRedPointPetID(IntListSkill);
if (SkillPetId != 0 && CultivateRedPoint.ContainsKey(SkillPetId))
{
- CultivateRedPoint[SkillPetId].state = RedPointState.Simple;
- return;
+ CultivateRedPoint[SkillPetId].state = RedPointState.Simple;
+ return;
}
for (int i = 0; i < ListInt.Count; i++)//閫夋嫨鍑虹瓑绾ф渶浣庣殑鐏靛疇
{
- if (_DicPetBack.ContainsKey(ListInt[i]))
- {
- if (_DicPetBack[(ListInt[i])].PetClass < petLv)
- {
- petLv = _DicPetBack[(ListInt[i])].PetClass;
- GetPetId = (ListInt[i]);
- }
- }
+ if (_DicPetBack.ContainsKey(ListInt[i]))
+ {
+ if (_DicPetBack[(ListInt[i])].PetClass < petLv)
+ {
+ petLv = _DicPetBack[(ListInt[i])].PetClass;
+ GetPetId = (ListInt[i]);
+ }
+ }
}
if (GetPetId != 0 && CultivateRedPoint.ContainsKey(GetPetId))
{
- CultivateRedPoint[GetPetId].state = RedPointState.Simple;
- return;
+ CultivateRedPoint[GetPetId].state = RedPointState.Simple;
+ return;
}
}
@@ -1004,16 +1002,14 @@
return _DicPetBack.ContainsKey(petId);
}
- public int GetPetHorseEffect(int id,int skinIndex)
+ public int GetPetHorseEffect(int id, int skinIndex)
{
- var petHorseAwaking = LuaUtility.Global.Get<IPetHorseAwaking>("PetHorseAwakingModel");
- return petHorseAwaking.GetPetHorseEffect(id, skinIndex);
+ return ILRuntimeUtility.Instance.ModelInvoke<int>("PetHorseAwakingModel", "GetPetHorseEffect", id, skinIndex);
}
public string GetPetHorseEffectNode(int id, int skinIndex)
{
- var petHorseAwaking = LuaUtility.Global.Get<IPetHorseAwaking>("PetHorseAwakingModel");
- return petHorseAwaking.GetPetHorseEffectNode(id, skinIndex);
+ return ILRuntimeUtility.Instance.ModelInvoke<string>("PetHorseAwakingModel", "GetPetHorseEffectNode", id, skinIndex);
}
}
}
diff --git a/System/Pet/PetReinforceModel.cs b/System/Pet/PetReinforceModel.cs
index 1f533fe..cf5aae2 100644
--- a/System/Pet/PetReinforceModel.cs
+++ b/System/Pet/PetReinforceModel.cs
@@ -8,7 +8,7 @@
using System.Text;
- [XLua.LuaCallCSharp]
+
public class PetReinforceModel:Singleton<PetReinforceModel>
{
diff --git a/System/Pet/PetWin.cs b/System/Pet/PetWin.cs
index 86edc96..ad4cd4e 100644
--- a/System/Pet/PetWin.cs
+++ b/System/Pet/PetWin.cs
@@ -47,14 +47,12 @@
{
base.OnPreOpen();
DisplayButtons();
- var petHorseAwaking = LuaUtility.Global.Get<IPetHorseAwaking>("PetHorseAwakingModel");
- petHorseAwaking.onFuncStateUpdate += OnFuncStateUpdate;
+ ILRuntimeUtility.Instance.ModelInvoke("PetHorseAwakingModel", "AddFuncStateUpdate", this);
}
protected override void OnPreClose()
{
- var petHorseAwaking = LuaUtility.Global.Get<IPetHorseAwaking>("PetHorseAwakingModel");
- petHorseAwaking.onFuncStateUpdate -= OnFuncStateUpdate;
+ ILRuntimeUtility.Instance.ModelInvoke("PetHorseAwakingModel", "RemoveFuncStateUpdate", this);
base.OnPreClose();
}
@@ -73,22 +71,22 @@
private void DisplayButtons()
{
- var type = ILLauncherProxy.Instance.appdomain.LoadedTypes["PetHorseAwakingModel"];
- var get_Instance = type.GetMethod("get_Instance", 0);
- var isOpenM = type.GetMethod("IsOpen", 0);
- var instance = ILLauncherProxy.Instance.appdomain.Invoke(get_Instance, null);
+ //var type = ILLauncherProxy.Instance.appdomain.LoadedTypes["PetHorseAwakingModel"];
+ //var get_Instance = type.GetMethod("get_Instance", 0);
+ //var isOpenM = type.GetMethod("IsOpen", 0);
+ //var instance = ILLauncherProxy.Instance.appdomain.Invoke(get_Instance, null);
// var petHorseAwaking = LuaUtility.Global.Get<IPetHorseAwaking>("PetHorseAwakingModel");
- if (instance != null)
- {
- var isOpen = (bool)ILLauncherProxy.Instance.appdomain.Invoke(isOpenM, instance);
- m_FunctionButtons[2].gameObject.SetActive(isOpen);
- m_FunctionButtons[2].state = isOpen ? TitleBtnState.Normal : TitleBtnState.Locked;
- }
- else
- {
- m_FunctionButtons[2].gameObject.SetActive(false);
- m_FunctionButtons[2].state = TitleBtnState.Locked;
- }
+ //if (instance != null)
+ //{
+ var isOpen = ILRuntimeUtility.Instance.ModelInvoke<bool>("PetHorseAwakingModel", "IsOpen");
+ m_FunctionButtons[2].gameObject.SetActive(isOpen);
+ m_FunctionButtons[2].state = isOpen ? TitleBtnState.Normal : TitleBtnState.Locked;
+ //}
+ //else
+ //{
+ // m_FunctionButtons[2].gameObject.SetActive(false);
+ // m_FunctionButtons[2].state = TitleBtnState.Locked;
+ //}
}
private void OpenPetWin()
@@ -112,7 +110,7 @@
functionOrder = 2;
}
- private void OnFuncStateUpdate()
+ public void OnFuncStateUpdate()
{
DisplayButtons();
}
diff --git a/System/Pet/RidingAndPetActivationModel.cs b/System/Pet/RidingAndPetActivationModel.cs
index fff12e9..d4c96dd 100644
--- a/System/Pet/RidingAndPetActivationModel.cs
+++ b/System/Pet/RidingAndPetActivationModel.cs
@@ -12,7 +12,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RidingAndPetActivationModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/PlayerDead/PlayerDeadModel.cs b/System/PlayerDead/PlayerDeadModel.cs
index fd16fa1..b1b1914 100644
--- a/System/PlayerDead/PlayerDeadModel.cs
+++ b/System/PlayerDead/PlayerDeadModel.cs
@@ -6,7 +6,7 @@
using System.Collections;
using System.Text;
-[XLua.LuaCallCSharp]
+
public class PlayerDeadModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public int[] dungeonKillArray { get; private set; }
diff --git a/System/Rank/RankModel.cs b/System/Rank/RankModel.cs
index 49b34c3..1a59da8 100644
--- a/System/Rank/RankModel.cs
+++ b/System/Rank/RankModel.cs
@@ -1,11 +1,11 @@
锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-namespace Snxxz.UI
-{
- [XLua.LuaCallCSharp]
- public class RankModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+namespace Snxxz.UI
+{
+
+ public class RankModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, List<RankData>> m_RankDatas = new Dictionary<int, List<RankData>>();
@@ -63,20 +63,20 @@
}
}
}
-
- public int displayRankCount { get; private set; }
+
+ public int displayRankCount { get; private set; }
public int jumpRankType { get; set; }
readonly ObjectPool<RankData> m_RankDataPool = new ObjectPool<RankData>(OnGetRankData, OnReleaseRankData);
-
- public event Action selectRankIdRefresh;
- public event Action selectSubRankIdRefresh;
- public event Action<int> onRankRefresh;
-
- public override void Init()
- {
- jumpRankType = -1;
- ParseConfig();
+
+ public event Action selectRankIdRefresh;
+ public event Action selectSubRankIdRefresh;
+ public event Action<int> onRankRefresh;
+
+ public override void Init()
+ {
+ jumpRankType = -1;
+ ParseConfig();
}
public void OnBeforePlayerDataInitialize()
@@ -96,8 +96,8 @@
//SendBegRank(RankType.JadeDynastyTower);
}
- public override void UnInit()
- {
+ public override void UnInit()
+ {
}
void ParseConfig()
@@ -222,8 +222,8 @@
{
}
- }
-
+ }
+
public class RankData
{
public int type;
@@ -236,6 +236,6 @@
public uint cmpValue;
public uint cmpValue2;
public uint cmpValue3;
- }
-}
-
+ }
+}
+
diff --git a/System/Redpoint/Redpoint.cs b/System/Redpoint/Redpoint.cs
index 8c6d3bf..c89f134 100644
--- a/System/Redpoint/Redpoint.cs
+++ b/System/Redpoint/Redpoint.cs
@@ -4,7 +4,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class Redpoint
{
int m_Id = 0;
diff --git a/System/Redpoint/RedpointBehaviour.cs b/System/Redpoint/RedpointBehaviour.cs
index 393b24a..cee95db 100644
--- a/System/Redpoint/RedpointBehaviour.cs
+++ b/System/Redpoint/RedpointBehaviour.cs
@@ -8,7 +8,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RedpointBehaviour : MonoBehaviour
{
[SerializeField]
diff --git a/System/Redpoint/RedpointCenter.cs b/System/Redpoint/RedpointCenter.cs
index 99e6855..d09f9c1 100644
--- a/System/Redpoint/RedpointCenter.cs
+++ b/System/Redpoint/RedpointCenter.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RedpointCenter : Singleton<RedpointCenter>
{
public event Action<int> redpointValueChangeEvent;
diff --git a/System/RidingPet/RidingPetBossModel.cs b/System/RidingPet/RidingPetBossModel.cs
index 74411d3..07994e3 100644
--- a/System/RidingPet/RidingPetBossModel.cs
+++ b/System/RidingPet/RidingPetBossModel.cs
@@ -4,7 +4,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RidingPetBossModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/Role/MagicianModel.cs b/System/Role/MagicianModel.cs
index fafdc01..3de03ed 100644
--- a/System/Role/MagicianModel.cs
+++ b/System/Role/MagicianModel.cs
@@ -9,7 +9,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class MagicianModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public event Action onSelectUpdate;
diff --git a/System/Role/PropertyBehaviour.cs b/System/Role/PropertyBehaviour.cs
index a6ccb7f..eae3898 100644
--- a/System/Role/PropertyBehaviour.cs
+++ b/System/Role/PropertyBehaviour.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class PropertyBehaviour : MonoBehaviour
{
[SerializeField] Text m_PropertyName;
diff --git a/System/Role/ReikiRootModel.cs b/System/Role/ReikiRootModel.cs
index f1172a3..3c33ea3 100644
--- a/System/Role/ReikiRootModel.cs
+++ b/System/Role/ReikiRootModel.cs
@@ -1,11 +1,11 @@
锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections;
+using System.Collections.Generic;
using System.Text.RegularExpressions;
-using UnityEngine;
+using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ReikiRootModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, int> m_ReikiRootPoints = new Dictionary<int, int>();
@@ -97,7 +97,7 @@
public TreasureAddPoint treasureAddPoint { get; private set; }
- public readonly Redpoint redpoint = new Redpoint(101, 10103);
+ public readonly Redpoint redpoint = new Redpoint(101, 10103);
public event Action onCacheFreePointRefresh;
public event Action onReikiRootPointRefresh;
@@ -807,6 +807,6 @@
public int point;
}
-}
-
-
+}
+
+
diff --git a/System/Role/RoleModel.cs b/System/Role/RoleModel.cs
index a5b89b1..0d115c0 100644
--- a/System/Role/RoleModel.cs
+++ b/System/Role/RoleModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RoleModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk
{
FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }
diff --git a/System/Role/TitleModel.cs b/System/Role/TitleModel.cs
index ea1b3e6..b4c4359 100644
--- a/System/Role/TitleModel.cs
+++ b/System/Role/TitleModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class TitleModel : Model, IBeforePlayerDataInitialize,IPlayerLoginOk
{
const string TITLEKEY = "Title";
diff --git a/System/RoleParticulars/OtherPlayerEquipModel.cs b/System/RoleParticulars/OtherPlayerEquipModel.cs
index 8b7c726..f96f747 100644
--- a/System/RoleParticulars/OtherPlayerEquipModel.cs
+++ b/System/RoleParticulars/OtherPlayerEquipModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class OtherPlayerEquipModel : Model
{
diff --git a/System/RoleParticulars/RoleParticularModel.cs b/System/RoleParticulars/RoleParticularModel.cs
index e54d02c..bc585fa 100644
--- a/System/RoleParticulars/RoleParticularModel.cs
+++ b/System/RoleParticulars/RoleParticularModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RoleParticularModel : Model, IBeforePlayerDataInitialize
{
diff --git a/System/RolePromote/RolePromoteModel.cs b/System/RolePromote/RolePromoteModel.cs
index c361f5e..2a9a0b7 100644
--- a/System/RolePromote/RolePromoteModel.cs
+++ b/System/RolePromote/RolePromoteModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RolePromoteModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk
{
PackModel _playerPack;
diff --git a/System/Rune/RuneComposeModel.cs b/System/Rune/RuneComposeModel.cs
index 83016c2..2c292c1 100644
--- a/System/Rune/RuneComposeModel.cs
+++ b/System/Rune/RuneComposeModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RuneComposeModel : Model, IPlayerLoginOk
{
RuneModel runeModel { get { return ModelCenter.Instance.GetModel<RuneModel>(); } }
diff --git a/System/Rune/RuneModel.cs b/System/Rune/RuneModel.cs
index 70baf55..05ece30 100644
--- a/System/Rune/RuneModel.cs
+++ b/System/Rune/RuneModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RuneModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/Rune/RuneResolveModel.cs b/System/Rune/RuneResolveModel.cs
index 3e7a2f8..c0646e5 100644
--- a/System/Rune/RuneResolveModel.cs
+++ b/System/Rune/RuneResolveModel.cs
@@ -4,7 +4,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RuneResolveModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/RuneTower/RuneTowerModel.cs b/System/RuneTower/RuneTowerModel.cs
index 9696196..9b3c05d 100644
--- a/System/RuneTower/RuneTowerModel.cs
+++ b/System/RuneTower/RuneTowerModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class RuneTowerModel : Model, IMapInitOk, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public const int RUNETOWER_MAPID = 31130;
diff --git a/System/Skill/ExpertSkillSelectWin.cs b/System/Skill/ExpertSkillSelectWin.cs
index 6ad4b4e..0e62c05 100644
--- a/System/Skill/ExpertSkillSelectWin.cs
+++ b/System/Skill/ExpertSkillSelectWin.cs
@@ -11,7 +11,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ExpertSkillSelectWin : Window
{
[SerializeField] Image m_SkillIcon;
diff --git a/System/Skill/QuickSetting.cs b/System/Skill/QuickSetting.cs
index f14fc94..e2377b3 100644
--- a/System/Skill/QuickSetting.cs
+++ b/System/Skill/QuickSetting.cs
@@ -7,14 +7,14 @@
/// <summary>
/// 鏈嶅姟绔疭etting閰嶇疆锛屽瓨鍌ㄤ竴浜涘揩鎹疯缃紝鐩墠闀垮害涓�100
/// </summary>
-[XLua.LuaCallCSharp]
+
public class QuickSetting : Singleton<QuickSetting>
{
public QuickSetting()
{
quickSettingDic.Add(QuickSettingType.Skill, new QuickSettingRange(QuickSettingType.Skill, 0, 30, 3));
quickSettingDic.Add(QuickSettingType.SkillMatchPage, new QuickSettingRange(QuickSettingType.SkillMatchPage, 30, 1));
- quickSettingDic.Add(QuickSettingType.AutoUseXp, new QuickSettingRange(QuickSettingType.AutoUseXp, 31, 1));
+ quickSettingDic.Add(QuickSettingType.AutoUseXp, new QuickSettingRange(QuickSettingType.AutoUseXp, 31, 1));
quickSettingDic.Add(QuickSettingType.SkillMatch, new QuickSettingRange(QuickSettingType.SkillMatch, 32, 45, 1));
quickSettingDic.Add(QuickSettingType.GatherSoulAutoResolve, new QuickSettingRange(QuickSettingType.GatherSoulAutoResolve, 80, 1));
setting = new string(UCharacter, 100);
@@ -38,9 +38,9 @@
SetQuickSetting<int>(type, value ? 1 : 0, index);
}
- public void SetQuickSetting(int type, string value, int index)
- {
- SetQuickSetting((QuickSettingType)type, value, index);
+ public void SetQuickSetting(int type, string value, int index)
+ {
+ SetQuickSetting((QuickSettingType)type, value, index);
}
public void SetQuickSetting(QuickSettingType type, string value, int index)
@@ -52,18 +52,18 @@
return;
}
textBuilder.Length = 0;
- var start = quickRange.index + index * quickRange.single;
+ var start = quickRange.index + index * quickRange.single;
var end = start + value.Length;
- if (quickRange.length == quickRange.single)
- {
- end = start + quickRange.length;
+ if (quickRange.length == quickRange.single)
+ {
+ end = start + quickRange.length;
}
textBuilder.Append(setting, 0, start);
textBuilder.Append(value);
- if (quickRange.length == quickRange.single
- && quickRange.length > value.Length)
- {
- textBuilder.Append('*', quickRange.length - value.Length);
+ if (quickRange.length == quickRange.single
+ && quickRange.length > value.Length)
+ {
+ textBuilder.Append('*', quickRange.length - value.Length);
}
textBuilder.Append(setting, end, setting.Length - end);
setting = textBuilder.ToString();
@@ -80,9 +80,9 @@
}
PlayerDatas.Instance.skill.SetQuickSkills();
- if (onQuickSettingUpdate != null)
- {
- onQuickSettingUpdate();
+ if (onQuickSettingUpdate != null)
+ {
+ onQuickSettingUpdate();
}
}
@@ -115,19 +115,19 @@
return _value == 1;
}
- public string GetQuickSetting(int type, int index)
- {
- return GetQuickSetting((QuickSettingType)type, index);
+ public string GetQuickSetting(int type, int index)
+ {
+ return GetQuickSetting((QuickSettingType)type, index);
}
public void SendPackage()
{
- if (cacheSetting != setting)
- {
- cacheSetting = setting;
- C0303_tagCSetShutCutData vNetData = new C0303_tagCSetShutCutData();
- vNetData.Setting = setting;
- GameNetSystem.Instance.SendInfo(vNetData);
+ if (cacheSetting != setting)
+ {
+ cacheSetting = setting;
+ C0303_tagCSetShutCutData vNetData = new C0303_tagCSetShutCutData();
+ vNetData.Setting = setting;
+ GameNetSystem.Instance.SendInfo(vNetData);
}
}
diff --git a/System/Skill/ScrollerController.cs b/System/Skill/ScrollerController.cs
index 7ff3416..d35fd4d 100644
--- a/System/Skill/ScrollerController.cs
+++ b/System/Skill/ScrollerController.cs
@@ -15,11 +15,9 @@
KeepVertical,
KeepVertical2,
}
-[XLua.CSharpCallLua]
public class ScrollerController : MonoBehaviour, IEnhancedScrollerDelegate {
private List<ScrollerData> _data = new List<ScrollerData>();
- [XLua.CSharpCallLua]
public delegate void OnRefreshCellDelegate(ScrollerDataType type, CellView cell);
public event OnRefreshCellDelegate OnRefreshCell;
diff --git a/System/Skill/SkillModel.cs b/System/Skill/SkillModel.cs
index b6cfd29..5563097 100644
--- a/System/Skill/SkillModel.cs
+++ b/System/Skill/SkillModel.cs
@@ -8,20 +8,14 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
- public class SkillModel : Model, IBeforePlayerDataInitialize,IPlayerLoginOk
+
+ public class SkillModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public override void Init()
{
ParseConfig();
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
TaskModel.Event_TaskInformation += TaskInformationUpdate;
-
- ISkillMatch skillMatch = LuaUtility.Global.Get<ISkillMatch>("SkillMatchModel");
- if (skillMatch != null)
- {
- skillMatch.onSkillMatchPageUpdate += OnSkillMatchPageUpdate;
- }
}
public override void UnInit()
@@ -57,11 +51,9 @@
public int minTaskHole { get; private set; }
public int maxTaskHole { get; private set; }
- public bool skillMatchRedpointable
- {
+ public bool skillMatchRedpointable {
get { return LocalSave.GetBool("SkillMatchRedpointable_" + PlayerDatas.Instance.baseData.PlayerID); }
- set
- {
+ set {
LocalSave.SetBool("SkillMatchRedpointable_" + PlayerDatas.Instance.baseData.PlayerID, value);
UpdateSkillMatchRedpoint();
}
@@ -215,7 +207,7 @@
if (xpSkillsDic.ContainsKey(job))
{
return xpSkillsDic[job] == config.SkillTypeID;
- }
+ }
}
return false;
}
@@ -305,10 +297,8 @@
public int skillDragId = 0;
public float onDragDelay = 0.1f;
private Skill m_XpSkill;
- public Skill xpSkill
- {
- get
- {
+ public Skill xpSkill {
+ get {
return m_XpSkill ?? (m_XpSkill = PlayerDatas.Instance.hero.SkillMgr.Get(GetXpSkillID()));
}
}
@@ -408,7 +398,7 @@
SoundPlayer.Instance.PlayUIAudio(28);
SendEquipPassSkill(presentSltPage, _hole, _skillId);
}
-
+
}
}
@@ -418,8 +408,7 @@
public const string TASKHOLEKEY = "OpenSkillSlots";
- public int UnlockPassHole
- {
+ public int UnlockPassHole {
get { return LocalSave.GetInt(StringUtility.Contact(TASKHOLEKEY, "_", PlayerDatas.Instance.baseData.PlayerID)); }
set { LocalSave.SetInt(StringUtility.Contact(TASKHOLEKEY, "_", PlayerDatas.Instance.baseData.PlayerID), value); }
}
@@ -468,10 +457,8 @@
}
RolePromoteModel m_PromoteModel;
- RolePromoteModel promoteModel
- {
- get
- {
+ RolePromoteModel promoteModel {
+ get {
return m_PromoteModel ?? (m_PromoteModel = ModelCenter.Instance.GetModel<RolePromoteModel>());
}
}
@@ -820,7 +807,8 @@
}
public event Action onSkillMatchPageUpdate;
- private void OnSkillMatchPageUpdate()
+
+ public void OnSkillMatchPageUpdate()
{
if (onSkillMatchPageUpdate != null)
{
@@ -830,12 +818,7 @@
public List<int> GetSkillMatchs()
{
- ISkillMatch skillMatch = LuaUtility.Global.Get<ISkillMatch>("SkillMatchModel");
- if (skillMatch != null)
- {
- return skillMatch.GetSkills();
- }
- return null;
+ return ILRuntimeUtility.Instance.ModelInvoke<List<int>>("SkillMatchModel", "GetSkills");
}
}
@@ -895,7 +878,6 @@
}
}
- [XLua.CSharpCallLua]
public interface ISkillMatch
{
List<int> GetSkills();
diff --git a/System/Skill/TalentModel.cs b/System/Skill/TalentModel.cs
index 02233d6..9c3713c 100644
--- a/System/Skill/TalentModel.cs
+++ b/System/Skill/TalentModel.cs
@@ -1,13 +1,13 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
using System;
using System.Linq;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class TalentModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize
{
Dictionary<int, TalentSkill> talentSkills = new Dictionary<int, TalentSkill>();
@@ -577,5 +577,5 @@
return config.StateSkillLV % 100000;
}
}
-}
-
+}
+
diff --git a/System/Skill/TreasureSkillModel.cs b/System/Skill/TreasureSkillModel.cs
index 86f493e..8d3a8cf 100644
--- a/System/Skill/TreasureSkillModel.cs
+++ b/System/Skill/TreasureSkillModel.cs
@@ -4,7 +4,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class TreasureSkillModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/SkyTower/SkyTowerModel.cs b/System/SkyTower/SkyTowerModel.cs
index a398291..6c8c63d 100644
--- a/System/SkyTower/SkyTowerModel.cs
+++ b/System/SkyTower/SkyTowerModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class SkyTowerModel : Model, IPlayerLoginOk, ISwitchAccount
{
diff --git a/System/SpiritWeapon/SpiritWeaponModel.cs b/System/SpiritWeapon/SpiritWeaponModel.cs
index 078e2b0..54d749b 100644
--- a/System/SpiritWeapon/SpiritWeaponModel.cs
+++ b/System/SpiritWeapon/SpiritWeaponModel.cs
@@ -4,7 +4,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class SpiritWeaponModel : Model
{
public static bool hasAutoEquipWing {
diff --git a/System/StartCoroutine/CoroutineMgr.cs b/System/StartCoroutine/CoroutineMgr.cs
index 3e91075..9928502 100644
--- a/System/StartCoroutine/CoroutineMgr.cs
+++ b/System/StartCoroutine/CoroutineMgr.cs
@@ -6,9 +6,9 @@
using Snxxz.UI;
using System.Linq;
-[XLua.LuaCallCSharp]
+
public class CoroutineMgr : SingletonMonobehaviour<CoroutineMgr>
-
+
{
public event Action MainHighTipCdTimeEvent;//涓荤晫闈笂灞傚垏鎹D鏃堕棿
diff --git a/System/Store/BuyItemController.cs b/System/Store/BuyItemController.cs
index 7e677e9..d6aeef6 100644
--- a/System/Store/BuyItemController.cs
+++ b/System/Store/BuyItemController.cs
@@ -5,12 +5,12 @@
using System.Text;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class BuyItemController : Singleton<BuyItemController>
{
- Dictionary<int, int> vipBuyCntDict = new Dictionary<int, int>();
-
+ Dictionary<int, int> vipBuyCntDict = new Dictionary<int, int>();
+
public bool CheckIsVipBuy(StoreConfig model, out int curVipIndex, out int nextVipIndex)
{
vipBuyCntDict.Clear();
@@ -179,7 +179,7 @@
index = i;
break;
}
- }
+ }
if (index != -1)
{
diff --git a/System/Store/Logic/BuySuccessModel.cs b/System/Store/Logic/BuySuccessModel.cs
index ca5815d..6dab40d 100644
--- a/System/Store/Logic/BuySuccessModel.cs
+++ b/System/Store/Logic/BuySuccessModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class BuySuccessModel : Singleton<BuySuccessModel>
{
diff --git a/System/Store/StoreModel.cs b/System/Store/StoreModel.cs
index 2183bca..62f32f0 100644
--- a/System/Store/StoreModel.cs
+++ b/System/Store/StoreModel.cs
@@ -26,8 +26,6 @@
}
}
-[XLua.LuaCallCSharp]
-[XLua.CSharpCallLua]
public class StoreModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk, ISwitchAccount
{
Dictionary<int, List<int>> storeAlchemyStudyItemShopIds = new Dictionary<int, List<int>>();
diff --git a/System/Strengthening/GodBeastModel.cs b/System/Strengthening/GodBeastModel.cs
index 3a9b7a9..a7aa9e8 100644
--- a/System/Strengthening/GodBeastModel.cs
+++ b/System/Strengthening/GodBeastModel.cs
@@ -11,7 +11,7 @@
using UnityEngine;
// 鍏充簬绁炲吔寮哄寲
-[XLua.LuaCallCSharp]
+
public class GodBeastModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public Dictionary<int, int> Absorption_Dic = new Dictionary<int, int>();//鑾峰彇閫夋嫨鐨勭墿鍝�
diff --git a/System/Strengthening/HowToPlayModel.cs b/System/Strengthening/HowToPlayModel.cs
index 5e8f3ff..4934db8 100644
--- a/System/Strengthening/HowToPlayModel.cs
+++ b/System/Strengthening/HowToPlayModel.cs
@@ -1,6 +1,6 @@
锘縰sing Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public class HowToPlayModel : Model
{
public override void Init()
diff --git a/System/Strengthening/WingsRedDotModel.cs b/System/Strengthening/WingsRedDotModel.cs
index 5de93fd..3a4c305 100644
--- a/System/Strengthening/WingsRedDotModel.cs
+++ b/System/Strengthening/WingsRedDotModel.cs
@@ -12,7 +12,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class WingsRedDotModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize
{
private const int Redpoint_key = 10603;
diff --git a/System/SystemSetting/ActivitiesPushModel.cs b/System/SystemSetting/ActivitiesPushModel.cs
index 6e12f2d..c43e461 100644
--- a/System/SystemSetting/ActivitiesPushModel.cs
+++ b/System/SystemSetting/ActivitiesPushModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ActivitiesPushModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk
{
public const int WholePeopleRankStart = 2091000; //鍏ㄦ皯鍐叉寮�濮�
diff --git a/System/SystemSetting/ChatSetting.cs b/System/SystemSetting/ChatSetting.cs
index b5160c7..6a8d9ce 100644
--- a/System/SystemSetting/ChatSetting.cs
+++ b/System/SystemSetting/ChatSetting.cs
@@ -33,9 +33,9 @@
//AllianceVoice4G, //鍚岀洘璇煶4G
}
- [XLua.LuaCallCSharp]
+
public class ChatSetting : Singleton<ChatSetting>
-
+
{
const string ChatBoolSet_Key = "ChatBoolSet";
diff --git a/System/SystemSetting/FuncSwitchModel.cs b/System/SystemSetting/FuncSwitchModel.cs
index 7182580..a15cfb9 100644
--- a/System/SystemSetting/FuncSwitchModel.cs
+++ b/System/SystemSetting/FuncSwitchModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FuncSwitchModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/SystemSetting/HangUpSetModel.cs b/System/SystemSetting/HangUpSetModel.cs
index af28f5d..b58f402 100644
--- a/System/SystemSetting/HangUpSetModel.cs
+++ b/System/SystemSetting/HangUpSetModel.cs
@@ -24,9 +24,9 @@
isAutoReborn,//鏄惁鑷姩涔版椿
}
-[XLua.LuaCallCSharp]
+
public class HangUpSetModel : Singleton<HangUpSetModel>
-
+
{
const string HpSet_Key = "HpSet";
const string HangUpBoolSet_Key = "HangUpBoolSet";
diff --git a/System/SystemSetting/PrivateRemind.cs b/System/SystemSetting/PrivateRemind.cs
index 7d5e401..b8a0027 100644
--- a/System/SystemSetting/PrivateRemind.cs
+++ b/System/SystemSetting/PrivateRemind.cs
@@ -14,7 +14,7 @@
}
-[XLua.LuaCallCSharp]
+
public class PrivateRemind : Singleton<HangUpSetModel>
{
diff --git a/System/SystemSetting/SetPrivateModel.cs b/System/SystemSetting/SetPrivateModel.cs
index c137e59..23a3995 100644
--- a/System/SystemSetting/SetPrivateModel.cs
+++ b/System/SystemSetting/SetPrivateModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class SetPrivateModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk
{
DailyQuestModel dailyModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
diff --git a/System/SystemSetting/SettingEffectMgr.cs b/System/SystemSetting/SettingEffectMgr.cs
index 9507f99..d770b83 100644
--- a/System/SystemSetting/SettingEffectMgr.cs
+++ b/System/SystemSetting/SettingEffectMgr.cs
@@ -7,7 +7,7 @@
using System.Collections;
-[XLua.LuaCallCSharp]
+
public class SettingEffectMgr : SingletonMonobehaviour<SettingEffectMgr>
{
diff --git a/System/SystemSetting/SettingMgr.cs b/System/SystemSetting/SettingMgr.cs
index 3d5eb15..aba1b15 100644
--- a/System/SystemSetting/SettingMgr.cs
+++ b/System/SystemSetting/SettingMgr.cs
@@ -4,9 +4,9 @@
using System.Text;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class SettingMgr : Singleton<SettingMgr>
-
+
{
public string accountKey = "";
diff --git a/System/SystemSetting/SystemSetting.cs b/System/SystemSetting/SystemSetting.cs
index dfea04f..a3dfadf 100644
--- a/System/SystemSetting/SystemSetting.cs
+++ b/System/SystemSetting/SystemSetting.cs
@@ -6,9 +6,9 @@
using Snxxz.UI;
using System.Collections;
-[XLua.LuaCallCSharp]
+
public class SystemSetting : Singleton<SystemSetting>
-
+
{
const string QUALITY_LEVEL_KEY = "GameQualityLevel";
const string SOUND_VOLUME_KEY = "SoundRatioKey"; //闊充箰
diff --git a/System/TaiChi/TaiChiModel.cs b/System/TaiChi/TaiChiModel.cs
index 4133f5c..2728e3b 100644
--- a/System/TaiChi/TaiChiModel.cs
+++ b/System/TaiChi/TaiChiModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
using System.Collections.Generic;
-[XLua.LuaCallCSharp]
+
public class TaiChiModel : Model,IBeforePlayerDataInitialize
{
//鏃ュ父娲诲姩
diff --git a/System/Team/GroupDungeonChallengeProcessor.cs b/System/Team/GroupDungeonChallengeProcessor.cs
index 7e8506d..af946dd 100644
--- a/System/Team/GroupDungeonChallengeProcessor.cs
+++ b/System/Team/GroupDungeonChallengeProcessor.cs
@@ -1,13 +1,13 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
-public class GroupDungeonChallengeProcessor : SingletonMonobehaviour<GroupDungeonChallengeProcessor>
-
+
+public class GroupDungeonChallengeProcessor : SingletonMonobehaviour<GroupDungeonChallengeProcessor>
+
{
int mapId = 0;
int lineId = 0;
@@ -140,7 +140,7 @@
//}
- }
+ }
-}
-
+}
+
diff --git a/System/Team/TeamModel.cs b/System/Team/TeamModel.cs
index 8fcf4ab..966e0cb 100644
--- a/System/Team/TeamModel.cs
+++ b/System/Team/TeamModel.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class TeamModel : Model, IAfterPlayerDataInitialize, ISwitchAccount, IPlayerLoginOk, IMapInitOk
{
public const int NONE_MISSION = 0;
diff --git a/System/Tip/ConfirmCancel.cs b/System/Tip/ConfirmCancel.cs
index 205ee45..3711826 100644
--- a/System/Tip/ConfirmCancel.cs
+++ b/System/Tip/ConfirmCancel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ConfirmCancel
{
public static Action<bool> OnPopConfirmClickEvent;
diff --git a/System/Tip/PwdKeyboard.cs b/System/Tip/PwdKeyboard.cs
index 2b25e2f..8e24ac8 100644
--- a/System/Tip/PwdKeyboard.cs
+++ b/System/Tip/PwdKeyboard.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class PwdKeyboard : Singleton<PwdKeyboard> {
public string pwd = string.Empty;
diff --git a/System/Treasure/TreasureModel.cs b/System/Treasure/TreasureModel.cs
index 5ea3ac7..7bec29d 100644
--- a/System/Treasure/TreasureModel.cs
+++ b/System/Treasure/TreasureModel.cs
@@ -12,7 +12,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class TreasureModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk
{
Dictionary<int, Treasure> treasures = new Dictionary<int, Treasure>();
diff --git a/System/TreasureFindHost/TreasureFindHostModel.cs b/System/TreasureFindHost/TreasureFindHostModel.cs
index dc183f2..03edaca 100644
--- a/System/TreasureFindHost/TreasureFindHostModel.cs
+++ b/System/TreasureFindHost/TreasureFindHostModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class TreasureFindHostModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk
{
Dictionary<int, List<FindTreasureInfo>> findTreasures = new Dictionary<int, List<FindTreasureInfo>>();
diff --git a/System/Vip/DayPackageModel.cs b/System/Vip/DayPackageModel.cs
index 7e5ac04..4876c0b 100644
--- a/System/Vip/DayPackageModel.cs
+++ b/System/Vip/DayPackageModel.cs
@@ -7,7 +7,7 @@
using System.Collections.Generic;
using LitJson;
-[XLua.LuaCallCSharp]
+
public class DayPackageItemClassModel : Model, IPlayerLoginOk, IOpenServerActivity, IBeforePlayerDataInitialize
{
int m_SelectIndex = 0;
diff --git a/System/Vip/FirstTimeRechargeModel.cs b/System/Vip/FirstTimeRechargeModel.cs
index 035e0a6..bcd573f 100644
--- a/System/Vip/FirstTimeRechargeModel.cs
+++ b/System/Vip/FirstTimeRechargeModel.cs
@@ -12,7 +12,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FirstTimeRechargeModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
diff --git a/System/Vip/LimitedTimePackageModel.cs b/System/Vip/LimitedTimePackageModel.cs
index 472deda..24cd49d 100644
--- a/System/Vip/LimitedTimePackageModel.cs
+++ b/System/Vip/LimitedTimePackageModel.cs
@@ -6,7 +6,7 @@
using System;
using System.Collections.Generic;
-[XLua.LuaCallCSharp]
+
public class LimitedTimePackageItemClassModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
int m_SelectIndex = 0;
diff --git a/System/Vip/MultiRechargeModel.cs b/System/Vip/MultiRechargeModel.cs
index 41bc83f..7386fea 100644
--- a/System/Vip/MultiRechargeModel.cs
+++ b/System/Vip/MultiRechargeModel.cs
@@ -9,7 +9,7 @@
/// </summary>
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class MultiRechargeModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
Operation multiRechargeType = Operation.MultiRecharge;
diff --git a/System/Vip/NeedForWhiteModel.cs b/System/Vip/NeedForWhiteModel.cs
index 31cd09b..bf761fb 100644
--- a/System/Vip/NeedForWhiteModel.cs
+++ b/System/Vip/NeedForWhiteModel.cs
@@ -25,7 +25,7 @@
public DateTime dateTime;
}
-[XLua.LuaCallCSharp]
+
public class NeedForWhiteModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public Dictionary<int, NeedForWhiteClass> NeedForWhiteDic = new Dictionary<int, NeedForWhiteClass>();
diff --git a/System/Vip/OSTimeLimitGiftModel.cs b/System/Vip/OSTimeLimitGiftModel.cs
index 7c5d0d2..945745b 100644
--- a/System/Vip/OSTimeLimitGiftModel.cs
+++ b/System/Vip/OSTimeLimitGiftModel.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class OSTimeLimitGiftModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize, IOpenServerActivity
{
Dictionary<int, List<StoreConfig>> m_OSTimeLimitGifts = new Dictionary<int, List<StoreConfig>>();
diff --git a/System/Vip/SuperUPGiftModel.cs b/System/Vip/SuperUPGiftModel.cs
index d4320f9..7a114a6 100644
--- a/System/Vip/SuperUPGiftModel.cs
+++ b/System/Vip/SuperUPGiftModel.cs
@@ -7,7 +7,7 @@
using System.Collections.Generic;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class SuperUPGiftModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
//瓒呯骇鍔╁姏 鍓嶇绾樉绀烘帶鍒舵椿鍔�
diff --git a/System/Vip/VipInvest/VipInvestModel.cs b/System/Vip/VipInvest/VipInvestModel.cs
index 3ef1ae8..56eb1d9 100644
--- a/System/Vip/VipInvest/VipInvestModel.cs
+++ b/System/Vip/VipInvest/VipInvestModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class VipInvestModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
Dictionary<string, Dictionary<string, List<InvestReward>>> vipInvestDict = new Dictionary<string, Dictionary<string, List<InvestReward>>>();
diff --git a/System/Vip/VipInvest/WheelOfFortuneModel.cs b/System/Vip/VipInvest/WheelOfFortuneModel.cs
index 0811114..0ad1e01 100644
--- a/System/Vip/VipInvest/WheelOfFortuneModel.cs
+++ b/System/Vip/VipInvest/WheelOfFortuneModel.cs
@@ -5,7 +5,7 @@
using LitJson;
using System;
-using System.Collections;
+using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -13,7 +13,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class WheelOfFortuneModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
public class AngleClass
@@ -85,7 +85,7 @@
angleClass.AngleEnd = (float)AngleList[i][1];
AngleDic.Add(Type, angleClass);
}
- }
+ }
SysNotifyMgr.Instance.RegisterCondition("BindJadeNotice", SatisfyNotifyCondition);
}
@@ -204,15 +204,15 @@
}
return 0;
}
- private bool SatisfyNotifyCondition(string key, ArrayList paramArray)
- {
-
- if (paramArray != null && paramArray.Count > 0 &&
- paramArray[0].Equals(UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName)))
- {
- return false;
- }
- return true;
+ private bool SatisfyNotifyCondition(string key, ArrayList paramArray)
+ {
+
+ if (paramArray != null && paramArray.Count > 0 &&
+ paramArray[0].Equals(UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName)))
+ {
+ return false;
+ }
+ return true;
}
}
}
diff --git a/System/Vip/VipModel.cs b/System/Vip/VipModel.cs
index 6082e2e..654b306 100644
--- a/System/Vip/VipModel.cs
+++ b/System/Vip/VipModel.cs
@@ -8,7 +8,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class VipModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
private Dictionary<int, VipGiftData> vipGiftDics = new Dictionary<int, VipGiftData>();
diff --git a/System/Voice/SpeechTranslate.cs b/System/Voice/SpeechTranslate.cs
index f01a700..3bc75c1 100644
--- a/System/Voice/SpeechTranslate.cs
+++ b/System/Voice/SpeechTranslate.cs
@@ -3,9 +3,9 @@
using UnityEngine;
using System.Collections.Generic;
-[XLua.LuaCallCSharp]
+
public class SpeechTranslate : Singleton<SpeechTranslate>
-
+
{
public const int AUDIO_TIMELIMIT = 8;//绉�
diff --git a/System/Welfare/AwardExchangeModel.cs b/System/Welfare/AwardExchangeModel.cs
index 98feda1..12d89b0 100644
--- a/System/Welfare/AwardExchangeModel.cs
+++ b/System/Welfare/AwardExchangeModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class AwardExchangeModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk
{
public MailItemModel[] getItems { get; private set; }
diff --git a/System/Welfare/CZBMModel.cs b/System/Welfare/CZBMModel.cs
index 6fe20bc..9bd0675 100644
--- a/System/Welfare/CZBMModel.cs
+++ b/System/Welfare/CZBMModel.cs
@@ -6,7 +6,7 @@
using System;
using System.Collections.Generic;
-[XLua.LuaCallCSharp]
+
public class CZBMModel : Model
{
int m_SelectIndex = 0;
diff --git a/System/Welfare/ConsumeRebateModel.cs b/System/Welfare/ConsumeRebateModel.cs
index 9a9444f..0581c5c 100644
--- a/System/Welfare/ConsumeRebateModel.cs
+++ b/System/Welfare/ConsumeRebateModel.cs
@@ -1,10 +1,10 @@
锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ConsumeRebateModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize, IOpenServerActivity
{
public event Action consumeRebateUpdateEvent;
@@ -222,5 +222,5 @@
}
}
}
-}
-
+}
+
diff --git a/System/Welfare/LevelGiftModel.cs b/System/Welfare/LevelGiftModel.cs
index 339ecb4..c6d36dc 100644
--- a/System/Welfare/LevelGiftModel.cs
+++ b/System/Welfare/LevelGiftModel.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class LevelGiftModel : Model,IBeforePlayerDataInitialize,IPlayerLoginOk
{
public override void Init()
diff --git a/System/Welfare/MultipleExpModel.cs b/System/Welfare/MultipleExpModel.cs
index 183640b..48a2266 100644
--- a/System/Welfare/MultipleExpModel.cs
+++ b/System/Welfare/MultipleExpModel.cs
@@ -4,7 +4,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class MultipleExpModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize, IOpenServerActivity
{
private bool showTip = false;
diff --git a/System/Welfare/MultipleRealmPointModel.cs b/System/Welfare/MultipleRealmPointModel.cs
index 39f7b21..52c45e5 100644
--- a/System/Welfare/MultipleRealmPointModel.cs
+++ b/System/Welfare/MultipleRealmPointModel.cs
@@ -3,7 +3,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class MultipleRealmPointModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
public Redpoint multipleRed = new Redpoint(MainRedDot.REDPOINT_OPENSERVER, 20908);
diff --git a/System/Welfare/OperationTimeHepler.cs b/System/Welfare/OperationTimeHepler.cs
index da673ee..94f05d0 100644
--- a/System/Welfare/OperationTimeHepler.cs
+++ b/System/Welfare/OperationTimeHepler.cs
@@ -5,7 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class OperationTimeHepler : Singleton<OperationTimeHepler>
{
private Dictionary<Operation, OperationBase> operationDict = new Dictionary<Operation, OperationBase>();
diff --git a/System/Welfare/PrayerModel.cs b/System/Welfare/PrayerModel.cs
index eecb7ee..6d050a2 100644
--- a/System/Welfare/PrayerModel.cs
+++ b/System/Welfare/PrayerModel.cs
@@ -9,7 +9,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class PrayerModel : Model
{
public event Action OnCoinPrayerEvent;
diff --git a/System/Welfare/SignInModel.cs b/System/Welfare/SignInModel.cs
index dba030c..f8d1cf9 100644
--- a/System/Welfare/SignInModel.cs
+++ b/System/Welfare/SignInModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class SignInModel : Model, IBeforePlayerDataInitialize
{
public int keepSignInCost
diff --git a/System/Welfare/WelfareCenter.cs b/System/Welfare/WelfareCenter.cs
index 052fa16..3401885 100644
--- a/System/Welfare/WelfareCenter.cs
+++ b/System/Welfare/WelfareCenter.cs
@@ -1,11 +1,11 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
-public class WelfareCenter : Singleton<WelfareCenter>
-
+
+public class WelfareCenter : Singleton<WelfareCenter>
+
{
SignInModel signInModel { get { return ModelCenter.Instance.GetModel<SignInModel>(); } }
@@ -105,5 +105,5 @@
return functionOrder;
}
}
-}
-
+}
+
diff --git a/System/WindowBase/ModelCenter.cs b/System/WindowBase/ModelCenter.cs
index 6dd681f..0965f0b 100644
--- a/System/WindowBase/ModelCenter.cs
+++ b/System/WindowBase/ModelCenter.cs
@@ -52,7 +52,7 @@
void OnSwitchAccount();
}
- [XLua.LuaCallCSharp]
+
public class ModelCenter : Singleton<ModelCenter>
{
bool inited = false;
diff --git a/System/WindowBase/OneLevelWin.cs b/System/WindowBase/OneLevelWin.cs
index 4fd3704..8a59af5 100644
--- a/System/WindowBase/OneLevelWin.cs
+++ b/System/WindowBase/OneLevelWin.cs
@@ -13,7 +13,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class OneLevelWin : Window
{
protected Image m_TitleIcon;
diff --git a/System/WindowBase/WidgetBehavior.cs b/System/WindowBase/WidgetBehavior.cs
index 497bddb..41f03d7 100644
--- a/System/WindowBase/WidgetBehavior.cs
+++ b/System/WindowBase/WidgetBehavior.cs
@@ -9,7 +9,7 @@
public GameObject gameObject;
}
-[XLua.LuaCallCSharp]
+
public class WidgetBehavior : MonoBehaviour
{
[HideInInspector]
diff --git a/System/WindowBase/WindowCenter.cs b/System/WindowBase/WindowCenter.cs
index 73158ba..089518a 100644
--- a/System/WindowBase/WindowCenter.cs
+++ b/System/WindowBase/WindowCenter.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class WindowCenter : SingletonMonobehaviour<WindowCenter>
{
public event Action<Window> windowBeforeOpenEvent;
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 811b301..218f20b 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -4,7 +4,7 @@
using System.Collections;
-[XLua.LuaCallCSharp]
+
public class WindowJumpMgr : Singleton<WindowJumpMgr>
{
private FuncConfigConfig funcOpenBagItem = null;
@@ -1622,7 +1622,7 @@
/// 瑙勫垯鏄瘡涓郴缁熷搴旀爣绛鹃〉椤哄簭
/// </summary>
///
-[XLua.LuaCallCSharp]
+
public enum JumpUIType
{
None = 0,
diff --git a/System/WorldMap/MapModel.cs b/System/WorldMap/MapModel.cs
index 2094587..51cf5fd 100644
--- a/System/WorldMap/MapModel.cs
+++ b/System/WorldMap/MapModel.cs
@@ -11,7 +11,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class MapModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk, IMapInitOk
{
Dictionary<int, WorldMapArea> worldMapAreas = new Dictionary<int, WorldMapArea>();
diff --git a/System/WorldMap/WorldMapSkip.cs b/System/WorldMap/WorldMapSkip.cs
index 04e75c9..adbb13e 100644
--- a/System/WorldMap/WorldMapSkip.cs
+++ b/System/WorldMap/WorldMapSkip.cs
@@ -4,7 +4,7 @@
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class WorldMapSkip : SingletonMonobehaviour<WorldMapSkip>
{
diff --git a/UI/Common/CyclicScroll.cs b/UI/Common/CyclicScroll.cs
index 2fcbfc2..8e57ea6 100644
--- a/UI/Common/CyclicScroll.cs
+++ b/UI/Common/CyclicScroll.cs
@@ -5,7 +5,7 @@
using System;
[DisallowMultipleComponent]
-[XLua.LuaCallCSharp]
+
public class CyclicScroll : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler
{
[SerializeField] RectTransform m_Content;
diff --git a/UI/Common/FuncOpen.cs b/UI/Common/FuncOpen.cs
index 288eb20..39614af 100644
--- a/UI/Common/FuncOpen.cs
+++ b/UI/Common/FuncOpen.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FuncOpen
{
private static FuncOpen _inst = null;
diff --git a/UI/Common/FunctionButton.cs b/UI/Common/FunctionButton.cs
index 5a1403b..6b30ac2 100644
--- a/UI/Common/FunctionButton.cs
+++ b/UI/Common/FunctionButton.cs
@@ -13,7 +13,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class FunctionButton : Button
{
[SerializeField] int m_Order = 0;
@@ -27,9 +27,9 @@
[SerializeField] int m_FunctionId = -1;
public int functionId {
get { return m_FunctionId; }
- set {
- m_FunctionId = value;
- OnFunctionUnLockStateChange();
+ set {
+ m_FunctionId = value;
+ OnFunctionUnLockStateChange();
}
}
@@ -64,11 +64,11 @@
}
[SerializeField] RedpointBehaviour m_Redpoint;
- public RedpointBehaviour redpoint {
- get { return m_Redpoint; }
- set { m_Redpoint = value; }
- }
-
+ public RedpointBehaviour redpoint {
+ get { return m_Redpoint; }
+ set { m_Redpoint = value; }
+ }
+
[SerializeField] Shadow m_Shadow;
public Shadow shadow {
get { return this.m_Shadow; }
@@ -181,9 +181,9 @@
if (!invokeForce && state == TitleBtnState.Click)
{
- if (repeatClickFunc != null)
- {
- repeatClickFunc();
+ if (repeatClickFunc != null)
+ {
+ repeatClickFunc();
}
return;
}
diff --git a/UI/Common/ItemBehaviour.cs b/UI/Common/ItemBehaviour.cs
index 295cfdc..a4fe60f 100644
--- a/UI/Common/ItemBehaviour.cs
+++ b/UI/Common/ItemBehaviour.cs
@@ -11,7 +11,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class ItemBehaviour : MonoBehaviour
{
diff --git a/UI/Common/ScrollItem.cs b/UI/Common/ScrollItem.cs
index b50fa0a..8d48797 100644
--- a/UI/Common/ScrollItem.cs
+++ b/UI/Common/ScrollItem.cs
@@ -4,7 +4,7 @@
using UnityEngine.UI;
using System;
-[XLua.LuaCallCSharp]
+
public class ScrollItem : MonoBehaviour
{
diff --git a/UI/Common/SmoothMask.cs b/UI/Common/SmoothMask.cs
index a95a65e..3907fcf 100644
--- a/UI/Common/SmoothMask.cs
+++ b/UI/Common/SmoothMask.cs
@@ -4,7 +4,7 @@
[DisallowMultipleComponent]
[ExecuteAlways]
-[XLua.LuaCallCSharp]
+
public class SmoothMask:UIBehaviour,ICanvasRaycastFilter {
[Range(0,1)]
diff --git a/UI/Common/SmoothSlider.cs b/UI/Common/SmoothSlider.cs
index edb1ccb..3579028 100644
--- a/UI/Common/SmoothSlider.cs
+++ b/UI/Common/SmoothSlider.cs
@@ -7,7 +7,7 @@
{
[DisallowMultipleComponent]
- [XLua.LuaCallCSharp]
+
public class SmoothSlider : MonoBehaviour
{
diff --git a/UI/Common/TimeDownMgr.cs b/UI/Common/TimeDownMgr.cs
index a8df474..1a75bfe 100644
--- a/UI/Common/TimeDownMgr.cs
+++ b/UI/Common/TimeDownMgr.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class TimeDownMgr : SingletonMonobehaviour<TimeDownMgr> {
diff --git a/UI/Common/UI3DModelExhibition.cs b/UI/Common/UI3DModelExhibition.cs
index 6514240..7bf9b0b 100644
--- a/UI/Common/UI3DModelExhibition.cs
+++ b/UI/Common/UI3DModelExhibition.cs
@@ -12,7 +12,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
public class UI3DModelExhibition : MonoBehaviour
{
[SerializeField] Transform m_PlayerShowPoint;
@@ -827,7 +827,7 @@
public bool isDialogue;
}
- [XLua.LuaCallCSharp]
+
public struct UI3DHorsePetData
{
public int id;
diff --git a/UI/Common/UIDragDropBehaviour.cs b/UI/Common/UIDragDropBehaviour.cs
index fcde6d8..f09c8c1 100644
--- a/UI/Common/UIDragDropBehaviour.cs
+++ b/UI/Common/UIDragDropBehaviour.cs
@@ -1,10 +1,10 @@
锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections;
+using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
-[XLua.LuaCallCSharp]
+
public class UIDragDropBehaviour : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, IPointerExitHandler, IPointerEnterHandler
{
public static bool draging = false;
@@ -81,4 +81,4 @@
}
}
}
-
+
diff --git a/UI/Core/ButtonEx.cs b/UI/Core/ButtonEx.cs
index 0d7b32d..d70c07c 100644
--- a/UI/Core/ButtonEx.cs
+++ b/UI/Core/ButtonEx.cs
@@ -3,7 +3,7 @@
using UnityEngine.EventSystems;
using System;
-[XLua.LuaCallCSharp]
+
public class ButtonEx : Button
{
diff --git a/UI/Core/ImageEx.cs b/UI/Core/ImageEx.cs
index 4463558..f93f64d 100644
--- a/UI/Core/ImageEx.cs
+++ b/UI/Core/ImageEx.cs
@@ -2,7 +2,7 @@
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class ImageEx : Image
{
diff --git a/UI/Decorate/Tweens/PositionTween.cs b/UI/Decorate/Tweens/PositionTween.cs
index 7269d0c..13e637f 100644
--- a/UI/Decorate/Tweens/PositionTween.cs
+++ b/UI/Decorate/Tweens/PositionTween.cs
@@ -3,7 +3,6 @@
namespace Snxxz.UI
{
- [XLua.CSharpCallLua]
public class PositionTween : Tween
{
diff --git a/UI/Decorate/Tweens/RotationTween.cs b/UI/Decorate/Tweens/RotationTween.cs
index a6b2bc2..399d005 100644
--- a/UI/Decorate/Tweens/RotationTween.cs
+++ b/UI/Decorate/Tweens/RotationTween.cs
@@ -3,7 +3,7 @@
namespace Snxxz.UI
{
- [XLua.CSharpCallLua]
+
public class RotationTween : Tween
{
diff --git a/UI/Decorate/Tweens/ScaleTween.cs b/UI/Decorate/Tweens/ScaleTween.cs
index 4e61694..aa8f8f3 100644
--- a/UI/Decorate/Tweens/ScaleTween.cs
+++ b/UI/Decorate/Tweens/ScaleTween.cs
@@ -3,7 +3,6 @@
namespace Snxxz.UI
{
- [XLua.CSharpCallLua]
public class ScaleTween : Tween
{
public override void SetStartState()
diff --git a/UI/Decorate/Tweens/UIAlphaTween.cs b/UI/Decorate/Tweens/UIAlphaTween.cs
index b1c722c..2c7ebdb 100644
--- a/UI/Decorate/Tweens/UIAlphaTween.cs
+++ b/UI/Decorate/Tweens/UIAlphaTween.cs
@@ -9,7 +9,7 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
+
[RequireComponent(typeof(CanvasGroup))]
public class UIAlphaTween : MonoBehaviour
{
diff --git a/UI/Effect/EffectMgr.cs b/UI/Effect/EffectMgr.cs
index 5b2a79b..d8afcbd 100644
--- a/UI/Effect/EffectMgr.cs
+++ b/UI/Effect/EffectMgr.cs
@@ -1,8 +1,8 @@
锘縰sing Snxxz.UI;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class EffectMgr : SingletonMonobehaviour<EffectMgr>
-
+
{
public UIEffectBehaviour GetUIEffect(int id, bool _destroy = false)
{
diff --git a/UI/Effect/TimeMgr.cs b/UI/Effect/TimeMgr.cs
index 32d3497..bb40180 100644
--- a/UI/Effect/TimeMgr.cs
+++ b/UI/Effect/TimeMgr.cs
@@ -3,9 +3,9 @@
using System.Collections.Generic;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public class TimeMgr : SingletonMonobehaviour<TimeMgr>
-
+
{
private Dictionary<Component, TimeItem> timeItems = new Dictionary<Component, TimeItem>();
private List<TimeItem> timeItemList = new List<TimeItem>();
diff --git a/UI/Effect/UIEffect.cs b/UI/Effect/UIEffect.cs
index 0aedc24..7dd5104 100644
--- a/UI/Effect/UIEffect.cs
+++ b/UI/Effect/UIEffect.cs
@@ -11,7 +11,7 @@
using UnityEditor;
#endif
-[XLua.LuaCallCSharp]
+
public class UIEffect : MonoBehaviour
{
public int renderQueue = 3000;
diff --git a/Utility/Clock.cs b/Utility/Clock.cs
index bcd9945..5ab4b77 100644
--- a/Utility/Clock.cs
+++ b/Utility/Clock.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
using UnityEngine.Events;
-[XLua.LuaCallCSharp]
+
public class Clock
{
public bool stopped { get; set; }
diff --git a/Utility/ComponentExtersion.cs b/Utility/ComponentExtersion.cs
index 9c2278c..617ee9c 100644
--- a/Utility/ComponentExtersion.cs
+++ b/Utility/ComponentExtersion.cs
@@ -3,7 +3,7 @@
using UnityEngine.Events;
using System;
-[XLua.LuaCallCSharp]
+
public static class ComponentExtersion
{
@@ -80,7 +80,7 @@
return component;
}
- [XLua.LuaCallCSharp]
+
public static void AddListener(this Button _button, UnityAction _action)
{
if (_button == null)
@@ -92,7 +92,7 @@
_button.onClick.AddListener(_action);
}
- [XLua.LuaCallCSharp]
+
public static void RemoveAllListeners(this Button _button)
{
if (_button == null)
@@ -102,7 +102,7 @@
_button.onClick.RemoveAllListeners();
}
- [XLua.LuaCallCSharp]
+
public static void SetListener(this Button button, UnityAction action)
{
if (button == null)
@@ -123,7 +123,7 @@
_toggle.onValueChanged.AddListener(_action);
}
- [XLua.LuaCallCSharp]
+
public static void SetListener(this Toggle toggle, UnityAction<bool> action)
{
if (toggle == null)
@@ -144,7 +144,7 @@
_toggle.onValueChanged.RemoveAllListeners();
}
- [XLua.LuaCallCSharp]
+
public static void AddListener(this Slider _slider, UnityAction<float> _action)
{
if (_slider == null)
@@ -154,7 +154,7 @@
_slider.onValueChanged.AddListener(_action);
}
- [XLua.LuaCallCSharp]
+
public static void SetListener(this Slider slider, UnityAction<float> action)
{
if (slider == null)
@@ -175,7 +175,7 @@
_slider.onValueChanged.RemoveAllListeners();
}
- [XLua.LuaCallCSharp]
+
public static void AddListener(this InputField _inputField, UnityAction<string> _action)
{
if (_inputField == null)
@@ -196,7 +196,7 @@
inputField.onValueChanged.AddListener(action);
}
- [XLua.LuaCallCSharp]
+
public static void RemoveAllListeners(this InputField _inputField)
{
if (_inputField == null)
@@ -206,14 +206,14 @@
_inputField.onValueChanged.RemoveAllListeners();
}
- [XLua.LuaCallCSharp]
+
public static void SetEnable(this Button _btn, Text _btnTxt, bool _enable, EnableButtonConfig.EnableButtonType _type =
EnableButtonConfig.EnableButtonType.Default)
{
EnableButtonConfig.SetEnable(_btn, _btnTxt, _enable, _type);
}
- [XLua.LuaCallCSharp]
+
public static void SetColorful(this Button _btn, Text _btnTxt, bool _colorful, int pattern = 0)
{
if (_btn != null)
@@ -238,7 +238,7 @@
}
}
- [XLua.LuaCallCSharp]
+
public static void SetInteractable(this Button _btn, Text _btnText, bool _interactable)
{
if (_btn != null)
@@ -257,7 +257,7 @@
}
}
- [XLua.LuaCallCSharp]
+
public static void SetSprite(this Image _image, string _id)
{
if (_image == null)
@@ -269,7 +269,7 @@
_image.overrideSprite = sprite;
}
- [XLua.LuaCallCSharp]
+
public static void SetSprite(this TextImage _textImage, string _id)
{
if (_textImage == null)
diff --git a/Utility/DeviceUtility.cs b/Utility/DeviceUtility.cs
index d620f9e..0488a67 100644
--- a/Utility/DeviceUtility.cs
+++ b/Utility/DeviceUtility.cs
@@ -1,21 +1,21 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using System.Net.NetworkInformation;
-using System;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Text.RegularExpressions;
-
-#if UNITY_IOS
-using UnityEngine.iOS;
-#endif
-
-[XLua.LuaCallCSharp]
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System.Net.NetworkInformation;
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.IO;
+using System.Text.RegularExpressions;
+
+#if UNITY_IOS
+using UnityEngine.iOS;
+#endif
+
+
public class DeviceUtility
-{
-
+{
+
static string mac = string.Empty;
public static string GetMac()
{
@@ -80,8 +80,8 @@
#else
return SystemInfo.deviceUniqueIdentifier;
#endif
- }
-
+ }
+
public static string GetDeviceOSLevel()
{
#if UNITY_IOS
@@ -89,8 +89,8 @@
#else
return SystemInfo.operatingSystem;
#endif
- }
-
+ }
+
public static string GetDeviceName()
{
#if UNITY_IOS
@@ -98,8 +98,8 @@
#else
return SystemInfo.deviceName;
#endif
- }
-
+ }
+
public static string GetDeviceModel()
{
#if UNITY_IOS
@@ -107,8 +107,8 @@
#else
return SystemInfo.deviceModel;
#endif
- }
-
+ }
+
public static bool IsLowMemory()
{
#if UNITY_IOS
@@ -165,5 +165,5 @@
}
}
-
-}
+
+}
diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index 529a14c..8731faa 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -1,5 +1,5 @@
锘�
-[XLua.LuaCallCSharp]
+
public enum E_ActorClassType
{
UnDefine,
@@ -27,7 +27,7 @@
FakePlayer,
}
-[XLua.LuaCallCSharp]
+
public enum E_ActorState
{
Idle,
@@ -66,7 +66,7 @@
Ice,//瀵掑啺鐘舵�侊紙鍚屽噺閫燂級 19
}
-[XLua.LuaCallCSharp]
+
public enum E_BuffType
{
bfBuff = 1, // buff
@@ -104,14 +104,14 @@
FuncNpc,// 鍔熻兘鎬pc
}
-[XLua.LuaCallCSharp]
+
public enum E_ClientNpcType
{
Func,
Fight,
}
-[XLua.LuaCallCSharp]
+
public enum E_NpcType
{
Func = 0,//鍔熻兘NPC濉啓鈥�0鈥�
@@ -138,7 +138,7 @@
OpenWorldMap = 99,// 鎵撳紑涓栫晫鍦板浘
}
-[XLua.LuaCallCSharp]
+
public enum E_MovingState
{
Normal,
@@ -146,7 +146,7 @@
Ride,
}
-[XLua.LuaCallCSharp]
+
public enum WindowType
{
Base = 0,
@@ -159,7 +159,7 @@
Flag = 99,
}
-[XLua.LuaCallCSharp]
+
public enum GestureType
{
Left,
@@ -168,7 +168,7 @@
Down
}
-[XLua.LuaCallCSharp]
+
public enum UnityPlatform
{
Editor,
@@ -177,7 +177,7 @@
Standalone,
}
-[XLua.LuaCallCSharp]
+
public enum RoleRenameResult
{
MoneyErr = 0, //閲戦挶涓嶈冻
@@ -188,7 +188,7 @@
RenameSuccess = 5, //鎴愬姛
}
-[XLua.LuaCallCSharp]
+
/// <summary>
/// <para>鏃犳剰涔� 0</para>
/// <para>鑷繁 1</para>
@@ -224,7 +224,7 @@
FriendNpc,
}
-[XLua.LuaCallCSharp]
+
/// <summary>
/// 鎶�鑳界被鍨�
/// </summary>
@@ -255,7 +255,7 @@
PassiveSustainedReduction,// 琚姩瑙﹀彂鎸佺画绫诲噺鐩婄被buff 22
}
-[XLua.LuaCallCSharp]
+
public enum E_SkillFuncType
{
Common,// 0涓洪�氱敤鎶�鑳�
@@ -274,7 +274,7 @@
ZhuxianSkill,// 13涓鸿瘺浠欐妧鑳�
}
-[XLua.LuaCallCSharp]
+
/// <summary>
/// <para>鏃犲璞� 0</para>
/// <para>鏈夊璞� 1</para>
@@ -287,7 +287,7 @@
Ground,// 鍦伴潰 2
}
-[XLua.LuaCallCSharp]
+
public enum MapTransferType
{
WorldTransport = 1,
@@ -295,7 +295,7 @@
MissionTransport = 3,
}
-[XLua.LuaCallCSharp]
+
public enum DropItemType
{
Pattern0 = 0,
@@ -304,7 +304,7 @@
Pattern3 = 3
}
-[XLua.LuaCallCSharp]
+
public enum DailyQuestType
{
BountyMission = 1,
@@ -347,7 +347,7 @@
ActivityPlace = 41, //绉樺鎺㈢储
}
-[XLua.LuaCallCSharp]
+
/// <summary>
/// 鏈嶅姟绔笅鍙戠殑鍓湰鍊掕鏃剁被鍨�
/// </summary>
@@ -365,7 +365,7 @@
PlayerLeave = 10, //瀵规墜鎺夌嚎鍊掕鏃�
}
-[XLua.LuaCallCSharp]
+
/// <summary>
/// 瑁呭閮ㄤ綅绱㈠紩
/// </summary>
@@ -400,7 +400,7 @@
};
-[XLua.LuaCallCSharp]
+
//tagObjInfoRefresh,鏇存柊鏋氫妇鍊煎繀椤诲悓鏃舵洿鏂版敞閲�
/**涓昏灞炴�у埛鏂扮被鍨�*/
public enum PlayerDataType
@@ -639,7 +639,7 @@
CDBPlayerRefresh_SkillReducePerG = 228, //灏勬棩绁炲紦鎶�鑳藉噺浼ょ櫨鍒嗘瘮
};
-[XLua.LuaCallCSharp]
+
/** 鑳屽寘绫诲瀷鐮佸畾涔� */
public enum PackType
{
@@ -659,7 +659,7 @@
RunePack = 255,//绗﹀嵃鑳屽寘
}
-[XLua.LuaCallCSharp]
+
public enum ItemType
{
Copper = 1,// 閾滈挶
@@ -688,7 +688,7 @@
Guard_2 = 115, //鐏靛畧 2
}
-[XLua.LuaCallCSharp]
+
public enum MakeType
{
OneKeySell = 3, // 涓�閿嚭鍞洖搴�
@@ -702,7 +702,7 @@
GatherSoulDecompose = 24,//鑱氶瓊鍒嗚В
}
-[XLua.LuaCallCSharp]
+
/// <summary>
/// 绉板彿绫诲瀷
/// </summary>
@@ -715,7 +715,7 @@
Achivement = 3, //鎴愬氨绉板彿
}
-[XLua.LuaCallCSharp]
+
//鍔熻兘寮�鍚檺鍒剁被鍨�
public enum FuncOpenEnum
{
@@ -779,7 +779,7 @@
HazyRegion = 173,//缂ョ紙浠欏煙
}
-[XLua.LuaCallCSharp]
+
//灞炴�х被鍨�
public enum PropertyType
{
@@ -916,7 +916,7 @@
}
-[XLua.LuaCallCSharp]
+
public enum TextColType
{
None = 0,
@@ -948,7 +948,7 @@
Gray = 16
}
-[XLua.LuaCallCSharp]
+
public enum E_ModelResType
{
Weapon = 1, //姝﹀櫒 1
@@ -961,7 +961,7 @@
Spirit,//鐏靛櫒 8
}
-[XLua.LuaCallCSharp]
+
public enum TreasureCategory
{
Human = 1,
@@ -971,7 +971,7 @@
Zerg = 5,
}
-[XLua.LuaCallCSharp]
+
public enum TreasureState
{
Collected,
@@ -979,7 +979,7 @@
Locked,
}
-[XLua.LuaCallCSharp]
+
public enum FunctionUnlockType
{
Treasure = 1,
@@ -990,7 +990,7 @@
TreasureChapter = 6,
}
-[XLua.LuaCallCSharp]
+
public enum RedPointState
{
None = 0,
@@ -1000,7 +1000,7 @@
GetReward = 4,
}
-[XLua.LuaCallCSharp]
+
public enum TeamInviteType
{
Friend,
@@ -1008,7 +1008,7 @@
NearBy,
}
-[XLua.LuaCallCSharp]
+
public enum TeammatePrepareState
{
UnPrepared = 0,//鏈噯澶�
@@ -1016,7 +1016,7 @@
Rejected = 2,//鎷掔粷
}
-[XLua.LuaCallCSharp]
+
public enum VipPrivilegeType
{
TreasureAtk = 1,
@@ -1057,7 +1057,7 @@
SelfBossBuyTims = 38, //涓汉boss璐拱娆℃暟
}
-[XLua.LuaCallCSharp]
+
public enum E_AttackMode
{
Peace,
@@ -1070,7 +1070,7 @@
Contest
}
-[XLua.LuaCallCSharp]
+
public enum E_ItemColor
{
White = 1,
@@ -1081,7 +1081,7 @@
Pink,
}
-[XLua.LuaCallCSharp]
+
public enum FindPreciousType
{
WorldBoss = 0,
@@ -1094,7 +1094,7 @@
None = 99,
}
-[XLua.LuaCallCSharp]
+
public enum GotServerRewardType
{
Def_RewardType_Activity = 0,
@@ -1130,7 +1130,7 @@
Def_RewardType_HolidayTravel = 38,//鑺傛棩娓稿巻濂栧姳
}
-[XLua.LuaCallCSharp]
+
public enum MapType
{
OpenCountry = 0,//閲庡鍦板浘
@@ -1146,14 +1146,14 @@
CrossAll = 11, //璺ㄦ湇鎵�鏈�
}
-[XLua.LuaCallCSharp]
+
public enum GuideType
{
NewBie = 1,
Functional = 2,
}
-[XLua.LuaCallCSharp]
+
public enum GuideTriggerType
{
None = 998,//鏃犻檺鍒�
@@ -1189,7 +1189,7 @@
BranchQuestContinue = 210,//鏀嚎浠诲姟鍙户缁�
}
-[XLua.LuaCallCSharp]
+
public enum FuncPowerType
{
Role = 0,//瑙掕壊
@@ -1219,7 +1219,7 @@
JadeDynastyEquip = 25, //璇涗粰瑁呭
}
-[XLua.LuaCallCSharp]
+
public enum E_AtkType
{
Special, //0 鐗规畩锛堝皢璧拌繘鍏蜂綋鐨勬妧鑳絀D杩涜澶勭悊锛屾牴鎹晥鏋淚D
@@ -1256,7 +1256,7 @@
//35 钃勫姏妯℃澘锛屾惌閰嶆晥鏋滃�� 鏁堟灉ID 1206 A鍊间负鑳介噺娆℃暟
}
-[XLua.LuaCallCSharp]
+
public enum GameObjType
{
/** 鏈畾涔� */
@@ -1273,7 +1273,7 @@
gotMax
}
-[XLua.LuaCallCSharp]
+
/** 浼ゅ绫诲瀷 */
public enum HurtAttackType
{
@@ -1312,7 +1312,7 @@
Burning = 18,// 鐏肩儳
}
-[XLua.LuaCallCSharp]
+
public enum DungeonTargetType
{
NPC = 1,
@@ -1329,7 +1329,7 @@
AttackCount = 12,
}
-[XLua.LuaCallCSharp]
+
public enum AchievementType
{
Level = 1,
@@ -1398,7 +1398,7 @@
DvsFWinningStreak = 65,
}
-[XLua.LuaCallCSharp]
+
/// <summary>
/// 鐗╁搧浣跨敤鑰愪箙搴﹂檺鍒剁被鍨�
/// </summary>
@@ -1408,7 +1408,7 @@
RealityTime = 9, //鐜板疄鏃堕棿鎵ｈ�愪箙
}
-[XLua.LuaCallCSharp]
+
public enum TitleBtnState
{
Normal,
@@ -1416,7 +1416,7 @@
Locked,
}
-[XLua.LuaCallCSharp]
+
public enum LegendAttrType
{
Normal = 0, //涓�鑸�
@@ -1424,7 +1424,7 @@
Fixed = 2, //鍥哄畾
}
-[XLua.LuaCallCSharp]
+
public enum ServerState
{
Maintain = 0,
@@ -1434,7 +1434,7 @@
Predicted = 4,
}
-[XLua.LuaCallCSharp]
+
public enum ItemUseDataKey
{
mapLoaction = 15, // 鐗╁搧璁板綍鍦板浘鍧愭爣[mapid, posx, posy]
@@ -1482,7 +1482,7 @@
#endregion
}
-[XLua.LuaCallCSharp]
+
public enum ItemOperateType
{
makeUse, //浣跨敤
@@ -1513,7 +1513,7 @@
lsExchange, //鐏电煶鍏戞崲
}
-[XLua.LuaCallCSharp]
+
public enum ItemWinType
{
itemWin, //鏅�氱墿鍝佸脊妗�
@@ -1529,7 +1529,7 @@
kingTreasure, //鐜嬭�呮硶瀹�
}
-[XLua.LuaCallCSharp]
+
public enum ItemTipChildType
{
Normal, //鏅�氱殑瑁呭寮规
@@ -1540,7 +1540,7 @@
GetWingsPath,//缈呰唨鑾峰彇閫斿緞
}
-[XLua.LuaCallCSharp]
+
public enum InstalledAsset
{
NullAsset = 0,
@@ -1549,14 +1549,14 @@
IngoreDownLoad = 3,
}
-[XLua.LuaCallCSharp]
+
public enum VersionAuthority
{
InterTest = 0,
Release = 1,
}
-[XLua.LuaCallCSharp]
+
public enum FootAudioType
{
Walk = 1,
@@ -1564,7 +1564,7 @@
Fly = 3,
}
-[XLua.LuaCallCSharp]
+
public enum AttackFailType
{
SkillFail_Other, // 鍏朵粬
@@ -1572,7 +1572,7 @@
SkillFail_AtkInterval, // 鏀诲嚮闂撮殧
}
-[XLua.LuaCallCSharp]
+
public enum DungeonFightStage
{
None,
@@ -1583,7 +1583,7 @@
ElderGodAreaNearDead,
}
-[XLua.LuaCallCSharp]
+
public enum RankType
{
FightPower = 0,
@@ -1614,7 +1614,7 @@
OpenServereEquipTrain = 26, //瑁呭娲楃粌
}
-[XLua.LuaCallCSharp]
+
public enum PetOrMount
{
None,
diff --git a/Utility/FileExtersion.cs b/Utility/FileExtersion.cs
index 51419df..3d0be1d 100644
--- a/Utility/FileExtersion.cs
+++ b/Utility/FileExtersion.cs
@@ -5,7 +5,7 @@
using System.Security.Cryptography;
using System.Text;
-[XLua.LuaCallCSharp]
+
public class FileExtersion
{
public readonly static string lineSplit = "\r\n"; //琛岄棿闅斾綋
diff --git a/Utility/GMCommand.cs b/Utility/GMCommand.cs
index 9834776..cea69d9 100644
--- a/Utility/GMCommand.cs
+++ b/Utility/GMCommand.cs
@@ -7,9 +7,9 @@
using Snxxz.UI;
using LitJson;
-[XLua.LuaCallCSharp]
+
public class GMCommand : SingletonMonobehaviour<GMCommand>
-
+
{
public void Begin()
diff --git a/Utility/GlobalTimeEvent.cs b/Utility/GlobalTimeEvent.cs
index 9b9640c..501c125 100644
--- a/Utility/GlobalTimeEvent.cs
+++ b/Utility/GlobalTimeEvent.cs
@@ -1,18 +1,18 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using System;
-
-[XLua.LuaCallCSharp]
-public class GlobalTimeEvent : SingletonMonobehaviour<GlobalTimeEvent>
-
-{
- public event Action secondEvent;
- public event Action fiveSecondEvent;
- public event Action minuteEvent;
- public event Action fiveMinuteEvent;
- public event Action tenMinuteEvent;
- public event Action halfHourEvent;
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System;
+
+
+public class GlobalTimeEvent : SingletonMonobehaviour<GlobalTimeEvent>
+
+{
+ public event Action secondEvent;
+ public event Action fiveSecondEvent;
+ public event Action minuteEvent;
+ public event Action fiveMinuteEvent;
+ public event Action tenMinuteEvent;
+ public event Action halfHourEvent;
public event Action hourEvent;
public event Action halfMinuteEvent;
@@ -184,7 +184,7 @@
}
}
- }
-
-
-}
+ }
+
+
+}
diff --git a/Utility/LanguageVerify.cs b/Utility/LanguageVerify.cs
index a374abf..ec79cd9 100644
--- a/Utility/LanguageVerify.cs
+++ b/Utility/LanguageVerify.cs
@@ -1,28 +1,28 @@
锘縰sing Snxxz.UI;
using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections;
+using System.Collections.Generic;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
-using UnityEngine;
-
-[XLua.LuaCallCSharp]
+using UnityEngine;
+
+
public class LanguageVerify : Singleton<LanguageVerify>
-
-{
- const string Sercret = "c345a165b566d1c421afd8a748373d7f";
+
+{
+ const string Sercret = "c345a165b566d1c421afd8a748373d7f";
bool requireVerify
{
get
{
return VersionUtility.Instance.IsMaoErGame();
}
- }
-
- static StringBuilder sb = new StringBuilder();
-
- const string VerifyPlayerNameUrl = "https://api.maoergame.com/game/role/response";
+ }
+
+ static StringBuilder sb = new StringBuilder();
+
+ const string VerifyPlayerNameUrl = "https://api.maoergame.com/game/role/response";
/// <summary>
/// 鏍￠獙鐜╁鍚�
/// </summary>
@@ -31,7 +31,7 @@
/// <param name="playerName">鍘熸潵鐨勮鑹插悕锛屽垱瑙掍紶绌�</param>
/// <param name="level">鐜╁绛夌骇</param>
/// <param name="vipLv">鐜╁VIP绛夌骇</param>
- /// <param name="callback"></param>
+ /// <param name="callback"></param>
public void VerifyPlayerName(string verifyName, int playerId, string playerName, int level, int vipLv, Action<bool, string> callback)
{
if (!requireVerify)
@@ -79,9 +79,9 @@
}
NetLinkWin.Hide();
});
- }
-
- const string VerifyFairyUrl = "https://api.maoergame.com/game/sociaty/response";
+ }
+
+ const string VerifyFairyUrl = "https://api.maoergame.com/game/sociaty/response";
public void VerifyFairy(string verifyContent, int op_type, string fairyName, int title, Action<bool, string> callback)
{
if (!requireVerify)
@@ -143,12 +143,12 @@
}
}
});
- }
-
- public static uint toPlayer = 0;
- public static string toPlayerName = string.Empty;
- public static int toPlayerLevel = 0;
- const string VerifyChatUrl = "https://api.maoergame.com/game/chat/response";
+ }
+
+ public static uint toPlayer = 0;
+ public static string toPlayerName = string.Empty;
+ public static int toPlayerLevel = 0;
+ const string VerifyChatUrl = "https://api.maoergame.com/game/chat/response";
public void VerifyChat(string content, ChatInfoType channelType, Action<bool, string> callback)
{
int channel = 0;
@@ -228,19 +228,19 @@
}
}
});
- }
-
+ }
+
Dictionary<long, List<string>> transferContents = new Dictionary<long, List<string>>();
Dictionary<long, List<int>> splitContents = new Dictionary<long, List<int>>();
- List<MatchString> matchs = new List<MatchString>();
-
+ List<MatchString> matchs = new List<MatchString>();
+
struct MatchString
{
public int index;
public string value;
- }
-
+ }
+
void AddMathcs(MatchCollection _matchs)
{
if (_matchs.Count == 0)
@@ -255,8 +255,8 @@
value = match.Value,
});
}
- }
-
+ }
+
string TransferContent(long tick, string content)
{
List<string> list;
@@ -305,8 +305,8 @@
content = ChatCtrl.KillRegex.Replace(content, string.Empty);
content = ChatCenter.s_VoiceRegex.Replace(content, string.Empty);
return content;
- }
-
+ }
+
string DisTransfer(long tick, string content)
{
List<string> list;
@@ -334,8 +334,8 @@
transferContents.Remove(tick);
splitContents.Remove(tick);
return sb.ToString();
- }
-
+ }
+
bool IsSystemChat(string content)
{
if (ChatCtrl.InviteRegex.IsMatch(content)
@@ -344,8 +344,8 @@
return true;
}
return false;
- }
-
+ }
+
bool GetChannel(ChatInfoType type, out int channel)
{
channel = 0;
@@ -372,8 +372,8 @@
return false;
}
return true;
- }
-
+ }
+
bool IsFairyFeast(ChatInfoType type)
{
var dailyQuestModel = ModelCenter.Instance.GetModel<DailyQuestModel>();
@@ -383,7 +383,7 @@
return type == ChatInfoType.Fairy && dailyQuestOpenTime.InOpenTime();
}
return false;
- }
+ }
public class VerifyResponse
{
@@ -391,4 +391,4 @@
public int code;
public string content;
}
-}
+}
diff --git a/Utility/LayerUtility.cs b/Utility/LayerUtility.cs
index fe3f781..b38929a 100644
--- a/Utility/LayerUtility.cs
+++ b/Utility/LayerUtility.cs
@@ -2,7 +2,7 @@
using System.Collections;
using System;
-[XLua.LuaCallCSharp]
+
public static class LayerUtility
{
public static readonly int DefaultLayer = LayerMask.NameToLayer("Default");
diff --git a/Utility/LocalSave.cs b/Utility/LocalSave.cs
index e0fd639..dc0e396 100644
--- a/Utility/LocalSave.cs
+++ b/Utility/LocalSave.cs
@@ -6,7 +6,7 @@
using System.Text;
using System;
-[XLua.LuaCallCSharp]
+
public static class LocalSave
{
diff --git a/Utility/MaterialUtility.cs b/Utility/MaterialUtility.cs
index b4c494d..1efa5d6 100644
--- a/Utility/MaterialUtility.cs
+++ b/Utility/MaterialUtility.cs
@@ -1,7 +1,7 @@
锘縰sing UnityEngine;
using System;
-[XLua.LuaCallCSharp]
+
public static class MaterialUtility
{
diff --git a/Utility/MathUtility.cs b/Utility/MathUtility.cs
index 70e863d..ac8e045 100644
--- a/Utility/MathUtility.cs
+++ b/Utility/MathUtility.cs
@@ -1,7 +1,7 @@
锘縰sing UnityEngine;
using System;
-[XLua.LuaCallCSharp]
+
public class MathUtility
{
diff --git a/Utility/OperationLogCollect.cs b/Utility/OperationLogCollect.cs
index 1e138d9..f7f776e 100644
--- a/Utility/OperationLogCollect.cs
+++ b/Utility/OperationLogCollect.cs
@@ -5,7 +5,7 @@
using Snxxz.UI;
using LitJson;
-[XLua.LuaCallCSharp]
+
public class OperationLogCollect : Singleton<OperationLogCollect>
{
diff --git a/Utility/RunTimeExceptionUtility.cs b/Utility/RunTimeExceptionUtility.cs
index 7e46d2a..9fe8b9b 100644
--- a/Utility/RunTimeExceptionUtility.cs
+++ b/Utility/RunTimeExceptionUtility.cs
@@ -1,19 +1,19 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using System;
-using System.IO;
-using System.Threading;
-
-[XLua.LuaCallCSharp]
-public class RunTimeExceptionUtility : Singleton<RunTimeExceptionUtility>
-
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System;
+using System.IO;
+using System.Threading;
+
+
+public class RunTimeExceptionUtility : Singleton<RunTimeExceptionUtility>
+
{
List<string> logWriteToFileTemp = new List<string>();
DateTime nextWriteFileTime = DateTime.Now;
- string logFileRoot = string.Empty;
-
+ string logFileRoot = string.Empty;
+
public void Init()
{
GlobalTimeEvent.Instance.secondEvent -= OnPerSecond;
@@ -41,19 +41,19 @@
GlobalTimeEvent.Instance.secondEvent += OnPerSecond;
Application.logMessageReceivedThreaded += AddLogRenderer;
- }
-
+ }
+
public void UnInit()
{
GlobalTimeEvent.Instance.secondEvent -= OnPerSecond;
Application.logMessageReceivedThreaded -= AddLogRenderer;
- }
-
+ }
+
private void AddLogRenderer(string _log, string _callStack, LogType _type)
{
logWriteToFileTemp.Add(string.Format("{0}--{1}:Thread:{2}-{3};{4}{5}", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), _type, Thread.CurrentThread.ManagedThreadId, _log, _callStack, "\r\n"));
- }
-
+ }
+
private void OnPerSecond()
{
if (DateTime.Now > nextWriteFileTime)
@@ -70,7 +70,7 @@
logWriteToFileTemp.Clear();
}
}
- }
-
-
-}
+ }
+
+
+}
diff --git a/Utility/TimeUtility.cs b/Utility/TimeUtility.cs
index c097f34..19423d5a 100644
--- a/Utility/TimeUtility.cs
+++ b/Utility/TimeUtility.cs
@@ -2,7 +2,7 @@
using System.Text;
using UnityEngine;
-[XLua.LuaCallCSharp]
+
public static class TimeUtility
{
private static DateTime s_ServerTime = DateTime.Now;
diff --git a/Utility/TransformExtension.cs b/Utility/TransformExtension.cs
index 179236b..c17d0adc 100644
--- a/Utility/TransformExtension.cs
+++ b/Utility/TransformExtension.cs
@@ -2,11 +2,11 @@
using System.Collections;
using System.Collections.Generic;
-[XLua.LuaCallCSharp]
+
public static class TransformExtension
{
- [XLua.LuaCallCSharp]
+
public static void Destroy(this Transform transform)
{
if (Application.isPlaying)
@@ -16,7 +16,7 @@
}
//娓呯┖瀛愮墿浣�
- [XLua.LuaCallCSharp]
+
public static void ClearAllChilds(this Transform transform)
{
var count = transform.childCount;
@@ -30,7 +30,7 @@
}
}
- [XLua.LuaCallCSharp]
+
public static void SetParentEx(this Transform transform, Transform parent, Vector3 localPosition, Quaternion rotation, Vector3 scale)
{
@@ -43,7 +43,7 @@
}
}
- [XLua.LuaCallCSharp]
+
public static void SetParentEx(this Transform transform, Transform parent, Vector3 localPosition, Vector3 eulerAngles, Vector3 scale)
{
if (transform != null && parent != null)
@@ -80,7 +80,7 @@
}
- [XLua.LuaCallCSharp]
+
public static Transform GetChildTransformDeeply(this Transform transform, string childName, bool includeSelf = false)
{
@@ -122,7 +122,7 @@
/// </summary>
/// <param name="_child"></param>
/// <param name="_parent"></param>
- [XLua.LuaCallCSharp]
+
public static void MatchWhith(this RectTransform _child, RectTransform _parent)
{
@@ -139,7 +139,7 @@
_child.localScale = Vector3.one;
}
- [XLua.LuaCallCSharp]
+
public static bool ContainWorldPosition(this RectTransform _rectTransform, Vector3 _worldPosition)
{
var worldCorners = new Vector3[4];
@@ -153,7 +153,7 @@
return false;
}
- [XLua.LuaCallCSharp]
+
public static bool RectTransformContain(this RectTransform _rectTransform, RectTransform _target)
{
var targetWorldCorners = new Vector3[4];
@@ -171,7 +171,7 @@
return false;
}
- [XLua.LuaCallCSharp]
+
public static void SetPosition(this Transform transform, float x, float y, float z, bool isLocal = false)
{
if (transform == null)
diff --git a/Utility/UIHelper.cs b/Utility/UIHelper.cs
index 119340e..e9d559d 100644
--- a/Utility/UIHelper.cs
+++ b/Utility/UIHelper.cs
@@ -14,7 +14,7 @@
/// <summary>
/// UI杈呭姪绫�
/// </summary>
-[XLua.LuaCallCSharp]
+
public static class UIHelper
{
#region UI閫氱敤
diff --git a/Utility/UIUtility.cs b/Utility/UIUtility.cs
index 80fd944..41582b7 100644
--- a/Utility/UIUtility.cs
+++ b/Utility/UIUtility.cs
@@ -5,7 +5,7 @@
using UnityEngine.EventSystems;
using Snxxz.UI;
-[XLua.LuaCallCSharp]
+
public static class UIUtility
{
--
Gitblit v1.8.0