From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/ViewNPC/ViewNPCManager.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Main/System/ViewNPC/ViewNPCManager.cs b/Main/System/ViewNPC/ViewNPCManager.cs
index f5a08d8..b04d735 100644
--- a/Main/System/ViewNPC/ViewNPCManager.cs
+++ b/Main/System/ViewNPC/ViewNPCManager.cs
@@ -68,7 +68,11 @@
{
case BattleConst.ArenaBattleField:
int playerId = (int)ArenaManager.Instance.atkPlayerId;
- OtherPlayerDetailManager.Instance.ViewPlayerDetail(playerId, 0, (int)ViewPlayerType.viewArenaBattleEnemyHero, (int)BattlePreSetType.Arena);
+ OtherPlayerDetailManager.Instance.ViewPlayerDetail(playerId, 0, (int)ViewPlayerType.viewPVPBattleEnemyHero, (int)BattlePreSetType.Arena);
+ break;
+ case BattleConst.QYBattleField:
+ playerId = (int)QunyingManager.Instance.atkPlayerId;
+ OtherPlayerDetailManager.Instance.ViewPlayerDetail(playerId, 0, (int)ViewPlayerType.viewPVPBattleEnemyHero, (int)BattlePreSetType.Qunying);
break;
}
return;
@@ -90,13 +94,13 @@
{
switch (viewPlayerType)
{
- case (int)ViewPlayerType.viewArenaBattleEnemyHero:
- ViewArenaBattleEnemyHero(playerID);
+ case (int)ViewPlayerType.viewPVPBattleEnemyHero:
+ ViewPVPBattleEnemyHero(playerID);
break;
}
}
- private void ViewArenaBattleEnemyHero(int playerID)
+ private void ViewPVPBattleEnemyHero(int playerID)
{
int presetID = otherPlayerManager.GetFuncPresetID(playerID, OtherPlayerDetailManager.Instance.viewPreSetType, (int)FuncPresetType.Global);
var heroList = otherPlayerManager.GetHeroDataSortList(playerID, presetID);
--
Gitblit v1.8.0