From 19f4ad7bdc2ddd0b6283f7241bd1440c5793568e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 27 十一月 2025 22:52:40 +0800
Subject: [PATCH] 0312 修复淘金自动刷新和战斗速度存储冲突问题；优化处理装备后再触发下引导
---
Main/System/Settlement/BattleSettlementManager.cs | 5 ++++-
Main/System/Main/HomeWin.cs | 13 +++++++++++--
Main/System/InternalAffairs/GoldRushManager.cs | 4 ++--
Main/System/NewBieGuidance/NewBieCenter.cs | 13 +++++++++++++
4 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/Main/System/InternalAffairs/GoldRushManager.cs b/Main/System/InternalAffairs/GoldRushManager.cs
index 856d68b..b147075 100644
--- a/Main/System/InternalAffairs/GoldRushManager.cs
+++ b/Main/System/InternalAffairs/GoldRushManager.cs
@@ -65,12 +65,12 @@
get
{
//绗崄涓暟鐢ㄤ簬瀛樺偍鏄惁寮�鍚嚜鍔ㄥ埛鏂帮紝鍏朵粬鏁扮敤浜庡瓨鍌ㄧ墿鍝佺瓑绾�
- var value = QuickSetting.Instance.GetQuickSettingValue<int>(QuickSettingType.AutoGoldRush, 10);
+ var value = QuickSetting.Instance.GetQuickSettingValue<int>(QuickSettingType.AutoGoldRush, 9);
return value == 0;
}
set
{
- QuickSetting.Instance.SetQuickSetting<int>(QuickSettingType.AutoGoldRush, Convert.ToInt32(!value), 10);
+ QuickSetting.Instance.SetQuickSetting<int>(QuickSettingType.AutoGoldRush, Convert.ToInt32(!value), 9);
QuickSetting.Instance.SendPackage();
}
diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index 1e90cf2..d486a3e 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/Main/System/Main/HomeWin.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using Cysharp.Threading.Tasks;
using DG.Tweening;
using UnityEngine;
using UnityEngine.UI;
@@ -172,8 +173,7 @@
// var battleWin = UIManager.Instance.OpenWindow<BattleWin>();
// battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
- if (!SoundPlayer.Instance.IsPlayBackGroundMuisic())
- SoundPlayer.Instance.PlayBackGroundMusic(38);
+ DelayPlayMusic().Forget();
}
@@ -204,6 +204,15 @@
officialTip.SetActive(OfficialRankManager.Instance.CanOfficialLVUP());
}
+ async UniTask DelayPlayMusic()
+ {
+ await UniTask.Delay(2000);
+ if (!SoundPlayer.Instance.IsPlayBackGroundMuisic())
+ SoundPlayer.Instance.PlayBackGroundMusic(38);
+ }
+
+
+
private void OnClickEnterBoss()
{
// BattleField battleField = BattleManager.Instance.GetBattleFieldByMapID(2); //BOSS鎴樻枟
diff --git a/Main/System/NewBieGuidance/NewBieCenter.cs b/Main/System/NewBieGuidance/NewBieCenter.cs
index 5df85e1..a862717 100644
--- a/Main/System/NewBieGuidance/NewBieCenter.cs
+++ b/Main/System/NewBieGuidance/NewBieCenter.cs
@@ -50,6 +50,7 @@
UIManager.Instance.OnOpenWindow += OnOpenWindow;
UIManager.Instance.OnCloseWindow += OnCloseWindow;
OfficialRankManager.Instance.OnOfficialCanLVUpEvent += OnOfficialCanLVUpEvent;
+ PackManager.Instance.DeleteItemEvent += DeleteDropItem;
}
public override void Release()
@@ -61,6 +62,7 @@
UIManager.Instance.OnOpenWindow -= OnOpenWindow;
UIManager.Instance.OnCloseWindow -= OnCloseWindow;
OfficialRankManager.Instance.OnOfficialCanLVUpEvent -= OnOfficialCanLVUpEvent;
+ PackManager.Instance.DeleteItemEvent -= DeleteDropItem;
}
void OnOfficialCanLVUpEvent()
@@ -100,6 +102,17 @@
}
}
+ void DeleteDropItem(PackType packType, string guid, int itemID, int index, int clearType)
+ {
+ if (packType != PackType.DropItem)
+ return;
+
+ if (TryStartNewBieGuides(waitGuideIDs))
+ {
+ Debug.Log("鎵ц绛夊緟涓殑寮曞" + JsonMapper.ToJson(waitGuideIDs));
+ }
+ }
+
void OnTaskUpdateEvent()
{
var guides = GuideConfig.GetGuideListByType((int)GuideTriggerType.MainLineQuestCanDo);
diff --git a/Main/System/Settlement/BattleSettlementManager.cs b/Main/System/Settlement/BattleSettlementManager.cs
index 5c8a741..6f29276 100644
--- a/Main/System/Settlement/BattleSettlementManager.cs
+++ b/Main/System/Settlement/BattleSettlementManager.cs
@@ -91,7 +91,10 @@
break;
}
- SoundPlayer.Instance.PlayUIAudio(57);
+ if (isWin)
+ {
+ SoundPlayer.Instance.PlayUIAudio(57);
+ }
}
//"Msg":{"itemInfo":[{"ItemID":5,"Count":2},{"ItemID":3,"Count":40}],"winFaction":1,"statInfo":{"1":{"1":{"1":{"NPCID":0,"DefHurt":727,"CureHP":0,"AtkHurt":1891,"ObjID":1,"HeroID":530004},"3":{"NPCID":0,"DefHurt":483,"CureHP":1511,"AtkHurt":782,"ObjID":6,"HeroID":520001},"2":{"NPCID":0,"DefHurt":953,"CureHP":0,"AtkHurt":1712,"ObjID":5,"HeroID":510003}}},"2":{"1":{"1":{"NPCID":10101091,"DefHurt":638,"CureHP":0,"AtkHurt":140,"ObjID":2,"HeroID":610001},"3":{"NPCID":10101092,"DefHurt":625,"CureHP":0,"AtkHurt":126,"ObjID":3,"HeroID":610001},"5":{"NPCID":10101093,"DefHurt":3122,"CureHP":0,"AtkHurt":1897,"ObjID":4,"HeroID":510003}}}}}
--
Gitblit v1.8.0