From fc714208ff3a320c3bb52bddd5ea3d91f647a206 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 16 四月 2019 15:18:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/HazyRegion/HazyRegionIncidentBehaviour.cs | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/System/HazyRegion/HazyRegionIncidentBehaviour.cs b/System/HazyRegion/HazyRegionIncidentBehaviour.cs
index f23c4d5..245fefd 100644
--- a/System/HazyRegion/HazyRegionIncidentBehaviour.cs
+++ b/System/HazyRegion/HazyRegionIncidentBehaviour.cs
@@ -69,7 +69,7 @@
void DisplayBase()
{
var config = HazyRegionConfig.Get(incidentId);
- m_DepletionPoint.text = string.Format("娑堣�椾綋鍔涳細 ", config.point);
+ m_DepletionPoint.text = Language.Get("HazyRegionPoint", config.point);
m_IncidentTitle.text = config.name;
m_Icon.SetSprite(config.PortraitID);
m_Icon.SetNativeSize();
@@ -99,13 +99,34 @@
void DisplayBoss()
{
- m_ContainerBoss.gameObject.SetActive(incidentType == HazyRegionIncidentType.Boss);
+ m_ContainerBoss.gameObject.SetActive(incidentType == HazyRegionIncidentType.DemonKing);
var config = HazyRegionConfig.Get(incidentId);
- if (incidentType == HazyRegionIncidentType.Boss)
+ if (incidentType == HazyRegionIncidentType.DemonKing)
{
var npcConfig = NPCConfig.Get(config.npcId);
m_BossName.text = npcConfig.charName;
}
+
+ DisplayBossState();
+ }
+
+ void DisplayBossState()
+ {
+ if (incidentType == HazyRegionIncidentType.DemonKing)
+ {
+ if (model.InFakeHazyRegion)
+ {
+ var fighting = ClientDungeonStageUtility.isClientDungeon;
+ m_PlayerCount.gameObject.SetActive(true);
+ m_RebornTime.gameObject.SetActive(false);
+ m_PlayerCount.text = Language.Get("HazyDemonKingPlayerCount", fighting ? 1 : 0);
+ }
+ else
+ {
+ m_PlayerCount.gameObject.SetActive(false);
+ m_RebornTime.gameObject.SetActive(false);
+ }
+ }
}
void DisplayState()
--
Gitblit v1.8.0