From a6c09a8bdd8f0504e39787b067ebd3986282011d Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 24 六月 2019 16:31:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Loading/LoadingWin.cs | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/System/Loading/LoadingWin.cs b/System/Loading/LoadingWin.cs
index f789e9c..8a29e7b 100644
--- a/System/Loading/LoadingWin.cs
+++ b/System/Loading/LoadingWin.cs
@@ -153,7 +153,7 @@
break;
}
- DisplayBackGround(loadingType ,useDefautBackGround);
+ DisplayBackGround(loadingType, useDefautBackGround);
DisplayNameAndDescription();
}
@@ -197,14 +197,26 @@
var config = LoadingBackGroundConfig.Get(mapResConfig.DataID, mapResConfig.LineID);
var iconPool = new List<string>();
iconPool.AddRange(config.icons);
- switch (playerJob)
+
+ if (playerLevel > GeneralDefine.MasteryLoadingLevelLimit1)
{
- case 1:
- iconPool.AddRange(config.jobIntroduce1);
- break;
- case 2:
- iconPool.AddRange(config.jobIntroduce2);
- break;
+ switch (playerJob)
+ {
+ case 1:
+ iconPool.AddRange(config.jobIntroduce1);
+ if (playerLevel >= GeneralDefine.MasteryLoadingLevelLimit2)
+ {
+ iconPool.AddRange(config.jobIntroduce2);
+ }
+ break;
+ case 2:
+ if (playerLevel >= GeneralDefine.MasteryLoadingLevelLimit2)
+ {
+ iconPool.AddRange(config.jobIntroduce1);
+ }
+ iconPool.AddRange(config.jobIntroduce2);
+ break;
+ }
}
if (iconPool.Count > 0)
--
Gitblit v1.8.0