From 7686cc4b9eb68b19211bb8bc6c3a444770cb8621 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 13 二月 2019 18:27:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into ConfigLoad
---
System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
index 699cb79..408599c 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
@@ -4,7 +4,6 @@
//--------------------------------------------------------
using System;
using System.Collections.Generic;
-using TableConfig;
using Snxxz.UI;
//璺ㄦ湇PK濂栧姳淇℃伅
[XLua.LuaCallCSharp]
@@ -86,7 +85,7 @@
{
GetSeasonAward();
GetSegmentReward();
- var config = Config.Instance.Get<FuncConfigConfig>("CrossServerIcon").Numerical1;
+ var config = FuncConfigConfig.Get("CrossServerIcon").Numerical1;
MianOpenLV = int.Parse(config);
}
@@ -176,7 +175,7 @@
{
SeasonAwardClass seasonAwardClass = new SeasonAwardClass();
seasonAwardClass.DanLv = _config.DanLV;
- var crossServerArena = Config.Instance.Get<CrossServerArenaConfig>(_config.DanLV);
+ var crossServerArena = CrossServerArenaConfig.Get(_config.DanLV);
if (crossServerArena != null)
{
seasonAwardClass.Name = crossServerArena.Name;
@@ -203,7 +202,7 @@
}
private void GetSegmentReward()
{
- var CrossRealmPKAward = Config.Instance.Get<FuncConfigConfig>("CrossRealmPKAward");
+ var CrossRealmPKAward = FuncConfigConfig.Get("CrossRealmPKAward");
ImpactRankModel.RankAwardItem _award = new ImpactRankModel.RankAwardItem();
var _jsonData = LitJson.JsonMapper.ToObject(CrossRealmPKAward.Numerical3);
foreach (string key in _jsonData.Keys)
--
Gitblit v1.8.0