Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -18,7 +18,6 @@ public PlayerExtersionData extersion { get { return m_Extersion; } } public PlayerFairyData fairyData = new PlayerFairyData(); public PlayerRealmData realm = new PlayerRealmData(); PlayerSkillDatas m_Skill = new PlayerSkillDatas(); public PlayerSkillDatas skill { get { return m_Skill; } } Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs
File was deleted Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs.meta
File was deleted Core/GameEngine/Model/Player/Realm/RealmModel.cs
File was deleted Core/NetworkPackage/DTCFile/ClientPack.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0319_tagFBHelp.cs
@@ -20,11 +20,6 @@ switch (PlayerDatas.Instance.baseData.MapID) { case 31110: { //渡劫副本 PlayerDatas.Instance.realm.OnRefreshData(vNetData); } break; case 31230: break; Core/NetworkPackage/DTCFile/ServerPack/HA9_Function/DTCA908_tagGCRealmFBHelpInfo.cs
@@ -12,9 +12,6 @@ base.Done(vNetPack); HA908_tagGCRealmFBHelpInfo vNetData = vNetPack as HA908_tagGCRealmFBHelpInfo; if (vNetData != null) { PlayerDatas.Instance.realm.OnRefreshData(vNetData); } } } Fight/Stage/Dungeon/DungeonStage.cs
@@ -204,16 +204,6 @@ var mapId = PlayerDatas.Instance.baseData.MapID; switch (mapId) { case 31110: var cfg = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel); if (cfg != null) { if (cfg.IsBigRealm != 1) { WindowCenter.Instance.Open<RealmDungeonWin>(); } } break; case 31080: { if (!WindowCenter.Instance.IsOpen<DungeonFairyLandWin>()) Lua/Gen/PlayerDatasWrap.cs
@@ -56,7 +56,6 @@ Utils.RegisterFunc(L, Utils.GETTER_IDX, "hero", _g_get_hero); Utils.RegisterFunc(L, Utils.GETTER_IDX, "loginInfo", _g_get_loginInfo); Utils.RegisterFunc(L, Utils.GETTER_IDX, "fairyData", _g_get_fairyData); Utils.RegisterFunc(L, Utils.GETTER_IDX, "realm", _g_get_realm); Utils.RegisterFunc(L, Utils.GETTER_IDX, "maliciousAtkPlayer", _g_get_maliciousAtkPlayer); Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossServerTick", _g_get_crossServerTick); @@ -64,7 +63,6 @@ Utils.RegisterFunc(L, Utils.SETTER_IDX, "hero", _s_set_hero); Utils.RegisterFunc(L, Utils.SETTER_IDX, "loginInfo", _s_set_loginInfo); Utils.RegisterFunc(L, Utils.SETTER_IDX, "fairyData", _s_set_fairyData); Utils.RegisterFunc(L, Utils.SETTER_IDX, "realm", _s_set_realm); Utils.RegisterFunc(L, Utils.SETTER_IDX, "maliciousAtkPlayer", _s_set_maliciousAtkPlayer); Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossServerTick", _s_set_crossServerTick); @@ -692,20 +690,6 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_realm(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); PlayerDatas gen_to_be_invoked = (PlayerDatas)translator.FastGetCSObj(L, 1); translator.Push(L, gen_to_be_invoked.realm); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 1; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_maliciousAtkPlayer(RealStatePtr L) { try { @@ -788,21 +772,6 @@ PlayerDatas gen_to_be_invoked = (PlayerDatas)translator.FastGetCSObj(L, 1); gen_to_be_invoked.fairyData = (PlayerFairyData)translator.GetObject(L, 2, typeof(PlayerFairyData)); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 0; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _s_set_realm(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); PlayerDatas gen_to_be_invoked = (PlayerDatas)translator.FastGetCSObj(L, 1); gen_to_be_invoked.realm = (PlayerRealmData)translator.GetObject(L, 2, typeof(PlayerRealmData)); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); Lua/Gen/RealmPracticeModelWrap.cs
File was deleted Lua/Gen/RealmPracticeModelWrap.cs.meta
File was deleted Lua/Gen/SnxxzUIChatCenterWrap.cs
@@ -38,7 +38,6 @@ Utils.RegisterFunc(L, Utils.METHOD_IDX, "PlaySpeech", _m_PlaySpeech); Utils.RegisterFunc(L, Utils.METHOD_IDX, "CheckAutoPlayVoice", _m_CheckAutoPlayVoice); Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPlayerLoginOk", _m_OnPlayerLoginOk); Utils.RegisterFunc(L, Utils.METHOD_IDX, "CheckSendRealmThanks", _m_CheckSendRealmThanks); Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetChatExtra", _m_SetChatExtra); Utils.RegisterFunc(L, Utils.METHOD_IDX, "HandleChatBanned", _m_HandleChatBanned); Utils.RegisterFunc(L, Utils.METHOD_IDX, "ServerForbidenChat", _m_ServerForbidenChat); @@ -607,32 +606,6 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _m_CheckSendRealmThanks(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.ChatCenter gen_to_be_invoked = (Snxxz.UI.ChatCenter)translator.FastGetCSObj(L, 1); { gen_to_be_invoked.CheckSendRealmThanks( ); return 0; } } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _m_SetChatExtra(RealStatePtr L) Lua/Gen/SnxxzUIRealmModelWrap.cs
File was deleted Lua/Gen/SnxxzUIRealmModelWrap.cs.meta
File was deleted Lua/Gen/XLuaGenAutoRegister.cs
@@ -698,9 +698,6 @@ translator.DelayWrapLoader(typeof(PlayerDatas), PlayerDatasWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RealmModel), SnxxzUIRealmModelWrap.__Register); translator.DelayWrapLoader(typeof(SnxxzGame), SnxxzGameWrap.__Register); @@ -1279,9 +1276,6 @@ { translator.DelayWrapLoader(typeof(Snxxz.UI.RankModel), SnxxzUIRankModelWrap.__Register); translator.DelayWrapLoader(typeof(RealmPracticeModel), RealmPracticeModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.Redpoint), SnxxzUIRedpointWrap.__Register); System/Chat/ChatCenter.cs
@@ -825,58 +825,6 @@ } #endregion #region 境界渡劫私聊感谢 const string RealmThank = "ThankMessage"; const int RealmThankCount = 11; public void CheckSendRealmThanks() { try { var model = ModelCenter.Instance.GetModel<DungeonModel>(); var realmConfig = RealmConfig.Get(realmModel.cacheRealmLv); if (model.dungeonResult.leaderID == PlayerDatas.Instance.baseData.PlayerID && realmConfig != null && realmConfig.IsBigRealm == 1) { var count = 0; var configs = RealmConfig.GetValues(); for (int i = 0; i < configs.Count; i++) { if (configs[i].Lv < realmModel.cacheRealmLv && configs[i].IsBigRealm == 1) { count++; } else if (configs[i].Lv >= realmModel.cacheRealmLv) { break; } } if (count >= 3) { return; } var teamModel = ModelCenter.Instance.GetModel<TeamModel>(); for (int i = 0; i < teamModel.myTeam.memberCount; i++) { Teammate teammate; if (teamModel.myTeam.TryGetMember(i, out teammate) && teammate.id != PlayerDatas.Instance.baseData.PlayerID && teammate.online) { ChatCtrl.Inst.PteChatID = (int)teammate.id; ChatCtrl.Inst.PteChatName = teammate.mateName; LanguageVerify.toPlayerLevel = teammate.level; var content = StringUtility.Contact(RealmThank, UnityEngine.Random.Range(1, RealmThankCount + 1)); ChatCtrl.Inst.SendChatInfo(ChatInfoType.Friend, Language.Get(content)); } } } } catch (Exception e) { DebugEx.Log(e.Message); } } #endregion #region 聊天黑名单 public string SetChatExtra() System/Dungeon/DungeonFightWin.cs
@@ -431,14 +431,6 @@ } break; case RealmModel.REALM_DUNGEON_ID: var realmLv = ModelCenter.Instance.GetModel<RealmModel>().cacheRealmLv; var realmConfig = RealmConfig.Get(realmLv); if (model.dungeonResult.leaderID != PlayerDatas.Instance.baseData.PlayerID || realmConfig == null || realmConfig.IsBigRealm != 1 || model.dungeonResult.isPass != 1) { model.ExitCurrentDungeon(); } break; case JadeDynastyTowerModel.DATA_MAPID: var jadeDynastyTowerModel = ModelCenter.Instance.GetModel<JadeDynastyTowerModel>(); System/Dungeon/DungeonModel.cs
@@ -1019,17 +1019,8 @@ WindowCenter.Instance.Open<DungeonSlayerVictoryWin>(); break; case RealmModel.REALM_DUNGEON_ID: var realmConfig = RealmConfig.Get(realmModel.cacheRealmLv); if (realmConfig != null && realmConfig.IsBigRealm == 1 && dungeonResult.leaderID == PlayerDatas.Instance.baseData.PlayerID) { RealmBossShow.Instance.Open(realmModel.cacheRealmLv); //ModelCenter.Instance.GetModel<ChatCenter>().CheckSendRealmThanks(); } else { WindowCenter.Instance.Open<DungeonRealmVictoryWin>(); } var realmLevel = PlayerDatas.Instance.baseData.realmLevel + 1; RealmBossShow.Instance.Open(realmLevel); break; case RuneTowerModel.RUNETOWER_MAPID: WindowCenter.Instance.Open<DungeonRuneTowerVictoryWin>(); System/Dungeon/DungeonRealmVictoryWin.cs
@@ -50,7 +50,7 @@ void DisplayProperty() { var _realmLv = realmModel.cacheRealmLv; var _realmLv = PlayerDatas.Instance.baseData.realmLevel; RealmConfig presentcfg = RealmConfig.Get(_realmLv); if (presentcfg != null) { System/MainInterfacePanel/ChatFrame.cs
@@ -193,7 +193,7 @@ public void CheckRealmSfx() { var _model = ModelCenter.Instance.GetModel<RealmModel>(); if (_model.IsDungeonState && realmModel.realmRedpoint.state == RedPointState.Simple) if (realmModel.redpoint.state == RedPointState.Simple) { m_RealmRed.gameObject.SetActive(false); if (!m_RealmSfx.IsPlaying) @@ -265,7 +265,7 @@ private void RedpointValueChangeEvent(int _id) { if (_id == realmModel.realmRedpoint.id) if (_id == realmModel.redpoint.id) { CheckRealmSfx(); } System/Realm/PracticeTypeCell.cs
File was deleted System/Realm/PracticeTypeCell.cs.meta
File was deleted System/Realm/RealmDungeonWin.cs
File was deleted System/Realm/RealmDungeonWin.cs.meta
File was deleted System/Realm/RealmModel.cs
New file @@ -0,0 +1,50 @@ using LitJson; using Snxxz.UI; using System; using System.Collections; using System.Collections.Generic; using System.Linq; using UnityEngine; namespace Snxxz.UI { public class RealmModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize { public int realmMaxLevel { get; private set; } public const int REALM_DUNGEON_ID = 31110; public readonly Redpoint redpoint = new Redpoint(114, 11401); public override void Init() { ParseConfig(); } public void OnBeforePlayerDataInitialize() { } public void OnPlayerLoginOk() { } public override void UnInit() { } void ParseConfig() { realmMaxLevel = 0; var configs = RealmConfig.GetValues(); foreach (var config in configs) { if (config.Lv > realmMaxLevel) { realmMaxLevel = config.Lv; } } } } } System/Realm/RealmModel.cs.meta
File was renamed from Core/GameEngine/Model/Player/Realm/RealmModel.cs.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 guid: 4839d4a757dc0ae4b9330fff398a4846 timeCreated: 1507905919 licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: fileFormatVersion: 2 guid: 4839d4a757dc0ae4b9330fff398a4846 timeCreated: 1507905919 licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/Realm/RealmPracticeModel.cs
File was deleted System/Realm/RealmPracticeModel.cs.meta
File was deleted System/Realm/RealmPracticeWin.cs
File was deleted System/Realm/RealmPracticeWin.cs.meta
File was deleted System/Realm/RealmProgressBehaviour.cs
File was deleted System/Realm/RealmProgressBehaviour.cs.meta
File was deleted System/Realm/RealmUpHoldWin.cs
File was deleted System/Realm/RealmUpHoldWin.cs.meta
File was deleted System/Realm/RealmUpWin.cs
@@ -17,422 +17,34 @@ [XLua.Hotfix] public class RealmUpWin : Window { #region built-in [SerializeField] RectTransform m_ContainerNow; [SerializeField] RectTransform m_ContainerNowHasRealm; [SerializeField] RectTransform m_ContainerNext; [SerializeField] RectTransform m_ContainerProgress; [SerializeField] RectTransform m_ContainerModel; [SerializeField] RectTransform m_ContainerNoHighestBottom; [SerializeField] RectTransform m_ContainerHighestBottom; [SerializeField] Image m_RealmTitleNext; [SerializeField] RealmIcon m_RealmIconNow; [SerializeField] RealmIcon m_RealmIconNowHighest; [SerializeField] RealmIcon m_RealmIconNext; [SerializeField] RealmPropertyCell m_RealmPropertyNow; [SerializeField] RealmPropertyCell m_RealmPropertyNext; [SerializeField] RawImage m_RawBoss; [SerializeField] RawImage m_RawPlayer; [SerializeField] RealmProgressBehaviour m_RealmProgress; [SerializeField] UIEffect m_RealmDungeonSfx; [SerializeField] Button m_SingleDungeon; [SerializeField] Button m_FuncButton; [SerializeField] Text m_RealmStageTip; [SerializeField] RectTransform m_ContainerFightPower; [SerializeField] Text m_FightPower; [SerializeField] Button m_RealmPreview; [SerializeField, Header("Boss初始朝向")] Vector3 direction = Vector3.zero; [SerializeField, Header("模型位置")] Vector3[] m_ModelPositions; [SerializeField, Header("当前境界位置")] Vector3[] m_RealmNowPositions; [SerializeField, Header("下一境界位置")] Vector3[] m_RealmNextwPositions; [SerializeField, Header("Boss位置")] Vector3[] m_BossPositions; [SerializeField, Header("Boss出现延长")] float m_DelayEnterTime = 1f; [SerializeField, Header("出场总时长")] float m_BossEnterDuration = 3f; int cacheRealmPoint = 0; Coroutine cacheCoroutine = null; const string State_EnterHash = "Show"; const string State_IdleHash = "Idle"; DateTime overdueTime = DateTime.Now; RealmModel realmModel { get { return ModelCenter.Instance.GetModel<RealmModel>(); } } protected override void AddListeners() { throw new NotImplementedException(); } protected override void BindController() { } protected override void AddListeners() { m_SingleDungeon.onClick.AddListener(SingleDungeon); m_FuncButton.onClick.AddListener(OnFunctionClick); m_RealmPreview.onClick.AddListener(OnRealmPreview); } protected override void OnPreOpen() { PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshInfoEvent; WindowCenter.Instance.windowAfterCloseEvent += WindowAfterCloseEvent; cacheRealmPoint = PlayerDatas.Instance.extersion.realmPoint; m_RawBoss.gameObject.SetActive(false); m_RawPlayer.gameObject.SetActive(false); overdueTime = DateTime.Now; Display(); } protected override void OnActived() { base.OnActived(); if (realmModel.realmDungeonState) { StopBoss(); m_RawBoss.gameObject.SetActive(false); m_RawPlayer.gameObject.SetActive(true); UI3DModelExhibition.Instance.ShowSitDownPlayer(m_RawPlayer, PlayerDatas.Instance.baseData.Job); } var _realmPoint = PlayerDatas.Instance.extersion.realmPoint; var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel); bool satisfyChallenge = false; if (config != null) { satisfyChallenge = _realmPoint >= config.NeedPoint; } if (satisfyChallenge && !NewBieCenter.Instance.inGuiding && !NewBieCenter.Instance.IsGuideCompleted(35) && realmModel.excuteRealmOpenGuide) { NewBieCenter.Instance.StartNewBieGuide(35); } } protected override void OnAfterOpen() { HandleAchievement(); if (realmModel.openByDungeonStep && !realmModel.realmDungeonState) { m_RawBoss.gameObject.SetActive(false); m_RawPlayer.gameObject.SetActive(false); ActivateShow.RealmActivate(PlayerDatas.Instance.baseData.realmLevel); } realmModel.openByDungeonStep = false; if (realmModel.realmDungeonState) { m_RealmDungeonSfx.Play(); overdueTime = DateTime.Now.AddSeconds(m_BossEnterDuration); StartCoroutine(Co_DisplayBossShow()); } realmModel.realmDungeonState = false; } protected override void OnPreClose() { PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshInfoEvent; WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent; StopBoss(); UI3DModelExhibition.Instance.StopShow(); realmModel.realmDungeonState = false; if (cacheCoroutine != null) { StopCoroutine(cacheCoroutine); cacheCoroutine = null; } throw new NotImplementedException(); } protected override void OnAfterClose() { var _realmPoint = PlayerDatas.Instance.extersion.realmPoint; var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel); if (!realmModel.IsRealmHighest && _realmPoint >= config.NeedPoint && realmModel.realmRedpoint.state == RedPointState.Simple) { realmModel.openedRealmUpWin = true; realmModel.UpdateRedpoint(); } } #endregion IEnumerator Co_DisplayBossShow() { yield return WaitingForSecondConst.WaitMS800; var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel); m_RawPlayer.gameObject.SetActive(false); UI3DModelExhibition.Instance.StopShow(); yield return WaitingForSecondConst.GetWaitForSeconds(m_DelayEnterTime > 0 ? m_DelayEnterTime : 1f); StartBoss(config, true); throw new NotImplementedException(); } private void PlayerDataRefreshInfoEvent(PlayerDataType refreshType) protected override void OnAfterOpen() { if (refreshType == PlayerDataType.RealmLevel) { DisplayRealmNow(); DisplayRealmNext(); DisplayModel(); DisplayButton(); DisplayProgress(); DisplayContainer(); } else if (refreshType == PlayerDataType.RealmPoint) { m_RealmProgress.DisplayProgress(true); DisplayRemind(); DisplayModel(); DisplayButton(); cacheRealmPoint = PlayerDatas.Instance.extersion.realmPoint; } throw new NotImplementedException(); } private void Display() protected override void OnPreClose() { DisplayRealmNow(); DisplayRealmNext(); DisplayModel(); DisplayProgress(); DisplayButton(); DisplayContainer(); throw new NotImplementedException(); } private void DisplayRealmNow() protected override void OnPreOpen() { var _realmLv = PlayerDatas.Instance.baseData.realmLevel; var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel); m_ContainerNow.gameObject.SetActive(_realmLv > 0); m_ContainerNoHighestBottom.gameObject.SetActive(!realmModel.IsRealmHighest); m_ContainerHighestBottom.gameObject.SetActive(realmModel.IsRealmHighest); if (_realmLv > 0) { m_RealmPropertyNow.Display(_realmLv, false); m_RealmIconNow.Display(_realmLv); m_RealmIconNowHighest.Display(_realmLv); } } private void DisplayRealmNext() { var _realmLv = PlayerDatas.Instance.baseData.realmLevel + 1; var config = RealmConfig.Get(_realmLv); m_ContainerNext.gameObject.SetActive(config != null); if (config != null) { m_RealmPropertyNext.Display(_realmLv, false); m_RealmIconNext.Display(_realmLv); var fightPower = PlayerDatas.Instance.baseData.FightPoint; m_FightPower.text = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Green, Language.Get("RolePromoteBetterFight")), UIHelper.AppendStringColor(fightPower >= config.FightPower ? TextColType.Green : TextColType.Red, fightPower.ToString()) , "/", config.FightPower); } } private void DisplayProgress() { if (!realmModel.IsRealmHighest) { m_RealmProgress.Display(); } DisplayRemind(); } private void DisplayRemind() { var _realmPoint = PlayerDatas.Instance.extersion.realmPoint; var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel); m_ContainerFightPower.gameObject.SetActive(!realmModel.IsRealmHighest && _realmPoint >= config.NeedPoint); if (_realmPoint < config.NeedPoint) { m_RealmStageTip.text = Language.Get("RealmWin_Bewrite_39"); } else { if (config.IsBigRealm == 1) { m_RealmStageTip.text = Language.Get("RealmWin_Bewrite_2"); } else { m_RealmStageTip.text = Language.Get("RealmWin_Bewrite_11"); } } if (realmModel.IsRealmHighest) { m_RealmStageTip.text = string.Empty; } } private void DisplayModel() { var _realmPoint = PlayerDatas.Instance.extersion.realmPoint; var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel); if (realmModel.IsRealmHighest || _realmPoint < config.NeedPoint) { m_RawPlayer.gameObject.SetActive(true); StopBoss(); m_RawBoss.gameObject.SetActive(false); UI3DModelExhibition.Instance.ShowSitDownPlayer(m_RawPlayer, PlayerDatas.Instance.baseData.Job); } else if (_realmPoint >= config.NeedGood) { m_RawBoss.gameObject.SetActive(true); m_RawPlayer.gameObject.SetActive(false); UI3DModelExhibition.Instance.StopShow(); StartBoss(config); } } private void StopBoss() { UI3DModelExhibition.Instance.StopShow(); } private void StartBoss(RealmConfig config, bool act = false) { StopBoss(); m_RawBoss.gameObject.SetActive(true); UI3DModelExhibition.Instance.StopShow(); UI3DModelExhibition.Instance.ShowNPC(config.BossID, config.IsBigRealm == 1 ? Vector3.zero : direction, m_RawBoss, false); var npcConfig = NPCConfig.Get(config.BossID); var npcModel = UI3DModelExhibition.Instance.NpcModelPet; m_RawBoss.transform.localPosition = config.IsBigRealm == 1 ? m_BossPositions[1] : m_BossPositions[0]; if (npcModel != null) { var animator = npcModel.GetComponentInChildren<Animator>(); if (animator != null) { var runtimeController = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerRealmSuffix, npcConfig.MODE); animator.runtimeAnimatorController = runtimeController; animator.Play(act ? State_EnterHash : State_IdleHash, 0); } } } private void DisplayContainer() { int _state = PlayerDatas.Instance.baseData.realmLevel == 0 ? 0 : realmModel.IsRealmHighest ? 2 : 1; m_ContainerProgress.gameObject.SetActive(_state != 2); m_ContainerNow.transform.localPosition = _state == 2 ? m_RealmNowPositions[1] : m_RealmNowPositions[0]; m_ContainerNext.transform.localPosition = _state == 0 ? m_RealmNextwPositions[1] : m_RealmNextwPositions[0]; m_ContainerModel.transform.localPosition = m_ModelPositions[_state]; m_RealmTitleNext.SetSprite(_state == 0 ? "TB_JJ_10" : "TB_JJ_7"); } private void DisplayButton() { var _realmPoint = PlayerDatas.Instance.extersion.realmPoint; var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel); bool satisfyChallenge = _realmPoint >= config.NeedPoint; m_SingleDungeon.gameObject.SetActive(!realmModel.IsRealmHighest && satisfyChallenge); m_FuncButton.gameObject.SetActive(!realmModel.IsRealmHighest && !satisfyChallenge); } private void OnFunctionClick() { WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DailyQuestFunc1); } //private void GroupDungeon() //{ // if (DateTime.Now < overdueTime) // { // return; // } // if (PlayerDatas.Instance.baseData.MapID == RealmModel.REALM_DUNGEON_ID) // { // return; // } // var teamModel = ModelCenter.Instance.GetModel<TeamModel>(); // if (teamModel.myTeam.inTeam && teamModel.myTeam.iamCaptainer) // { // ModelCenter.Instance.GetModel<DungeonModel>().GroupChallenge(RealmModel.REALM_DUNGEON_ID, 1); // } // else // { // teamModel.missionBuf = teamModel.currentMission = new TeamMission(31110, 1); // WindowCenter.Instance.Open<TeamFrameWin>(false, teamModel.myTeam.inTeam ? 1 : 0); // } //} //private void AutoGroup() //{ // if (DateTime.Now < overdueTime) // { // return; // } // var teamModel = ModelCenter.Instance.GetModel<TeamModel>(); // teamModel.RequestAutoMatchTeam(new TeamMission(RealmModel.REALM_DUNGEON_ID, 1)); // WindowCenter.Instance.Open<TeamFrameWin>(false, 1); //} private void SingleDungeon() { if (DateTime.Now < overdueTime) { return; } if (PlayerDatas.Instance.baseData.MapID == RealmModel.REALM_DUNGEON_ID) { return; } PlayerDatas.Instance.realm.realmHelpList.Clear(); var _realmPoint = PlayerDatas.Instance.extersion.realmPoint; var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel); if (_realmPoint >= config.NeedPoint) { ModelCenter.Instance.GetModel<DungeonModel>().SingleChallenge(RealmModel.REALM_DUNGEON_ID, config.IsBigRealm == 1 ? 1 : 0); } } private void OnRealmPreview() { WindowCenter.Instance.Open<RealmPreviewWin>(); } void HandleAchievement() { if (AchievementGoto.achievementType == AchievementGoto.RealmDungeon) { if (!realmModel.IsRealmHighest) { var _effect = AchievementGuideEffectPool.Require(1); _effect.transform.SetParentEx(m_FuncButton.transform, Vector3.zero, Vector3.zero, Vector3.one); AchievementGoto.achievementType = 0; } } else if (AchievementGoto.achievementType == AchievementGoto.RealmDungeonHelp) { var _level = PlayerDatas.Instance.baseData.realmLevel; var _realmCfg = RealmConfig.Get(_level); if (_realmCfg != null && _realmCfg.IsBigRealm == 1 && realmModel.IsDungeonState) { var _effect = AchievementGuideEffectPool.Require(1); _effect.transform.SetParentEx(m_FuncButton.transform, Vector3.zero, Vector3.zero, Vector3.one); } else { SysNotifyMgr.Instance.ShowTip("Achievement_79"); } AchievementGoto.achievementType = 0; } AchievementGoto.achievementType = 0; } private void WindowAfterCloseEvent(Window _win) { if (_win is RealmPropertyUpWin) { DisplayModel(); } throw new NotImplementedException(); } } } System/Realm/SecondPraTypeCell.cs
File was deleted System/Realm/SecondPraTypeCell.cs.meta
File was deleted System/Realm/TaskTypeCell.cs
File was deleted System/Realm/TaskTypeCell.cs.meta
File was deleted System/RolePromote/RolePromoteModel.cs
@@ -492,7 +492,7 @@ _id == runeModel.runeMosaicRedpoint.id || _id == magicianModel.magicianRedpoint.id || _id == methodData.fairyHeartRedpoint.id || _id == realmModel.realmRedpoint.id || _id == realmModel.redpoint.id || _id == gemModel.gemTagRedPoint.id || _id == rolePointModel.redpoint.id) { System/Team/GroupDungeonChallengeProcessor.cs
@@ -37,8 +37,6 @@ switch (_mapId) { case RealmModel.REALM_DUNGEON_ID: var realmModel = ModelCenter.Instance.GetModel<RealmModel>(); realmModel.GotoDungeon(); break; case 31080: { System/Team/TeamModel.cs
@@ -248,16 +248,6 @@ public void RequestCreateTeam(int _mapId, int _lineId, int _levelMin = 1, int _levelMax = 1) { if (_mapId == 31110) { var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel); if (config.IsBigRealm != 1 || !ModelCenter.Instance.GetModel<RealmModel>().IsDungeonState) { SysNotifyMgr.Instance.ShowTip("NOGreatBourn"); return; } } var mapId = _mapId == NONE_MISSION ? 0 : _mapId == CURRENTMAP_MISSION ? PlayerDatas.Instance.baseData.MapID : _mapId; var mapEx = _lineId <= 0 ? 0 : _lineId; var dungeonId = dungeonModel.GetDungeonId(mapId, mapEx); System/Team/TeamTargetJoinLimitWin.cs
@@ -189,16 +189,6 @@ missionBuf.mapId == TeamModel.CURRENTMAP_MISSION ? PlayerDatas.Instance.baseData.MapID : missionBuf.mapId; var mapEx = missionBuf.mapEx <= 0 ? 0 : missionBuf.mapEx; if (mapId == 31110) { var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel); if (config.IsBigRealm != 1 || !ModelCenter.Instance.GetModel<RealmModel>().IsDungeonState) { SysNotifyMgr.Instance.ShowTip("NOGreatBourn"); return; } } var key = dungeonModel.GetDungeonId(mapId, mapEx); if (key == 0)
