From c9cd6e462d9439e9a7734a02976380f74e9af596 Mon Sep 17 00:00:00 2001
From: QD_LCJ <461730578@qq.com>
Date: 星期五, 10 八月 2018 10:36:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/ConfigManager.cs | 2 +-
UI/Common/BossLifeBar.cs | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index 7778f95..08d4ec8 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -13,7 +13,7 @@
public static string CustomIV = "4vHKRj3yfzU=";
public static string CustomKey = "xhVs6DRXLfUGxw+AhtfQdpQGoa+8SA9d";
- protected string[] lineStep = new string[] { "\r\n" }; //琛岄棿闅斾綋
+ protected string[] lineStep = new string[] { "\r\n","\n" }; //琛岄棿闅斾綋
protected string[] rowStep = new string[] { "\t" }; //娈甸棿闅斾綋
bool isPlaying = true;
diff --git a/UI/Common/BossLifeBar.cs b/UI/Common/BossLifeBar.cs
index 98f7f6e..6d20083 100644
--- a/UI/Common/BossLifeBar.cs
+++ b/UI/Common/BossLifeBar.cs
@@ -24,6 +24,7 @@
[SerializeField] Slider m_SliderForeground;
[SerializeField] Text m_Surplus;
+ [SerializeField] Image m_Realm;
[SerializeField] Text m_BossName;
[SerializeField] Text m_BossLevel;
@@ -73,6 +74,16 @@
m_BossName.text = npcConfig.charName;
m_BossLevel.text = _level.ToString();
m_BossIcon.SetSprite(npcConfig.HeadPortrait);
+ if (npcConfig.Realm > 0)
+ {
+ m_Realm.gameObject.SetActive(true);
+ var realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(npcConfig.Realm);
+ m_Realm.SetSprite(realmConfig.Img);
+ }
+ else
+ {
+ m_Realm.gameObject.SetActive(false);
+ }
surplusSegments = -1;
totalSegments = npcConfig.LifeBarCount;
--
Gitblit v1.8.0