From ca72a86a38c255c51df9d9376bf86bdeda92deb6 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 13 十一月 2025 18:58:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Main/RightFuncInHome.cs | 9 +++-
Main/System/ItemTip/OwnItemCell.cs | 20 +++++++++
Main/System/Main/MainWin.cs | 5 ++
Main/System/DayMission/SignManager.cs | 14 ++++++
Main/System/Equip/EquipExchangeCell.cs | 26 ++++++------
5 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/Main/System/DayMission/SignManager.cs b/Main/System/DayMission/SignManager.cs
index 64cc492..73688c1 100644
--- a/Main/System/DayMission/SignManager.cs
+++ b/Main/System/DayMission/SignManager.cs
@@ -14,13 +14,14 @@
public override void Init()
{
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitialize;
-
+ FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
ParseConfig();
}
public override void Release()
{
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitialize;
+ FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
}
void OnBeforePlayerDataInitialize()
@@ -44,6 +45,17 @@
UpdateRedpoint();
}
+
+ void OnFuncStateChangeEvent(int funcID)
+ {
+ if (DTC0403_tagPlayerLoginLoadOK.finishedLogin && funcID == (int)FuncOpenEnum.DaySign)
+ {
+ RightFuncInHome.ListenWindowEx("SignWin");
+ PopupWindowsProcessor.Instance.Add("SignWin");
+ }
+ }
+
+
//鐘舵�侊細0-涓嶅彲绛惧埌锛�1-宸茬鍒帮紱2-鍙ˉ绛撅紱3-宸查鍙�
public int GetSignDayState(int day)
{
diff --git a/Main/System/Equip/EquipExchangeCell.cs b/Main/System/Equip/EquipExchangeCell.cs
index 3aa1f27..b9e8356 100644
--- a/Main/System/Equip/EquipExchangeCell.cs
+++ b/Main/System/Equip/EquipExchangeCell.cs
@@ -171,20 +171,20 @@
//寤惰繜澶勭悊鐗规晥澶у皬
async UniTask RefreshEffect(ItemModel equip)
{
- await UniTask.DelayFrame(3);
+ // await UniTask.DelayFrame(3);
+ // if (effectID == 0)
+ // {
+ // uieffect.Stop();
+ // }
+ // else
+ // {
+ // uieffect.Stop();
+ // uieffect.effectId = effectID;
+ // //璁＄畻楂樺害缂╂斁姣斾緥 鐗规晥鏄剧ず渚濊禆rect鐨勬帓鐗�
+ // uieffect.transform.localScale = new Vector3(0.98f, bgRect.rect.height / uieffect.GetComponent<RectTransform>().rect.height, 1);
+ // uieffect.Play();
+ // }
int effectID = EquipModel.Instance.equipUIEffects[Math.Min(equip.config.ItemColor, EquipModel.Instance.equipUIEffects.Length) - 1];
- if (effectID == 0)
- {
- uieffect.Stop();
- }
- else
- {
- uieffect.Stop();
- uieffect.effectId = effectID;
- //璁＄畻楂樺害缂╂斁姣斾緥 鐗规晥鏄剧ず渚濊禆rect鐨勬帓鐗�
- uieffect.transform.localScale = new Vector3(0.98f, bgRect.rect.height / uieffect.GetComponent<RectTransform>().rect.height, 1);
- uieffect.Play();
- }
//浜屾澶勭悊鏀惧ぇ鏁堟灉
await UniTask.Delay(100);
diff --git a/Main/System/ItemTip/OwnItemCell.cs b/Main/System/ItemTip/OwnItemCell.cs
index 1afcef7..9a073a8 100644
--- a/Main/System/ItemTip/OwnItemCell.cs
+++ b/Main/System/ItemTip/OwnItemCell.cs
@@ -8,12 +8,30 @@
[SerializeField] Image itemIcon;
[SerializeField] Text numText;
[SerializeField] Button wayBtn;
- public int itemID;
+
+ int m_itemID;
+ public int itemID
+ {
+ get
+ {
+ return m_itemID;
+ }
+ set
+ {
+ m_itemID = value;
+ if (m_itemID != 0)
+ {
+ Display(true);
+ }
+ }
+ }
void Start()
{
if (itemID != 0)
+ {
itemIcon.SetOrgSprite(ItemConfig.Get(itemID).IconKey);
+ }
wayBtn.AddListener(()=>
{
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 36a0809..5e187a7 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -434,11 +434,16 @@
public void RestoreSubUI()
{
if (functionOrder != -1)
+ {
+ Debug.Log("RestoreSubUI functionOrder " + functionOrder);
return;
+ }
if (lastWinOrder == -1)
{
lastWinOrder = 0;
}
+
+ Debug.Log("RestoreSubUI lastWinOrder " + lastWinOrder);
OnTabButtonClicked(lastWinOrder);
}
diff --git a/Main/System/Main/RightFuncInHome.cs b/Main/System/Main/RightFuncInHome.cs
index 9c5ec85..156b5a6 100644
--- a/Main/System/Main/RightFuncInHome.cs
+++ b/Main/System/Main/RightFuncInHome.cs
@@ -72,7 +72,7 @@
ListenWindow("ExpSecretCollectionWin");
UIManager.Instance.OpenWindow<ExpSecretCollectionWin>();
});
-
+
signBtn.AddListener(() =>
{
//鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
@@ -96,7 +96,7 @@
public void ShowFuncCol(bool _isShow)
{
isShow = _isShow;
- funcCol.DOLocalMove(isShow ? showPoint.localPosition : hidePoint.localPosition, 0.3f);
+ funcCol?.DOLocalMove(isShow ? showPoint.localPosition : hidePoint.localPosition, 0.3f);
if (isShow)
{
ShowBtns();
@@ -124,5 +124,10 @@
listenWindowName = "";
}
+ //澶栭儴浣跨敤
+ public static void ListenWindowEx(string _listenWindowName)
+ {
+ listenWindowName = _listenWindowName;
+ }
}
--
Gitblit v1.8.0