From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/ViewNPC/ViewNPCManager.cs | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Main/System/ViewNPC/ViewNPCManager.cs b/Main/System/ViewNPC/ViewNPCManager.cs
index 4a0e255..b04d735 100644
--- a/Main/System/ViewNPC/ViewNPCManager.cs
+++ b/Main/System/ViewNPC/ViewNPCManager.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
using LitJson;
+using Cysharp.Threading.Tasks;
public class ViewNPCManager : GameSystemManager<ViewNPCManager>
{
@@ -67,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;
@@ -89,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);
@@ -137,7 +142,7 @@
this.viewNPCAttr = viewNPCAttr;
if (!UIManager.Instance.IsOpened<OtherNPCDetailWin>())
{
- UIManager.Instance.OpenWindow<OtherNPCDetailWin>();
+ UIManager.Instance.OpenWindowAsync<OtherNPCDetailWin>().Forget();
}
}
--
Gitblit v1.8.0