From b81bc05d5cc11cf5d2fdf3292fbfb5676360df02 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 27 十二月 2018 11:18:33 +0800
Subject: [PATCH] 5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发
---
System/CrossServerOneVsOne/CrossServerSettlementWin.cs | 6 +++---
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0431_tagTimeTick.cs | 20 ++++++++++++++------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0431_tagTimeTick.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0431_tagTimeTick.cs
index 5ad290c..dbb107a 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0431_tagTimeTick.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0431_tagTimeTick.cs
@@ -3,15 +3,18 @@
using Snxxz.UI;
//04 31 倒计时#tagTimeTick
-public class DTC0431_tagTimeTick : DtcBasic {
- public override void Done(GameNetPackBasic vNetPack) {
+public class DTC0431_tagTimeTick : DtcBasic
+{
+ public override void Done(GameNetPackBasic vNetPack)
+ {
base.Done(vNetPack);
H0431_tagTimeTick vNetData = vNetPack as H0431_tagTimeTick;
var dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>();
- dungeonModel.UpdateCoolDown((DungeonCoolDownType)vNetData.Type,vNetData.Tick);
- if((DungeonCoolDownType)vNetData.Type == DungeonCoolDownType.WaitStart)
+ dungeonModel.UpdateCoolDown((DungeonCoolDownType)vNetData.Type, vNetData.Tick);
+ var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
+
+ if ((DungeonCoolDownType)vNetData.Type == DungeonCoolDownType.WaitStart)
{
- var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
switch (mapId)
{
case HeavenBattleModel.HEAVEBATTLE_MAPID:
@@ -24,7 +27,6 @@
}
break;
case CrossServerOneVsOneModel.CrossServerDataMapId:
- WindowCenter.Instance.CloseImmediately<DungeonBeginCoolDownWin>();
WindowCenter.Instance.CloseImmediately<DungeonEndCoolDownWin>();
if (!WindowCenter.Instance.IsOpen<BattlePrepareCoolDownWin>())
{
@@ -33,5 +35,11 @@
break;
}
}
+ switch (mapId)
+ {
+ case CrossServerOneVsOneModel.CrossServerDataMapId:
+ WindowCenter.Instance.CloseImmediately<DungeonBeginCoolDownWin>();
+ break;
+ }
}
}
diff --git a/System/CrossServerOneVsOne/CrossServerSettlementWin.cs b/System/CrossServerOneVsOne/CrossServerSettlementWin.cs
index eb6d536..7944b9f 100644
--- a/System/CrossServerOneVsOne/CrossServerSettlementWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerSettlementWin.cs
@@ -191,7 +191,7 @@
m_SegmentTxt2.text = config2.Name;
}
- m_SorceText.text = crossServerModel.pkResultInfo.CurScore + "(" + crossServerModel.pkResultInfo.AddScore + ")";
+ m_SorceText.text = crossServerModel.pkResultInfo.CurScore + "(+" + crossServerModel.pkResultInfo.AddScore + ")";
}
private void SetBrokenLine()
@@ -222,13 +222,13 @@
m_Segment_Txt1.text = config1.Name;
var config2 = Config.Instance.Get<CrossServerArenaConfig>(crossServerModel.pkResultInfo.DanLV);
m_Segment_Txt2.text = config2.Name;
- m_SorceText.text = crossServerModel.pkResultInfo.CurScore + "(" + crossServerModel.pkResultInfo.AddScore + ")";
+ m_SorceText.text = crossServerModel.pkResultInfo.CurScore + "(+" + crossServerModel.pkResultInfo.AddScore + ")";
}
else
{
m_SegmentObj1.SetActive(false);
}
- m_Sorce_Txt.text = crossServerModel.pkResultInfo.CurScore + "(" + crossServerModel.pkResultInfo.AddScore + ")";
+ m_Sorce_Txt.text = crossServerModel.pkResultInfo.CurScore + "(+" + crossServerModel.pkResultInfo.AddScore + ")";
}
}
--
Gitblit v1.8.0