Core/GameEngine/Model/Config/FairyGrabBossConfig.cs
File was deleted Core/GameEngine/Model/Config/FairyGrabBossConfig.cs.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HA7_Interaction/DTCA715_tagMCFamilyBossHurtList.cs
@@ -13,7 +13,6 @@ { base.Done(vNetPack); var package = vNetPack as HA715_tagMCFamilyBossHurtList; ModelCenter.Instance.GetModel<FairyGrabBossModel>().UpdateBossHurt(package); } } Core/NetworkPackage/DTCFile/ServerPack/HA9_Function/DTCA902_tagGCGameWorldBossInfo.cs
@@ -6,13 +6,11 @@ public class DTCA902_tagGCGameWorldBossInfo : DtcBasic { FindPreciousModel model { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); var data = vNetPack as HA902_tagGCGameWorldBossInfo; model.OnUpdateBossInfos(data); fairyGrabBossModel.UpdateBossAlive(data); } } Core/NetworkPackage/DTCFile/ServerPack/HAC_Activity/DTCAC10_tagGCAllFamilyBossHurtInfoList.cs
@@ -14,7 +14,6 @@ { base.Done(vNetPack); var package = vNetPack as HAC10_tagGCAllFamilyBossHurtInfoList; ModelCenter.Instance.GetModel<FairyGrabBossModel>().UpdateBossProgress(package); } } Fight/MapTransferUtility.cs
@@ -615,8 +615,7 @@ } } var isFairyBoss = FairyGrabBossConfig.Has(npcID); bool _isBoss = isWorldBoss || isDogzBoss || isCrossServerBoss || isFairyBoss; bool _isBoss = isWorldBoss || isDogzBoss || isCrossServerBoss; if (_isBoss && _findLocation) { // Debug.LogFormat("目标是boss"); @@ -634,35 +633,6 @@ var _lineID = 0; var _forceTransfer = false; // 判断仙盟boss逻辑 var _fairyBossModel = ModelCenter.Instance.GetModel<FairyGrabBossModel>(); if (_fairyBossModel != null) { // 是仙盟boss if (_fairyBossModel.bosses != null && _fairyBossModel.bosses.Contains(npcID)) { //Debug.LogFormat(" |-- 这是一只活动boss"); // 取得分线 if (GeneralDefine.fairyGrabBossMapLines != null) { _lineID = GeneralDefine.fairyGrabBossMapLines.ContainsKey(_npcLocation.mapId) ? GeneralDefine.fairyGrabBossMapLines[_npcLocation.mapId] : 0; // 如果当前处于不同的分线, 则下面的处理中,地图ID相同也切线 if (_lineID != PlayerDatas.Instance.baseData.FBID) { //Debug.LogFormat(" |-- 不在同一分线: {0} != {1}", _lineID, PlayerDatas.Instance.baseData.FBID); _forceTransfer = true; npcID = 0; } } else { Debug.LogErrorFormat("对应的地图ID: {0} 在配置中没有对应的分线id", _npcLocation.mapId); } } } // 如果不是处于相同地图, 则切图 if (_npcLocation.mapId != PlayerDatas.Instance.baseData.MapID || _forceTransfer) @@ -710,8 +680,6 @@ && Time.realtimeSinceStartup - lastMoveToWorldBossTime < 60) && PlayerDatas.Instance.baseData.FBID == 0) || (BossFakeLineUtility.Instance.showFakeLine && ModelCenter.Instance.GetModel<FindPreciousModel>().IsBossAlive(npcID)) || (_fairyBossModel.bosses != null && _fairyBossModel.bosses.Contains(npcID)) || forceMove) { //Debug.LogFormat(" |-- 非想去的boss为60秒内行为产生且为同一只boss, {0}, {1}", BossFakeLineUtility.Instance.showFakeLine, Lua/Gen/DelegatesGensBridge.cs
@@ -6007,28 +6007,6 @@ #endif } public Snxxz.UI.FairyGrabBossModel __Gen_Delegate_Imp260(object p0) { #if THREAD_SAFE || HOTFIX_ENABLE lock (luaEnv.luaEnvLock) { #endif RealStatePtr L = luaEnv.rawL; int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference); ObjectTranslator translator = luaEnv.translator; translator.PushAny(L, p0); PCall(L, 1, 1, errFunc); Snxxz.UI.FairyGrabBossModel __gen_ret = (Snxxz.UI.FairyGrabBossModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.FairyGrabBossModel)); LuaAPI.lua_settop(L, errFunc - 1); return __gen_ret; #if THREAD_SAFE || HOTFIX_ENABLE } #endif } public Snxxz.UI.OSGiftModel __Gen_Delegate_Imp261(object p0) { #if THREAD_SAFE || HOTFIX_ENABLE Lua/Gen/FairyGrabBossConfigWrap.cs
File was deleted Lua/Gen/FairyGrabBossConfigWrap.cs.meta
File was deleted Lua/Gen/Resources.meta
File was deleted Lua/Gen/SnxxzUIFairyGrabBossModelWrap.cs
File was deleted Lua/Gen/SnxxzUIFairyGrabBossModelWrap.cs.meta
File was deleted Lua/Gen/XLuaGenAutoRegister.cs
@@ -257,9 +257,6 @@ translator.DelayWrapLoader(typeof(FaceConfig), FaceConfigWrap.__Register); translator.DelayWrapLoader(typeof(FairyGrabBossConfig), FairyGrabBossConfigWrap.__Register); translator.DelayWrapLoader(typeof(FamilyConfig), FamilyConfigWrap.__Register); @@ -1064,9 +1061,6 @@ translator.DelayWrapLoader(typeof(Snxxz.UI.FairyFeastModel), SnxxzUIFairyFeastModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FairyGrabBossModel), SnxxzUIFairyGrabBossModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FairyLeagueModel), SnxxzUIFairyLeagueModelWrap.__Register); System/Dungeon/TargetBriefInfoWin.cs
@@ -285,7 +285,6 @@ [SerializeField] ElderGodAngerBehaviour m_ElderGodAnger; [SerializeField] Transform m_ContainerPlayer; [SerializeField] PlayerLifeBar m_PlayerLifeBar; [SerializeField] FairyGrabBossBuffTip m_FairyGrabBossBuffTip; TargetBriefInfo.PlayerInfo playerInfo; TargetBriefInfo.MonsterInfo bossInfo; @@ -407,16 +406,13 @@ { m_ContainerPlayer.gameObject.SetActive(false); m_ContainerBoss.gameObject.SetActive(true); m_FairyGrabBossBuffTip.Init(); m_BossLifeBar.SetBaseInfo(bossInfo.npcId, bossInfo.hp, bossInfo.maxHp, bossInfo.level); m_ElderGodAnger.Display(bossInfo.npcId); m_FairyGrabBossBuffTip.Display(bossInfo.npcId); } else { m_ContainerBoss.gameObject.SetActive(false); m_FairyGrabBossBuffTip.UnInit(); } } @@ -432,7 +428,6 @@ { m_ContainerPlayer.gameObject.SetActive(true); m_ContainerBoss.gameObject.SetActive(false); m_FairyGrabBossBuffTip.UnInit(); var instanceId = playerInfo.instanceId; var job = playerInfo.job; System/FairyAu/FairyApplyWin.cs
@@ -24,7 +24,6 @@ } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } private void OnRefreshFairyMine() { if (!PlayerDatas.Instance.fairyData.HasFairy) @@ -213,12 +212,6 @@ private void OnExitBtn() { if (fairyGrabBossModel.InActivityTime) { SysNotifyMgr.Instance.ShowTip("FairyGrabBossExitError"); return; } var auctionModel = ModelCenter.Instance.GetModel<AuctionModel>(); if (!auctionModel.SatisfyQuitFairy((int)PlayerDatas.Instance.baseData.PlayerID)) { System/FairyAu/FairyCallMemberBehaviour.cs
File was deleted System/FairyAu/FairyCallMemberBehaviour.cs.meta
File was deleted System/FairyAu/FairyGrabBossBehaviour.cs
File was deleted System/FairyAu/FairyGrabBossBehaviour.cs.meta
File was deleted System/FairyAu/FairyGrabBossBuffTip.cs
File was deleted System/FairyAu/FairyGrabBossBuffTip.cs.meta
File was deleted System/FairyAu/FairyGrabBossHelpBehaviour.cs
File was deleted System/FairyAu/FairyGrabBossHelpBehaviour.cs.meta
File was deleted System/FairyAu/FairyGrabBossHintWin.cs
File was deleted System/FairyAu/FairyGrabBossHintWin.cs.meta
File was deleted System/FairyAu/FairyGrabBossModel.cs
File was deleted System/FairyAu/FairyGrabBossModel.cs.meta
File was deleted System/FairyAu/FairyGrabBossNoticeWin.cs
File was deleted System/FairyAu/FairyGrabBossNoticeWin.cs.meta
File was deleted System/FairyAu/FairyGrabBossOpenWin.cs
File was deleted System/FairyAu/FairyGrabBossOpenWin.cs.meta
File was deleted System/FairyAu/FairyGrabBossRankBehaviour.cs
File was deleted System/FairyAu/FairyGrabBossRankBehaviour.cs.meta
File was deleted System/FairyAu/FairyGrabBossWin.cs
File was deleted System/FairyAu/FairyGrabBossWin.cs.meta
File was deleted System/MainInterfacePanel/CombatModeWin.cs
@@ -32,7 +32,6 @@ BuffModel Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>()); } } PKModel m_PKModel; PKModel pKModel { get { return m_PKModel ?? (m_PKModel = ModelCenter.Instance.GetModel<PKModel>()); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } PlayerMainDate m_MainModel; PlayerMainDate onMainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } } protected override void BindController() System/MainInterfacePanel/FlyShoseConfirmwin.cs
@@ -34,7 +34,6 @@ TaskModel taskmodel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } PlayerMainDate mainModel { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } #region Built-in @@ -103,7 +102,6 @@ case UseEnvironment.Task: m_ContentText.ExcuteHref(1); break; case UseEnvironment.FairyGrabBoss: case UseEnvironment.LocalMap: if (confirmCallBack != null) { @@ -129,9 +127,6 @@ break; case UseEnvironment.LocalMap: break; case UseEnvironment.FairyGrabBoss: fairyGrabBossModel.flyToGrabBossRemind = _bool; break; } } @@ -139,7 +134,6 @@ { Task, LocalMap, FairyGrabBoss, } } System/MainInterfacePanel/HeadPortraitTip.cs
@@ -48,7 +48,6 @@ BuffModel Buffmodel { get { return ModelCenter.Instance.GetModel<BuffModel>(); } } PKModel pKModel { get { return ModelCenter.Instance.GetModel<PKModel>(); } } PlayerMainDate onMainModel { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } private int vipExperienceSurplusTime = 0; private int GetLv = 0;//获取人物等级 System/MainInterfacePanel/HighSettingTip.cs
@@ -43,7 +43,6 @@ StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } } CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } private void Start() { System/MainInterfacePanel/InGamePushContainer.cs
@@ -24,7 +24,6 @@ [SerializeField] OffLineTimeLackBehaviour m_OffLineTimeLackBehaviour; [SerializeField] DungeonGuardCheckBehaviour m_DungeonGuardBehaviour; [SerializeField] FirstChargeTrialBehaviour m_FirstChargeTrialBehaviour; [SerializeField] FairyGrabBossHelpBehaviour m_FairyGrabBossHelpBehaviour; [SerializeField] DogzNotifyBehaviour m_DogzNotifyBehaviour; [SerializeField] InSevenDayBehavior m_InSevenDayBehavior; [SerializeField] FBHelpPointExchageNotify m_HelpPointExchangeNotify; @@ -52,7 +51,6 @@ OffLineTimeLackModel offLineTimeLackModel { get { return ModelCenter.Instance.GetModel<OffLineTimeLackModel>(); } } GuardModel guardModel { get { return ModelCenter.Instance.GetModel<GuardModel>(); } } FirstTimeRechargeModel firstTimeRechargeModel { get { return ModelCenter.Instance.GetModel<FirstTimeRechargeModel>(); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } } InSevenDayModel inSevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } } AuctionNewGetShowModel auctionNewGetShowModel { get { return ModelCenter.Instance.GetModel<AuctionNewGetShowModel>(); } } @@ -70,7 +68,6 @@ SetInGamePush(m_OffLineTimeLackBehaviour, m_OffLineTimeLackBehaviour.transform); SetInGamePush(m_DungeonGuardBehaviour, m_DungeonGuardBehaviour.transform); SetInGamePush(m_FirstChargeTrialBehaviour, m_FirstChargeTrialBehaviour.transform); SetInGamePush(m_FairyGrabBossHelpBehaviour, m_FairyGrabBossHelpBehaviour.transform); SetInGamePush(m_DogzNotifyBehaviour, m_DogzNotifyBehaviour.transform); SetInGamePush(m_InSevenDayBehavior, m_InSevenDayBehavior.transform); SetInGamePush(m_HelpPointExchangeNotify, m_HelpPointExchangeNotify.transform); @@ -100,7 +97,6 @@ CheckOffLineLack(); CheckDungeonGuard(); FirstChargeTrialShow(); CheckFairyGrabBossHelp(); CheckDogzNotify(); InSevenDayShow(); CheckHelpPointExchange(); @@ -118,7 +114,6 @@ NewBieCenter.Instance.guideBeginEvent += OnNewBieGuideBegin; guardModel.onDungeonEquipGuardEvent += CheckDungeonGuard; firstTimeRechargeModel.IsTipShowEvent += FirstChargeTrialShow; fairyGrabBossModel.fairyGrabBossHelpUpdate += CheckFairyGrabBossHelp; dogzModel.UpdateDogzPutRedEvent += CheckDogzNotify; auctionNewGetShowModel.newAcutionRefreshEvent += CheckNewAuction; } @@ -127,7 +122,6 @@ { m_MyFocusBehavio.Unit(); m_AlchemyNotifyBehaviour.UnInitialize(); fairyGrabBossModel.helpCoolDown = false; exchageModel.UpdateHelpPointShopEvent -= CheckHelpPointExchange; playerPack.RefreshDecomAttrAct -= CheckEquipDecompose; betterEquipGetModel.showEquipRefreshEvent -= CheckBetterEquip; @@ -138,7 +132,6 @@ guardModel.onDungeonEquipGuardEvent -= CheckDungeonGuard; firstTimeRechargeModel.IsTipShowEvent -= FirstChargeTrialShow; realmEquipModel.showEquipRefreshEvent -= CheckRealmBetterEquip; fairyGrabBossModel.fairyGrabBossHelpUpdate -= CheckFairyGrabBossHelp; dogzModel.UpdateDogzPutRedEvent -= CheckDogzNotify; auctionNewGetShowModel.newAcutionRefreshEvent -= CheckNewAuction; } @@ -440,18 +433,6 @@ } private void CheckFairyGrabBossHelp() { if (fairyGrabBossModel.fairyGrabBossHelps.Count > 0) { m_FairyGrabBossHelpBehaviour.gameObject.SetActive(true); m_FairyGrabBossHelpBehaviour.Display(); } else { SnxxzGame.Instance.StartCoroutine(Co_DeActiveFairyGrabBoss()); } } private void InSevenDayShow() { if (inSevenDayModel.IsMainGo) @@ -462,15 +443,6 @@ else { m_InSevenDayBehavior.gameObject.SetActive(false); } } IEnumerator Co_DeActiveFairyGrabBoss() { yield return null; if (fairyGrabBossModel.fairyGrabBossHelps.Count == 0) { m_FairyGrabBossHelpBehaviour.gameObject.SetActive(false); } }
@@ -19,9 +19,6 @@ [SerializeField] Button m_WishingAwardImg; [SerializeField] Button m_MysticalPurchaseImg; [SerializeField] Button m_DungeonAssistImg; [SerializeField] RectTransform m_ContainerGotoGrabBoss; [SerializeField] Button m_GotoFairyGrabBoss; [SerializeField] Button m_FlyToFairyGrabBoss; [SerializeField] Button m_FriendQuestBtn; [SerializeField] Button m_FairyRequestBtn; [SerializeField] Button m_ReikiResetRemind; @@ -34,7 +31,6 @@ WishingPoolModel wishModel { get { return ModelCenter.Instance.GetModel<WishingPoolModel>(); } } MysticalPurchaseModel purchaseModel { get { return ModelCenter.Instance.GetModel<MysticalPurchaseModel>(); } } DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } } FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } } ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } } @@ -46,8 +42,6 @@ m_WishingAwardImg.SetListener(ClickWishAward); m_MysticalPurchaseImg.SetListener(ClickMysticalPurchase); m_DungeonAssistImg.SetListener(ClickDungeonAssist); m_GotoFairyGrabBoss.SetListener(GotoFairyGrabBoss); m_FlyToFairyGrabBoss.SetListener(FlyToFairyGrabBoss); m_FairyRequestBtn.SetListener(OnFairyRequestClick); m_ReikiResetRemind.SetListener(OnReikiRemind); } @@ -57,7 +51,6 @@ friendsModel.askAddFriendEvent = FriendQuestBtn; OnRedBagGet();//判断是否开启红包入口 CheckSendRedpackBtn(); ShowFairyGrabBoss(); IsCrossServerOneVsOne(); DisplayReikiRemind(); @@ -76,8 +69,6 @@ wishModel.UpdateWishAwardEvent += UpdateWishAwardImag; purchaseModel.UpdateNewMysticalEvent += UpdateMysticalPurchaseImag; assistModel.UpdateRedpointEvent += UpdateDungeonAssistImag; fairyGrabBossModel.bossGrabHintEvent += bossGrabHintEvent; fairyGrabBossModel.gotoBossStateUpdate += ShowFairyGrabBoss; ChatTip.OnChatUpEvent += RefreshAdaptiveChat; fairyModel.UpdateFairyRequestEvent += UpdateFairyRequest; } @@ -104,8 +95,6 @@ wishModel.UpdateWishAwardEvent -= UpdateWishAwardImag; purchaseModel.UpdateNewMysticalEvent -= UpdateMysticalPurchaseImag; assistModel.UpdateRedpointEvent -= UpdateDungeonAssistImag; fairyGrabBossModel.gotoBossStateUpdate -= ShowFairyGrabBoss; fairyGrabBossModel.bossGrabHintEvent -= bossGrabHintEvent; ChatTip.OnChatUpEvent -= RefreshAdaptiveChat; fairyModel.UpdateFairyRequestEvent -= UpdateFairyRequest; m_CollectBehaviour.gameObject.SetActive(false); @@ -268,17 +257,6 @@ m_DungeonAssistImg.gameObject.SetActive(assistModel.IsNewAssistInfo); } private void ShowFairyGrabBoss() { m_ContainerGotoGrabBoss.gameObject.SetActive(fairyGrabBossModel.cacheGotoBossId != 0 && !fairyGrabBossModel.grabBossHintOpen); } private void bossGrabHintEvent() { ShowFairyGrabBoss(); } private void RefreshAdaptiveChat() { if (ChatTip.Inst == null) @@ -287,94 +265,6 @@ } } private void GotoFairyGrabBoss() { if (fairyGrabBossModel.cacheGotoBossId != 0) { var error = 0; if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error)) { if (fairyGrabBossModel.IsBossKilled(fairyGrabBossModel.cacheGotoBossId)) { SysNotifyMgr.Instance.ShowTip("FairyGrabBossOver"); } MapTransferUtility.Instance.MoveToNPC(fairyGrabBossModel.cacheGotoBossId); } else { fairyGrabBossModel.DisplayErrorTip(error); } } } private void FlyToFairyGrabBoss() { if (fairyGrabBossModel.cacheGotoBossId != 0) { var error = 0; if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error)) { var bossInfoConfig = BossInfoConfig.Get(fairyGrabBossModel.cacheGotoBossId); var flyItemCount = ModelCenter.Instance.GetModel<PackModel>().GetItemCountByID(PackType.Item, GeneralDefine.flyBootItemId); var freeFly = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0; if (bossInfoConfig != null) { if (freeFly || flyItemCount > 0) { MapTransferUtility.Instance.MissionFlyTo(bossInfoConfig.MapID, fairyGrabBossModel.cacheGotoBossId); } else { if (fairyGrabBossModel.flyToGrabBossRemind) { var money = (int)UIHelper.GetMoneyCnt(1); if (money >= 1) { FlyShoesUseCallback(); } else { WindowCenter.Instance.Open<RechargeTipWin>(); } } else { FlyShoseConfirmwin.useEnvironment = FlyShoseConfirmwin.UseEnvironment.FairyGrabBoss; FlyShoseConfirmwin.confirmCallBack = FlyShoesUseCallback; WindowCenter.Instance.Open<FlyShoseConfirmwin>(); } } } } else { fairyGrabBossModel.DisplayErrorTip(error); } } } private void FlyShoesUseCallback() { switch (FlyShoseConfirmwin.useEnvironment) { case FlyShoseConfirmwin.UseEnvironment.FairyGrabBoss: if (fairyGrabBossModel.cacheGotoBossId != 0) { var error = 0; if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error)) { var bossInfoConfig = BossInfoConfig.Get(fairyGrabBossModel.cacheGotoBossId); if (bossInfoConfig != null) { MapTransferUtility.Instance.MissionFlyTo(bossInfoConfig.MapID, fairyGrabBossModel.cacheGotoBossId); } } else { fairyGrabBossModel.DisplayErrorTip(error); } } break; } } public void FriendQuestBtn() { if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Friend)) System/MainInterfacePanel/MainInterfaceWin.cs
@@ -26,7 +26,6 @@ [SerializeField] IsShowXpButton m_IsShowXp;//XP 技能常显 [SerializeField] FairyLeagueRemindBehaviour m_FairyLeagueRemind; [SerializeField] TeamInvitationEntrance m_TeamInvitationEntrance; [SerializeField] FairyCallMemberBehaviour m_FairyCallBehaviour; [SerializeField] MapSwitchingBehaviour m_MapSwitchingBehaviour; [SerializeField] DungeonBossBriefInfoContainer m_BossBriefInfos; [SerializeField] RightBottomFadeInOut m_RightBottomFadeInOut; @@ -58,7 +57,6 @@ TaskModel onPlayerTask { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } BuffModel Buffmodel { get { return ModelCenter.Instance.GetModel<BuffModel>(); } } PKModel pKModel { get { return ModelCenter.Instance.GetModel<PKModel>(); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } } #region Built-in @@ -102,7 +100,6 @@ m_IsShowXp.Init(); m_TopRightTip.Init(); m_TeamInvitationEntrance.Init(); m_FairyCallBehaviour.Init(); m_MapSwitchingBehaviour.Init(); m_FairyLeagueRemind.Init(); m_MainButtonMisc.Init(); @@ -118,7 +115,6 @@ WindowCenter.Instance.windowAfterOpenEvent += WindowAfterEvent; WindowCenter.Instance.windowAfterCloseEvent += WindowAfterEvent; NewBieCenter.Instance.guideBeginEvent += GuideBeginEvent; fairyGrabBossModel.bossGrabHintEvent += BossGrabHintEvent; GlobalTimeEvent.Instance.secondEvent += secondEvent; ProcessCrossServerOneVsOne(); } @@ -201,7 +197,6 @@ m_TopRightTip.UnInit(); m_FunctionForecastTip.Unit(); m_TeamInvitationEntrance.UnInit(); m_FairyCallBehaviour.UnInit(); m_FairyLeagueRemind.UnInit(); m_MainButtonMisc.UnInit(); m_RightBottomFadeInOut.UnInit(); @@ -215,7 +210,6 @@ WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterEvent; NewBieCenter.Instance.guideBeginEvent -= GuideBeginEvent; GlobalTimeEvent.Instance.secondEvent -= secondEvent; fairyGrabBossModel.bossGrabHintEvent -= BossGrabHintEvent; } protected override void LateUpdate() @@ -511,7 +505,6 @@ { var hideTask = AdventureStage.Instance.IsInAdventureStage || MapUtility.IsDungeon(PlayerDatas.Instance.baseData.MapID) || fairyGrabBossModel.grabBossHintOpen || CrossServerUtility.IsCrossServer() || ClientCrossServerOneVsOne.isClientCrossServerOneVsOne;
@@ -263,17 +263,10 @@ private bool TestMoveNpc(int npcId, out int error) { error = 0; var _fairyGrabBossModel = ModelCenter.Instance.GetModel<FairyGrabBossModel>(); if (_fairyGrabBossModel.bosses.Contains(npcId)) { return _fairyGrabBossModel.TestEnterDungeon(npcId, out error); } return true; } void ProcessMoveNpcError(int error) { var _fairyGrabBossModel = ModelCenter.Instance.GetModel<FairyGrabBossModel>(); _fairyGrabBossModel.DisplayErrorTip(error); } } System/OpenServerActivity/ImpactRankModel.cs
@@ -845,8 +845,6 @@ VipInvest = 11, [Header("仙盟联赛预告")] FairyLeagueNotice = 12, [Header("骑宠争夺预告")] FairyGrabBossNotice = 13, [Header("限时抢购")] FlashRushToBuy = 14, [Header("许愿池")] System/OpenServerActivity/OpenServerActivityWin.cs
@@ -37,7 +37,6 @@ } } FairyLeagueModel fairyLeagueModel { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } OSGiftModel giftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } } FestivalRedpackModel festivalRedpackModel { get { return ModelCenter.Instance.GetModel<FestivalRedpackModel>(); } } @@ -335,21 +334,6 @@ if (seconds > 0) { _cell.timer.text = TimeUtility.SecondsToHMS(seconds); } } break; case 13: { var seconds = fairyGrabBossModel.GetNextSessionSeconds(); bool isOpen = fairyGrabBossModel.IsOpen; _cell.containerTimer.gameObject.SetActive(seconds > 0 || isOpen); if (seconds > 0) { _cell.timer.text = TimeUtility.SecondsToHMS(seconds); } else if (isOpen) { _cell.timer.text = Language.Get("FairyGrabBossOpened"); } } break; System/WindowBase/ModelCenter.cs
@@ -180,7 +180,6 @@ RegisterModel<MultipleRealmPointModel>(); RegisterModel<DogzDungeonModel>(); RegisterModel<DogzModel>(); RegisterModel<FairyGrabBossModel>(); RegisterModel<GodBeastModel>(); RegisterModel<FeatureNoticeModel>(); RegisterModel<AwardExchangeModel>(); System/WorldMap/MapLineBehaviour.cs
@@ -15,7 +15,6 @@ [SerializeField] Text m_Title; MapModel model { get { return ModelCenter.Instance.GetModel<MapModel>(); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } MapLine line;
@@ -25,7 +25,6 @@ List<int> sortedMaps = new List<int>(); TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } int m_NewUnlockedMap = 0; public int newUnlockedMap { @@ -182,36 +181,6 @@ else { return null; } } void CheckActivityLine(int _mapId, List<MapLine> mapLines) { var activityLine = 0; fairyGrabBossModel.TryGetFairyGrabBossLine(out activityLine); if (activityLine != 0) { var index = mapLines.FindIndex((x) => { return activityLine + 1 == x.lineIndex; }); bool needDisplayActivityLine = fairyGrabBossModel.InActivityTime || PlayerDatas.Instance.baseData.FBID == activityLine; if (index == -1) { if (needDisplayActivityLine) { mapLines.Add(new MapLine(_mapId, activityLine + 1, 0, 0)); } } else { if (!needDisplayActivityLine) { mapLines.RemoveAt(index); } } } }
@@ -246,7 +246,6 @@ normalTasks.Add(new ConfigInitTask("EquipSuitAttrConfig", () => { EquipSuitAttrConfig.Init(); }, () => { return EquipSuitAttrConfig.inited; })); normalTasks.Add(new ConfigInitTask("EquipWashConfig", () => { EquipWashConfig.Init(); }, () => { return EquipWashConfig.inited; })); normalTasks.Add(new ConfigInitTask("FaceConfig", () => { FaceConfig.Init(); }, () => { return FaceConfig.inited; })); normalTasks.Add(new ConfigInitTask("FairyGrabBossConfig", () => { FairyGrabBossConfig.Init(); }, () => { return FairyGrabBossConfig.inited; })); normalTasks.Add(new ConfigInitTask("FamilyConfig", () => { FamilyConfig.Init(); }, () => { return FamilyConfig.inited; })); normalTasks.Add(new ConfigInitTask("FamilyTechConfig", () => { FamilyTechConfig.Init(); }, () => { return FamilyTechConfig.inited; })); normalTasks.Add(new ConfigInitTask("FashionDressConfig", () => { FashionDressConfig.Init(); }, () => { return FashionDressConfig.inited; }));
