From 5d75734ef21459105f89bc8a0d4d235c8c137e62 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 24 十月 2025 17:45:43 +0800
Subject: [PATCH] 0312 无蒙版点击不需要判断镂空；防范断线重连报错
---
Main/System/Equip/EquipModel.cs | 1 +
Main/System/Main/AutoFightModel.cs | 4 ++--
Main/System/Equip/ItemsOnFloor.cs | 3 +++
Main/System/Main/MainWin.cs | 17 ++++++++++++-----
Main/System/NewBieGuidance/NewBieWin.cs | 4 ++++
5 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index 14c7e7f..97ec59d 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -31,6 +31,7 @@
{
DTCA814_tagMCMakeItemAnswer.MakeItemAnswerEvent += OnEquipResult;
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += BeforePlayerDataInitialize;
+ EventBroadcast.Instance.RemoveListener<string, BattleDrops, Action>(EventName.BATTLE_DROP_ITEMS, OnDropEvent);
EventBroadcast.Instance.AddListener<string, BattleDrops, Action>(EventName.BATTLE_DROP_ITEMS, OnDropEvent);
ParseConfig();
}
diff --git a/Main/System/Equip/ItemsOnFloor.cs b/Main/System/Equip/ItemsOnFloor.cs
index feb61a4..7326eea 100644
--- a/Main/System/Equip/ItemsOnFloor.cs
+++ b/Main/System/Equip/ItemsOnFloor.cs
@@ -40,6 +40,9 @@
//涓荤晫闈㈠垏鎹㈡ā寮忚Е鍙�
private void OnEnable()
{
+ //bug璁板綍锛氬啀闃茶寖涓�娆★紝鐞嗚涓婁笉鍙兘涓ゆ瑙﹀彂OnEnable鏈熼棿 娌℃湁瑙﹀彂OnDisable
+ EquipModel.Instance.OnItemDropEvent -= NotifyPlayItemDrop;
+ PackManager.Instance.DeleteItemEvent -= DeleteDropItem;
//涓荤晫闈㈡墦寮�鍜屾樉闅愰兘瑕佸埛鏂�
Display(true, EquipModel.Instance.lastDropIndexs);
EquipModel.Instance.OnItemDropEvent += NotifyPlayItemDrop;
diff --git a/Main/System/Main/AutoFightModel.cs b/Main/System/Main/AutoFightModel.cs
index d538613..7507453 100644
--- a/Main/System/Main/AutoFightModel.cs
+++ b/Main/System/Main/AutoFightModel.cs
@@ -95,7 +95,7 @@
ParseConfig();
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += BeforePlayerInit;
BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;
-
+ EventBroadcast.Instance.RemoveListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnSkillCast);
EventBroadcast.Instance.AddListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnSkillCast);
}
@@ -104,7 +104,7 @@
{
BattleManager.Instance.onBattleFieldCreate -= OnCreateBattleField;
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= BeforePlayerInit;
-
+ EventBroadcast.Instance.RemoveListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnSkillCast);
}
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 429a2d9..c6b6bd0 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -327,8 +327,12 @@
cdTween.SetStartState();
cdTween.Play(() =>
{
- AutoFightModel.Instance.fightingHeroSkinID = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid).SkinID;
- fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
+ var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
+ if (tmpHero != null)
+ {
+ AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
+ fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
+ }
});
fightHeroScale.SetStartState();
fightHeroScale.Play();
@@ -343,10 +347,13 @@
if (AutoFightModel.Instance.fightingHeroSkinID == 0)
{
- AutoFightModel.Instance.fightingHeroSkinID = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid).SkinID;
+ var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
+ if (tmpHero != null)
+ {
+ AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
+ fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
+ }
}
-
- fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
}
void OnSkillCast(bool isfighting)
diff --git a/Main/System/NewBieGuidance/NewBieWin.cs b/Main/System/NewBieGuidance/NewBieWin.cs
index f94f6ea..a76c333 100644
--- a/Main/System/NewBieGuidance/NewBieWin.cs
+++ b/Main/System/NewBieGuidance/NewBieWin.cs
@@ -294,6 +294,10 @@
{
return;
}
+ if (stepConfig.clickCompleteNoMask)
+ {
+ return;
+ }
if (stepConfig.clickAnyWhereComplete || m_NewBieMask.mask.IsInCirleArea(Input.mousePosition, CameraManager.uiCamera))
{
if (m_ClickTarget == null)
--
Gitblit v1.8.0