From a67f0498e0adebb0b8de3a055223da6666819fe6 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 24 十二月 2018 15:26:01 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server
---
System/CrossServerOneVsOne/CrossServerOneVsOneRoundWin.cs | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneRoundWin.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneRoundWin.cs
index 4e255f1..7d13ed9 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneRoundWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneRoundWin.cs
@@ -6,9 +6,11 @@
[XLua.Hotfix]
public class CrossServerOneVsOneRoundWin : Window
{
- [SerializeField] Text roundText;
- [SerializeField] Text resultText;
+ [SerializeField] Image roundImg;
+ [SerializeField] GameObject victoryObj;
+ [SerializeField] GameObject failureObj;
[SerializeField] Text infoText;
+ [SerializeField] Text coolTimeText;
CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
@@ -39,7 +41,7 @@
}
protected override void OnAfterClose()
{
-
+
}
#endregion
@@ -47,15 +49,27 @@
{
int roundNum = dungeonModel.mission.roundNum;
coolTime = dungeonModel.mission.prepareTime / 1000;
- string roundStr = Language.Get(StringUtility.Contact("Num_CHS_", roundNum));
- roundText.text = Language.Get("CrossServer112", roundStr);
- resultText.text = IsWin() ? Language.Get("CrossServer113") : Language.Get("CrossServer114");
+ bool isWin = IsWin();
+ victoryObj.SetActive(isWin);
+ failureObj.SetActive(!isWin);
UpdateCoolTime();
+ switch (roundNum)
+ {
+ case 1:
+ roundImg.SetSprite("CrossServer_25");
+ break;
+ case 2:
+ roundImg.SetSprite("CrossServer_23");
+ break;
+ case 3:
+ roundImg.SetSprite("CrossServer_24");
+ break;
+ }
}
private void UpdateCoolTime()
{
- infoText.text = Language.Get("CrossServer115",coolTime);
+ coolTimeText.text = coolTime.ToString();
coolTime -= 1;
if(coolTime <= 0)
{
--
Gitblit v1.8.0