From 45d3d873a7740886fa09f35c9fea2830f4563072 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 11:04:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/ViewNPC/ViewNPCManager.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Main/System/ViewNPC/ViewNPCManager.cs b/Main/System/ViewNPC/ViewNPCManager.cs
index 9460ebf..4a0e255 100644
--- a/Main/System/ViewNPC/ViewNPCManager.cs
+++ b/Main/System/ViewNPC/ViewNPCManager.cs
@@ -67,7 +67,7 @@
{
case BattleConst.ArenaBattleField:
int playerId = (int)ArenaManager.Instance.atkPlayerId;
- OtherPlayerDetailManager.Instance.ViewPlayerDetail(playerId, (int)ViewPlayerType.viewArenaBattleEnemyHero, (int)BattlePreSetType.Arena);
+ OtherPlayerDetailManager.Instance.ViewPlayerDetail(playerId, 0, (int)ViewPlayerType.viewArenaBattleEnemyHero, (int)BattlePreSetType.Arena);
break;
}
return;
@@ -123,8 +123,16 @@
});
}
+ public void TryOpenNPCDetailWin(uint mapID, uint funcLineID, uint npcID)
+ {
+ if (TryGetNPCAttr(mapID, funcLineID, npcID, out ViewNPCAttr attr))
+ {
+ OpenNPCDetailWin(attr);
+ }
+ }
+
public ViewNPCAttr viewNPCAttr;
- private void OpenNPCDetailWin(ViewNPCAttr viewNPCAttr)
+ public void OpenNPCDetailWin(ViewNPCAttr viewNPCAttr)
{
this.viewNPCAttr = viewNPCAttr;
if (!UIManager.Instance.IsOpened<OtherNPCDetailWin>())
--
Gitblit v1.8.0