From b8bcfae71df34b7b422dd59741e1e9c0358e4142 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 10 一月 2019 18:02:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerRewardModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
similarity index 97%
rename from System/CrossServerOneVsOne/CrossServerRewardModel.cs
rename to System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
index 1a02037..2e54106 100644
--- a/System/CrossServerOneVsOne/CrossServerRewardModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
@@ -55,7 +55,9 @@
DanLVAwardState = 3,
SeasonAwardState = 4,
}
-public class CrossServerRewardModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
+
+[XLua.Hotfix]
+public class CrossServerOneVsOneRewardModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }
public Dictionary<int, SeasonAwardClass> SegmentRewardDic = new Dictionary<int, SeasonAwardClass>();//娈典綅濂栧姳
@@ -146,7 +148,7 @@
private void UpdatePkResultEvent()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//鍓湰缁撶畻鐣岄潰
+ if (CrossServerUtility.IsCrossServer())//鍓湰缁撶畻鐣岄潰
{
if (WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())
{
@@ -281,11 +283,6 @@
c103.AwardType = (byte)_cross;
c103.AwardData = (byte)Index;
GameNetSystem.Instance.SendInfo(c103);
- }
-
- public static bool IsCrossServerOneVsOne()//鏄惁鍐嶈法鏈嶅壇鏈腑
- {
- return PlayerDatas.Instance.baseData.ExAttr5 == 1;
}
public void ViewCrossPKBillboard(int ZoneID, int SeasonID)//(璧涘尯锛岃禌瀛�) 鏌ョ湅璺ㄦ湇绔炴妧鍦鸿禌瀛ｆ帓琛屾
--
Gitblit v1.8.0