From 4cbd2c727f93280bdf181ea223873c7580537155 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 八月 2018 10:00:06 +0800
Subject: [PATCH] Merge branch 'master' into DogzDungeon
---
System/Realm/RealmPropertyUpWin.cs | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/System/Realm/RealmPropertyUpWin.cs b/System/Realm/RealmPropertyUpWin.cs
index 4a427ad..061620f 100644
--- a/System/Realm/RealmPropertyUpWin.cs
+++ b/System/Realm/RealmPropertyUpWin.cs
@@ -39,6 +39,10 @@
[SerializeField] RectTransform m_ContainerNewGotFly;
+ [SerializeField] RectTransform m_ContainerTreasureSoul;
+ [SerializeField] Image m_TreasureSoulIcon;
+ [SerializeField] Text m_TreasureSoulName;
+
FunctionUnlockFlyObject flyObject;
DateTime openTime = DateTime.Now;
@@ -55,12 +59,13 @@
protected override void OnPreOpen()
{
- m_ModelRawImage.gameObject.SetActive(true);
+ m_ModelRawImage.gameObject.SetActive(false);
m_ContainerSkill.gameObject.SetActive(false);
m_ContainerProperty.gameObject.SetActive(false);
m_ContainerLv.gameObject.SetActive(false);
m_ContainerNewGotSkill.gameObject.SetActive(false);
m_ContainerRealm.gameObject.SetActive(false);
+ m_ContainerTreasureSoul.gameObject.SetActive(false);
m_DisplayAlphaTween.SetStartState();
flying = false;
startFly = false;
@@ -141,6 +146,11 @@
DisplayNewGotSkill();
}
break;
+ case ActivateShow.ActivateFunc.TreasureSoul:
+ DisplayTreasureSoul();
+ DisplayFightPower();
+ DisplayProperty();
+ break;
}
}
@@ -184,6 +194,7 @@
m_Properties[i].gameObject.SetActive(true);
switch (ActivateShow.activateType)
{
+ case ActivateShow.ActivateFunc.TreasureSoul:
case ActivateShow.ActivateFunc.Realm:
m_Properties[i].Display(ActivateShow.propertyCompares[i].key
, ActivateShow.propertyCompares[i].beforeValue, ActivateShow.propertyCompares[i].currentValue);
@@ -235,10 +246,12 @@
switch (ActivateShow.activateType)
{
case ActivateShow.ActivateFunc.Realm:
+ m_ModelRawImage.gameObject.SetActive(true);
m_ModelRawImage.rectTransform.sizeDelta = new Vector2(680, 510);
UI3DModelExhibition.Instance.BeginShowPlayer(m_ModelRawImage, PlayerDatas.Instance.baseData.Job, RoleEquipType.retWing);
break;
case ActivateShow.ActivateFunc.GodWeapon:
+ m_ModelRawImage.gameObject.SetActive(true);
m_ModelRawImage.rectTransform.sizeDelta = new Vector2(600, 600);
UI3DTreasureExhibition.Instance.BeginShowGodWeapon(ActivateShow.godWeaponType, m_ModelRawImage);
break;
@@ -256,6 +269,17 @@
PrepareFly(ActivateShow.skills[0]);
}
+ void DisplayTreasureSoul()
+ {
+ var config = ConfigManager.Instance.GetTemplate<TreasurePrivilegeConfig>(ActivateShow.treasureSoulId);
+ if (config != null)
+ {
+ m_ContainerTreasureSoul.gameObject.SetActive(true);
+ m_TreasureSoulIcon.SetSprite(config.Icon);
+ m_TreasureSoulName.text = config.Name;
+ }
+ }
+
void PrepareFly(int _skillId)
{
ActivateShow.PrepareSkillFly();
--
Gitblit v1.8.0