From 742387b0573b11b9edea35c9254139ed385ceb79 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 11 十一月 2025 20:11:56 +0800
Subject: [PATCH] 0312 防范打开其他战场时会弹装备界面的问题
---
Main/System/Equip/EquipModel.cs | 8 +++++---
Main/System/Main/MoneyMoveByPath.cs | 12 ++++++------
Main/System/Battle/BaseBattleWin.cs | 6 ++++++
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/Main/System/Battle/BaseBattleWin.cs b/Main/System/Battle/BaseBattleWin.cs
index 1a2b085..fa8c2ad 100644
--- a/Main/System/Battle/BaseBattleWin.cs
+++ b/Main/System/Battle/BaseBattleWin.cs
@@ -42,7 +42,13 @@
// 鍦ㄦ墦寮�鏃堕渶瑕佹殏鍋滀富绾挎垬鏂�
if (BattleManager.Instance.storyBattleField != null)
+ {
BattleManager.Instance.storyBattleField.IsPause = true;
+ if (UIManager.Instance.IsOpened<EquipExchangeWin>())
+ {
+ UIManager.Instance.CloseWindow<EquipExchangeWin>();
+ }
+ }
}
protected override void OnPreClose()
diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index 4b8f35d..fbb4b5f 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -327,9 +327,6 @@
if (waitEquipOPPack)
return false;
- // 鍚庣画琛ュ厖寮曞鎴栬�呭叾浠栨儏鍐典笅锛屼笉鍏佽鍒囨崲瑁呭鐣岄潰
- // if (NewBieCenter.Instance.inGuiding)
- // return;
if (UIManager.Instance.IsOpened<EquipExchangeWin>())
{
@@ -356,6 +353,11 @@
if (NewBieCenter.Instance.inGuiding)
return null;
+ string activeBattleName = BattleManager.Instance.GetActiveBattleName();
+ if (activeBattleName != "" && activeBattleName != "StoryBattleField")
+ return null;
+
+
return PackManager.Instance.GetItemByIndex(PackType.DropItem, waitEquipOP.Dequeue());
}
diff --git a/Main/System/Main/MoneyMoveByPath.cs b/Main/System/Main/MoneyMoveByPath.cs
index bcd0f0f..e290ff8 100644
--- a/Main/System/Main/MoneyMoveByPath.cs
+++ b/Main/System/Main/MoneyMoveByPath.cs
@@ -20,6 +20,10 @@
public Transform targetPosition;
List<ImageEx> imgMoneys = new List<ImageEx>();
+ int pointCount = 30;
+ Vector3[] points = new Vector3[30];
+ Vector3[] points2 = new Vector3[30];
+
/// <summary>
/// 鎾斁鎺夎惤鍔ㄧ敾
/// </summary>
@@ -54,8 +58,7 @@
}
//閫氳繃 heightCurve 鐢熸垚璺緞锛屾椂闂翠负x 鎬绘椂闂翠负1锛寉涓洪珮搴︼紝鍋忕Щ閲忎负100
- int pointCount = 30;
- Vector3[] points = new Vector3[pointCount];
+
for (int i = 0; i < pointCount; i++)
{
float x = i / (pointCount - 1f);
@@ -64,8 +67,6 @@
}
-
-
for (int i = 0; i < imgMoneys.Count; i++)
{
@@ -84,13 +85,12 @@
// x y 闅忔満涓嬪樊寮�
float randX = Random.Range(0.2f, 1f);
float randY = Random.Range(0.6f, 1f);
- Vector3[] points2 = new Vector3[pointCount];
+
for (int j = 0; j < points.Length; j++)
{
points2[j] = new Vector3((points[j].x + offsetX)* randDir * randX, points[j].y * randY, points[j].z);
}
moneyImg.transform.localPosition = points2[0];
-
moneyImg.transform.DOLocalPath(points2, duration1, PathType.CatmullRom).SetEase(Ease.InOutSine).OnComplete(() =>
{
--
Gitblit v1.8.0