| System/KnapSack/New/RoleEquipWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/MainInterfaceWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/WindowJump/WindowJumpMgr.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/KnapSack/New/RoleEquipWin.cs
@@ -18,7 +18,6 @@ public class RoleEquipWin : Window { #region 成员变量 [SerializeField] EquipBehaviours equipPlaces; [SerializeField] RawImage m_Role; [SerializeField] private Button m_OneKeySell; @@ -28,6 +27,7 @@ [SerializeField] private Text m_Copper; [SerializeField] private Text m_Diamond; [SerializeField] private Button m_EquBtn; [SerializeField] Button m_SpiritButton; #endregion @@ -45,7 +45,8 @@ { m_OneKeySell.SetListener(OnClickOneKeySell); m_Sort.SetListener(OnClickSortBtn); m_EquBtn.SetListener(OnEquBtnDown); m_EquBtn.SetListener(OnEquBtnDown); m_SpiritButton.SetListener(GotoSpiritWeaponWin); } protected override void OnPreOpen() @@ -57,6 +58,7 @@ WindowCenter.Instance.windowAfterCloseEvent += AfterWindowClose; GlobalTimeEvent.Instance.secondEvent += UpdateSecond; m_SpiritButton.gameObject.SetActive(FuncOpen.Instance.IsFuncOpen(183)); UpdateMoney(); } @@ -105,7 +107,6 @@ DisplaySortableCountDown(); } equipPlaces.DisplayAll(); UI3DModelExhibition.Instance.ShowPlayer(m_Role, PlayerDatas.Instance.baseData.Job); } @@ -125,11 +126,15 @@ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RealmEquip); } private void GotoSpiritWeaponWin() { WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SpiritWeapon); } private void UpdateSecond() { if (levelUpDirty) { equipPlaces.DisplayAll(); UI3DModelExhibition.Instance.ShowPlayer(m_Role, PlayerDatas.Instance.baseData.Job); levelUpDirty = false; } @@ -142,19 +147,6 @@ return; } var equipPosition = EquipSet.ServerPlaceToClientPlace(index); if (equipPosition.x != 0) { return; } var equipType = (RoleEquipType)equipPosition.y; if (!equipPlaces.Contain(equipType)) { return; } equipPlaces[equipType].Display(equipType); UI3DModelExhibition.Instance.ShowPlayer(m_Role, PlayerDatas.Instance.baseData.Job); } @@ -230,55 +222,6 @@ else { ServerTipDetails.DisplayNormalTip(Language.Get("KnapS129")); } } [System.Serializable] public class EquipBehaviours { public EquipPlaceCell wing; public EquipPlaceCell guard1; public EquipPlaceCell peerlessWeapon1; public EquipPlaceCell peerlessWeapon2; public EquipPlaceCell this[RoleEquipType type] { get { switch (type) { case RoleEquipType.Wing: return wing; case RoleEquipType.Guard: return guard1; case RoleEquipType.PeerlessWeapon1: return peerlessWeapon1; case RoleEquipType.PeerlessWeapon2: return peerlessWeapon2; default: return null; } } } public bool Contain(RoleEquipType type) { return type == RoleEquipType.Wing || type == RoleEquipType.Guard || type == RoleEquipType.PeerlessWeapon1 || type == RoleEquipType.PeerlessWeapon2; } public void Display(RoleEquipType type) { this[type].Display(type); } public void DisplayAll() { wing.Display(RoleEquipType.Wing); guard1.Display(RoleEquipType.Guard); peerlessWeapon1.Display(RoleEquipType.PeerlessWeapon1); peerlessWeapon2.Display(RoleEquipType.PeerlessWeapon2); } } System/MainInterfacePanel/MainInterfaceWin.cs
@@ -63,7 +63,6 @@ protected override void BindController() { m_MapSwitchingBehaviour.InitAwake(); m_MainPositionTween.ShowTaskImmedidately(true, true); m_MailObj.SetActive(true); ListBossMapId.Clear(); string strBoss = FuncConfigConfig.Get("TaskRetract").Numerical1; @@ -138,16 +137,7 @@ m_MainButtonMisc.OnActived(); IsShowTaskPanel();//是否显示任务面板 var inBossArea = PlayerDatas.Instance.hero != null && MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域 if (inBossArea && ListBossMapId.Contains(PlayerDatas.Instance.baseData.MapID)) { m_MainPositionTween.ShowTaskImmedidately(false, true); } else { m_MainPositionTween.ShowTaskImmedidately(true, false); } m_MainPositionTween.ShowTaskImmedidately(true, false); if (MapUtility.IsDungeon(PlayerDatas.Instance.baseData.MapID)) { @@ -293,19 +283,6 @@ { DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)onMainModel.AreaState); } } if (_areaType == MapArea.E_Type.Boss && _enter) { if (ListBossMapId.Contains(PlayerDatas.Instance.baseData.MapID)) { m_MainPositionTween.ShowTask(false, true, false); } } if ((_areaType == MapArea.E_Type.Boss && !_enter) || (_areaType != MapArea.E_Type.Normal && (_areaType != MapArea.E_Type.Boss && _enter))) { m_MainPositionTween.ShowTask(true, false, false); } m_MainPositionTween.SwitchFunctions(new MainPositionTween.SwitchParam() { showDefault = true, immediately = false }); System/WindowJump/WindowJumpMgr.cs
@@ -764,6 +764,9 @@ case JumpUIType.ExchangeActiveToken: SetJumpLogic<ExchangeActiveTokenWin>(); break; case JumpUIType.SpiritWeapon: SetJumpLogic("SpiritEquipWin", 0 ,false); break; default: DebugEx.Log("未添加此跳转界面：" + jumpType); IsJumpState = false; @@ -1178,43 +1181,47 @@ SetJumpLogic<MultipleDifficultyDungeonWin>(0); } private void SetJumpLogic<T>(int _functionalOrder = 0, bool _forceSync = true) where T : Window private void SetJumpLogic<T>(int functionOrder = 0, bool sync = true) where T : Window { string curOpenWin = typeof(T).Name; if (WindowCenter.Instance.IsOpen(curOpenWin)) SetJumpLogic(typeof(T).Name, functionOrder, sync); } private void SetJumpLogic(string windowName, int functionOrder, bool sync) { if (WindowCenter.Instance.IsOpen(windowName)) { Window window = WindowCenter.Instance.Get(curOpenWin); window.functionOrder = _functionalOrder; Window window = WindowCenter.Instance.Get(windowName); window.functionOrder = functionOrder; window.ChildActive(); return; } GetPreAllOpenWin(); jumpWinNameDict.Add(jumpPhase, curOpenWin); jumpWinNameDict.Add(jumpPhase, windowName); jumpType = _tagWinSearchModel.Type; switch (_tagWinSearchModel.Type) { case 1: WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.SystemAndCustom); WindowCenter.Instance.Open<T>(_forceSync, _functionalOrder); WindowCenter.Instance.Open(windowName, sync, functionOrder); WindowCenter.Instance.jumpWindowCloseEvent += CloseWindow; break; case 2: WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.SystemAndCustom); WindowCenter.Instance.Open<T>(_forceSync, _functionalOrder); WindowCenter.Instance.Open(windowName, sync, functionOrder); WindowCenter.Instance.jumpWindowCloseEvent += CloseWindow; break; case 3: WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.SystemAndCustom); WindowCenter.Instance.Open<T>(_forceSync, _functionalOrder); WindowCenter.Instance.Open(windowName, sync, functionOrder); WindowCenter.Instance.jumpWindowCloseEvent += CloseWindow; break; case 4: WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.SystemAndCustom); WindowCenter.Instance.Open<T>(_forceSync, _functionalOrder); WindowCenter.Instance.Open(windowName, sync, functionOrder); WindowCenter.Instance.jumpWindowCloseEvent += CloseWindow; break; case 5: WindowCenter.Instance.Open<T>(_forceSync, _functionalOrder); WindowCenter.Instance.Open(windowName, sync, functionOrder); WindowCenter.Instance.jumpWindowCloseEvent += CloseWindow; break; default: @@ -1741,6 +1748,7 @@ CrossServerBoss = 335,//蓬莱仙境 Alchemy10 = 336, Alchemy11 = 337, SpiritWeapon = 338,//魂器界面 DhszTs = 1001,//定海神针功法提升界面 HyqTs = 1002,//皓月枪功法提升界面
