Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts in...

client_Zxw

2018-12-24 a67f0498e0adebb0b8de3a055223da6666819fe6

Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server

 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -113,7 +113,15 @@


            if(mission.isStart == 1)

            {

                
                if(WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())

                {

                    WindowCenter.Instance.CloseImmediately<CrossServerOneVsOneRoundWin>();

                }



                if (!WindowCenter.Instance.IsOpen<CrossServerOneVsOneStartFightWin>())

                {

                    WindowCenter.Instance.Open<CrossServerOneVsOneStartFightWin>();

                }

            }

        }




 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)

            {


 System/CrossServerOneVsOne/CrossServerOneVsOneStartFightWin.cs

New file
@@ -0,0 +1,63 @@
using UnityEngine;

using UnityEngine.UI;

using System.Collections;



namespace Snxxz.UI

{

    public class CrossServerOneVsOneStartFightWin : Window

    {

        [SerializeField] Image roundImg;

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        #region Built-in

        protected override void BindController()

        {



        }

        protected override void AddListeners()

        {

          
        }



        protected override void OnPreOpen()

        {

            SetDisplay();

        }



        protected override void OnAfterOpen()

        {

            StartCoroutine(DelayCloseWin());

        }

        protected override void OnPreClose()

        {

            StopAllCoroutines();

        }

        protected override void OnAfterClose()

        {



        }

        #endregion



        private void SetDisplay()

        {

            int roundNum = dungeonModel.mission.roundNum;

            switch(roundNum)

            {

                case 1:

                    roundImg.SetSprite("CrossServer_30");

                    break;

                case 2:

                    roundImg.SetSprite("CrossServer_28");

                    break;

                case 3:

                    roundImg.SetSprite("CrossServer_29");

                    break;

            }

        }



        private IEnumerator DelayCloseWin()

        {

            yield return new WaitForSeconds(1.5f);

            CloseImmediately();

        }

    }

}


 System/CrossServerOneVsOne/CrossServerOneVsOneStartFightWin.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 878d593759cb02a49ada1862ca870d4b
timeCreated: 1545634241
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs

@@ -74,8 +74,8 @@

            if (beginTime > DateTime.Now)
            {
                var surplusTime =Mathf.Clamp((int)(beginTime - DateTime.Now).TotalSeconds,0,int.MaxValue);
                m_CoolDown.text = surplusTime.ToString();
                var surplusTime = Mathf.Clamp((int)(beginTime - DateTime.Now).TotalSeconds,0,int.MaxValue);
                m_CoolDown.text = Language.Get("CrossServer120", surplusTime);
                if (!m_CoolDownContainer.gameObject.activeInHierarchy)
                {
                    m_CoolDownContainer.gameObject.SetActive(true);