From 0e2581e3f17372594b463b510d7890436cd945f3 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 22 十月 2025 18:13:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Main/MainWin.cs | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 3273008..1bfb8f6 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -29,7 +29,7 @@
[SerializeField] FillTween cdTween;
[SerializeField] Text hammerText;
- bool isFirstOpen = true; //棣栨鎵撳紑
+ bool isForcePlayFightUIAnim = true; //寮哄埗鎾斁鎴樻枟閿ゅ瓙妗嗗姩鐢�
public static event Action TabChangeEvent;
protected override void InitComponent()
@@ -61,6 +61,7 @@
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
base.OnPreClose();
+ isForcePlayFightUIAnim = true;
}
@@ -73,18 +74,33 @@
//鎴樻枟鎸夐挳鍔ㄧ敾
void ClickAnimation(int index)
{
- if (isFirstOpen || (functionOrder != 0 && index == 0))
+ //寮哄埗鎾斁
+ if (isForcePlayFightUIAnim)
{
openCloseAnim.onComplete = () =>
{
openCloseAnim.SetEnabled(true);
};
+ openCloseAnim.PlayByArrIndex(index == 0 ? 1 : 0);
+
+ isForcePlayFightUIAnim = false;
+ return;
+ }
+
+ //鍒囨崲鏄剧ず
+ if (functionOrder != 0 && index == 0)
+ {
+ //鍒囧洖鎴樻枟鍦烘櫙
+ openCloseAnim.onComplete = () =>
+ {
+ openCloseAnim.SetEnabled(true);
+ };
openCloseAnim.PlayByArrIndex(1);
- isFirstOpen = false;
}
- else if (functionOrder == 0 && index != 0)
+ else if (functionOrder <= 0 && index != 0)
{
+ //鍒囧嚭鎴樻枟鍦烘櫙
openCloseAnim.onComplete = () =>
{
openCloseAnim.SetEnabled(true);
@@ -184,11 +200,11 @@
return;
}
- TabChangeEvent?.Invoke();
ClickAnimation(index);
// 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
functionOrder = index;
+ TabChangeEvent?.Invoke();
DisplayTopBar();
@@ -364,7 +380,7 @@
{
if (lastWinOrder == -1)
{
- lastWinOrder = 0;
+ functionOrder = 0;
}
else
{
@@ -386,6 +402,7 @@
currentSubUI.CloseWindow();
currentSubUI = null;
functionOrder = -1;
+ isForcePlayFightUIAnim = true;
DisplayTopBar();
}
}
@@ -393,7 +410,7 @@
// 澶栭儴鎭㈠瀛愮晫闈�
public void RestoreSubUI()
{
- if (functionOrder != 0)
+ if (functionOrder != -1)
return;
if (lastWinOrder == -1)
{
--
Gitblit v1.8.0