From a9330418549ede9871b90124641820b82c1ae16c Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 22 一月 2019 19:40:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Realm/RealmPropertyUpWin.cs | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/System/Realm/RealmPropertyUpWin.cs b/System/Realm/RealmPropertyUpWin.cs
index 45bfd1a..4fac64c 100644
--- a/System/Realm/RealmPropertyUpWin.cs
+++ b/System/Realm/RealmPropertyUpWin.cs
@@ -30,6 +30,7 @@
[SerializeField] SkillBehaviour[] m_Skills;
[SerializeField] RectTransform m_ContainerNewGotSkill;
[SerializeField] SkillBehaviour m_NewGotSkill;
+ [SerializeField] FrameEffect m_NewGotSkillFrame;
[SerializeField] RectTransform m_NewGotSkillPoint;
[SerializeField] RectTransform m_ContainerRealm;
[SerializeField] RectTransform m_ContainerRealmUp;
@@ -73,6 +74,7 @@
m_ContainerRealm.gameObject.SetActive(false);
m_ContainerTreasureSoul.gameObject.SetActive(false);
m_ContainerGodWeaponEffect.gameObject.SetActive(false);
+ m_NewGotSkillFrame.gameObject.SetActive(false);
m_DisplayAlphaTween.SetStartState();
flying = false;
startFly = false;
@@ -162,6 +164,10 @@
DisplayFightPower();
DisplayLv();
DisplayGodWeaponEffect();
+ DisplayNewGotSkill();
+ break;
+ case ActivateShow.ActivateFunc.JadeDynastySkill:
+ DisplayFightPower();
DisplayNewGotSkill();
break;
}
@@ -365,6 +371,15 @@
}
}
break;
+ case ActivateShow.ActivateFunc.JadeDynastySkill:
+ m_ContainerNewGotSkill.gameObject.SetActive(ActivateShow.skills.Count > 0);
+ if (ActivateShow.skills.Count == 0)
+ {
+ return;
+ }
+ m_NewGotSkill.DisplayNewGot(ActivateShow.skills[0]);
+ DisplaySkillFrame(ActivateShow.skills[0]);
+ break;
default:
{
m_ContainerNewGotSkill.gameObject.SetActive(ActivateShow.skills.Count > 0);
@@ -400,6 +415,18 @@
m_GodWeaponStage.text = Language.Get("MagicWin_9", config.Name, stage);
}
+ void DisplaySkillFrame(int skillId)
+ {
+ m_NewGotSkillFrame.gameObject.SetActive(true);
+ var model = ModelCenter.Instance.GetModel<JadeDynastySkillModel>();
+ Sprite[] sprites;
+ if (model.TryGetSkillFrames(skillId, out sprites))
+ {
+ var config = Config.Instance.Get<SkillFrameAnimationConfig>(skillId);
+ m_NewGotSkillFrame.SetSprites(sprites, (float)config.totalTime / 1000);
+ }
+ }
+
void PrepareFly(int _skillId)
{
ActivateShow.PrepareSkillFly();
--
Gitblit v1.8.0