| Main/Component/UI/Common/ClickScreenOtherSpace.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Main/Component/UI/Common/PopupWindowsProcessor.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Main/Core/ResModule/ScriptableObjectLoader.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Main/System/NewBieGuidance/NewBieCenter.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Main/System/NewBieGuidance/NewBieWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Main/System/OfficialRank/OfficialRankManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Main/System/OfficialRank/OfficialUpCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Main/Component/UI/Common/ClickScreenOtherSpace.cs
@@ -46,20 +46,26 @@ case RespondType.In: if (RectTransformUtility.RectangleContainsScreenPoint(this.transform as RectTransform, sp, CameraManager.uiCamera)) { m_ClickOtherEvent?.Invoke(); this.SetActive(!m_DeActiveSelf); m_ClickOtherEvent?.Invoke(); } break; case RespondType.Out: if (!RectTransformUtility.RectangleContainsScreenPoint(this.transform as RectTransform, sp, CameraManager.uiCamera)) { m_ClickOtherEvent?.Invoke(); this.SetActive(!m_DeActiveSelf); m_ClickOtherEvent?.Invoke(); } break; } } else if (Input.GetMouseButtonUp(0)) { switch (m_RespondType) { case RespondType.InOut: m_ClickOtherEvent?.Invoke(); this.SetActive(!m_DeActiveSelf); m_ClickOtherEvent?.Invoke(); break; } } Main/Component/UI/Common/PopupWindowsProcessor.cs
@@ -5,6 +5,7 @@ /// <summary> /// 弹窗处理器 - 负责管理游戏中的弹窗队列，按顺序显示弹窗窗口 /// 避免多个窗口同时弹出造成界面混乱 /// 只有在homewin打开的情况下才触发 /// </summary> public class PopupWindowsProcessor : SingletonMonobehaviour<PopupWindowsProcessor> { @@ -77,11 +78,10 @@ } // 检查是否在新手引导中 // 注意：NewBieCenter在当前代码库中不存在，暂时注释掉相关检查 // if (NewBieCenter.Instance.inGuiding) // { // return; // } if (NewBieCenter.Instance.inGuiding) { return; } if (popupWindowQueue.Count == 0) { @@ -92,10 +92,14 @@ if (UIManager.Instance.IsOpened<LoadingWin>()) return; // 检查是否存在全屏或遮罩窗口 // 注意：ExistAnyFullScreenOrMaskWin方法在当前UIManager中不存在，暂时注释掉相关检查 // if (UIManager.Instance.ExistAnyFullScreenOrMaskWin()) // return; if (!UIManager.Instance.IsOpened<HomeWin>()) return; if (UIManager.Instance.IsOpened(popupWindowQueue[0].window)) { //当前模式可以打开多个相同窗口，增加防范 return; } if (currentWindow.window != null) { @@ -104,18 +108,13 @@ if (ui != null && ui.IsActive()) return; currentWindow = popupWindowQueue[0]; popupWindowQueue.RemoveAt(0); UIManager.Instance.OpenWindow(currentWindow.window, currentWindow.functionId); Debug.LogFormat("推送窗口 " + currentWindow.window); } else { currentWindow = popupWindowQueue[0]; popupWindowQueue.RemoveAt(0); UIManager.Instance.OpenWindow(currentWindow.window, currentWindow.functionId); Debug.LogFormat("推送窗口 " + currentWindow.window); } currentWindow = popupWindowQueue[0]; popupWindowQueue.RemoveAt(0); UIManager.Instance.OpenWindow(currentWindow.window, currentWindow.functionId); Debug.LogFormat("推送窗口 " + currentWindow.window); lastTime = Time.realtimeSinceStartup; }
@@ -8,7 +8,7 @@ public class ScriptableObjectLoader { public const string bundleName = "scriptableobjects"; public const string bundleName = "config/scriptableobject"; public const string SoNewBieGuide_Suffix = "NewBieGuideStep_";
@@ -293,7 +293,6 @@ if (config == null) { guideStep = 0; Debug.Log("1 FinishNewBieGuide " + _step); FinishNewBieGuide(currentGuide); return; } @@ -302,7 +301,6 @@ if (stepIndex < config.Steps.Length - 1) { guideStep = config.Steps[stepIndex + 1]; Debug.Log("3 FinishNewBieGuide " + _step); if (guideStepChangeEvent != null) { guideStepChangeEvent(); @@ -311,7 +309,6 @@ else { guideStep = 0; Debug.Log("2 FinishNewBieGuide " + _step); FinishNewBieGuide(currentGuide); } } Main/System/NewBieGuidance/NewBieWin.cs
@@ -245,9 +245,9 @@ } } void Update() void LateUpdate() { if (Input.GetMouseButtonDown(0)) if (Input.GetMouseButtonUp(0)) { if (stepConfig.clickAnyWhereComplete || m_NewBieMask.mask.IsInCirleArea(Input.mousePosition, CameraManager.uiCamera)) { Main/System/OfficialRank/OfficialRankManager.cs
@@ -135,22 +135,27 @@ } public void RequestAllAwards() public void RequestAllAwards(int id) { var missisons = RealmLVUPTaskConfig.GetMissionIDs(PlayerDatas.Instance.baseData.realmLevel); for (int i = 0; i < missisons.Count; i++) { var state = GetMissionState(PlayerDatas.Instance.baseData.realmLevel, missisons[i]); if (state == 1) { CA504_tagCMPlayerGetReward pak = new CA504_tagCMPlayerGetReward(); pak.RewardType = 68; pak.DataEx = (uint)missisons[i]; GameNetSystem.Instance.SendInfo(pak); } } // var missisons = RealmLVUPTaskConfig.GetMissionIDs(PlayerDatas.Instance.baseData.realmLevel); // for (int i = 0; i < missisons.Count; i++) // { // var state = GetMissionState(PlayerDatas.Instance.baseData.realmLevel, missisons[i]); // if (state == 1) // { // CA504_tagCMPlayerGetReward pak = new CA504_tagCMPlayerGetReward(); // pak.RewardType = 68; // pak.DataEx = (uint)missisons[i]; // GameNetSystem.Instance.SendInfo(pak); // } // } CA504_tagCMPlayerGetReward pak = new CA504_tagCMPlayerGetReward(); pak.RewardType = 68; pak.DataEx = (uint)id; GameNetSystem.Instance.SendInfo(pak); } #endregion Main/System/OfficialRank/OfficialUpCell.cs
@@ -60,7 +60,7 @@ { if (state != 1) return; OfficialRankManager.Instance.RequestAllAwards(); OfficialRankManager.Instance.RequestAllAwards(id); }); }
