From eba3ceed542bf12a7ec394bc28c0bc3e14c93aaa Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 22 三月 2019 10:46:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Realm/RealmModel.cs | 24 ++++++++++++++++++++++++
System/Realm/RealmPoolBehaviour.cs | 4 ++++
System/Realm/RealmAnimationBehaviour.cs | 2 ++
3 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/System/Realm/RealmAnimationBehaviour.cs b/System/Realm/RealmAnimationBehaviour.cs
index bd58e09..e6ca44a 100644
--- a/System/Realm/RealmAnimationBehaviour.cs
+++ b/System/Realm/RealmAnimationBehaviour.cs
@@ -71,6 +71,7 @@
var level = realms[i] + 1;
if (realmLevel >= level)
{
+ m_EffectLines[i].effect = model.GetRealmLineEffect(realms[i]);
m_EffectLines[i].Play();
var animator = m_EffectLines[i].target.GetAnimator();
animator.Play("idle", 0, 0);
@@ -199,6 +200,7 @@
IEnumerator Co_StartLine(int index)
{
+ m_EffectLines[index].effect = model.GetRealmLineEffect(model.displayRealmLevel - 1);
m_EffectLines[index].Play();
var animator = m_EffectLines[index].target.GetAnimator();
animator.Play("open", 0, 0);
diff --git a/System/Realm/RealmModel.cs b/System/Realm/RealmModel.cs
index 77c8d28..14e345e 100644
--- a/System/Realm/RealmModel.cs
+++ b/System/Realm/RealmModel.cs
@@ -14,6 +14,7 @@
Dictionary<int, Dictionary<int, int[]>> m_RealmPreviewEquips = new Dictionary<int, Dictionary<int, int[]>>();
List<List<int>> m_RealmStages = new List<List<int>>();
public int realmMaxLevel { get; private set; }
+ public int realmPoolOpenLevel { get; private set; }
public bool isBossPass { get; private set; }
public int realmExpTime { get; private set; }
public long startExp { get; private set; }
@@ -174,6 +175,11 @@
}
m_RealmPreviewEquips.Add(config.Lv, dict);
}
+
+ if (realmPoolOpenLevel == 0 && config.expRate != 0)
+ {
+ realmPoolOpenLevel = config.Lv;
+ }
}
var funcConfig = FuncConfigConfig.Get("RealmExpTime");
@@ -317,6 +323,24 @@
return 7039;
}
+ public int GetRealmLineEffect(int realmLevel)
+ {
+ var config = RealmConfig.Get(realmLevel);
+ if (config != null)
+ {
+ switch (config.Quality)
+ {
+ case 1: return 7034;
+ case 2: return 7059;
+ case 3: return 7060;
+ case 4: return 7061;
+ case 5: return 7062;
+ case 6: return 7063;
+ }
+ }
+ return 7034;
+ }
+
public bool GetBossEffectShow(int realmLevel)
{
var playerId = PlayerDatas.Instance.baseData.PlayerID;
diff --git a/System/Realm/RealmPoolBehaviour.cs b/System/Realm/RealmPoolBehaviour.cs
index adcf139..1c555aa 100644
--- a/System/Realm/RealmPoolBehaviour.cs
+++ b/System/Realm/RealmPoolBehaviour.cs
@@ -62,6 +62,10 @@
{
WindowCenter.Instance.Open<RealmTakeExpWin>();
}
+ else
+ {
+ SysNotifyMgr.Instance.ShowTip("RealmPoolOpenLimit", UIHelper.GetRealmName(model.realmPoolOpenLevel));
+ }
}
private void PerSecond()
--
Gitblit v1.8.0