From ab076c50f6b1224eac6e2b87e7972a34abd817c2 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 10 十月 2025 14:43:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/OfficialRank/OfficialRankManager.cs | 33 +++++++++-------
Main/System/OfficialRank/OfficialUpCell.cs | 2
Main/System/NewBieGuidance/NewBieCenter.cs | 3 -
Main/Component/UI/Common/PopupWindowsProcessor.cs | 39 +++++++++----------
Main/System/NewBieGuidance/NewBieWin.cs | 4 +-
Main/Component/UI/Common/ClickScreenOtherSpace.cs | 12 ++++-
Main/Core/ResModule/ScriptableObjectLoader.cs | 2
7 files changed, 51 insertions(+), 44 deletions(-)
diff --git a/Main/Component/UI/Common/ClickScreenOtherSpace.cs b/Main/Component/UI/Common/ClickScreenOtherSpace.cs
index a0a701a..62bb4c0 100644
--- a/Main/Component/UI/Common/ClickScreenOtherSpace.cs
+++ b/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;
}
}
diff --git a/Main/Component/UI/Common/PopupWindowsProcessor.cs b/Main/Component/UI/Common/PopupWindowsProcessor.cs
index 32e8c29..480b430 100644
--- a/Main/Component/UI/Common/PopupWindowsProcessor.cs
+++ b/Main/Component/UI/Common/PopupWindowsProcessor.cs
@@ -5,6 +5,7 @@
/// <summary>
/// 寮圭獥澶勭悊鍣� - 璐熻矗绠＄悊娓告垙涓殑寮圭獥闃熷垪锛屾寜椤哄簭鏄剧ず寮圭獥绐楀彛
/// 閬垮厤澶氫釜绐楀彛鍚屾椂寮瑰嚭閫犳垚鐣岄潰娣蜂贡
+/// 鍙湁鍦╤omewin鎵撳紑鐨勬儏鍐典笅鎵嶈Е鍙�
/// </summary>
public class PopupWindowsProcessor : SingletonMonobehaviour<PopupWindowsProcessor>
{
@@ -77,11 +78,10 @@
}
// 妫�鏌ユ槸鍚﹀湪鏂版墜寮曞涓�
- // 娉ㄦ剰锛歂ewBieCenter鍦ㄥ綋鍓嶄唬鐮佸簱涓笉瀛樺湪锛屾殏鏃舵敞閲婃帀鐩稿叧妫�鏌�
- // if (NewBieCenter.Instance.inGuiding)
- // {
- // return;
- // }
+ if (NewBieCenter.Instance.inGuiding)
+ {
+ return;
+ }
if (popupWindowQueue.Count == 0)
{
@@ -92,10 +92,14 @@
if (UIManager.Instance.IsOpened<LoadingWin>())
return;
- // 妫�鏌ユ槸鍚﹀瓨鍦ㄥ叏灞忔垨閬僵绐楀彛
- // 娉ㄦ剰锛欵xistAnyFullScreenOrMaskWin鏂规硶鍦ㄥ綋鍓峌IManager涓笉瀛樺湪锛屾殏鏃舵敞閲婃帀鐩稿叧妫�鏌�
- // 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;
}
diff --git a/Main/Core/ResModule/ScriptableObjectLoader.cs b/Main/Core/ResModule/ScriptableObjectLoader.cs
index 8ef9e54..72900fa 100644
--- a/Main/Core/ResModule/ScriptableObjectLoader.cs
+++ b/Main/Core/ResModule/ScriptableObjectLoader.cs
@@ -8,7 +8,7 @@
public class ScriptableObjectLoader
{
- public const string bundleName = "scriptableobjects";
+ public const string bundleName = "config/scriptableobject";
public const string SoNewBieGuide_Suffix = "NewBieGuideStep_";
diff --git a/Main/System/NewBieGuidance/NewBieCenter.cs b/Main/System/NewBieGuidance/NewBieCenter.cs
index 0016b04..4ea2df5 100644
--- a/Main/System/NewBieGuidance/NewBieCenter.cs
+++ b/Main/System/NewBieGuidance/NewBieCenter.cs
@@ -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);
}
}
diff --git a/Main/System/NewBieGuidance/NewBieWin.cs b/Main/System/NewBieGuidance/NewBieWin.cs
index 0b0588d..19c9656 100644
--- a/Main/System/NewBieGuidance/NewBieWin.cs
+++ b/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))
{
diff --git a/Main/System/OfficialRank/OfficialRankManager.cs b/Main/System/OfficialRank/OfficialRankManager.cs
index 21d4b12..08dbf62 100644
--- a/Main/System/OfficialRank/OfficialRankManager.cs
+++ b/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
diff --git a/Main/System/OfficialRank/OfficialUpCell.cs b/Main/System/OfficialRank/OfficialUpCell.cs
index c42ec99..c25f777 100644
--- a/Main/System/OfficialRank/OfficialUpCell.cs
+++ b/Main/System/OfficialRank/OfficialUpCell.cs
@@ -60,7 +60,7 @@
{
if (state != 1)
return;
- OfficialRankManager.Instance.RequestAllAwards();
+ OfficialRankManager.Instance.RequestAllAwards(id);
});
}
--
Gitblit v1.8.0