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

client_Zxw

2018-12-13 5606dfb7dcd2f230e9fe09db2715fe71f7ad72f0

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

 System/CrossServerOneVsOne/CrossServerArenaWin.cs

@@ -8,13 +8,13 @@
    public class CrossServerArenaWin : Window

    {

        [SerializeField] Button matchBtn;

        [SerializeField] Image matchBtn_Img;

        [SerializeField] Text matchBtn_Text;

        [SerializeField] Button dayAwardBtn;

        [SerializeField] Text winRateText;

        [SerializeField] Text winNumText;

        [SerializeField] Text failNumText;

        [SerializeField] Text sumNumText;

        [SerializeField] Text reaminNumText;

        [SerializeField] Text dayScoreText;

        [SerializeField] Text seasonTimeText;

        [SerializeField] Text openTimeText;



        CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }

@@ -25,7 +25,6 @@
        }

        protected override void AddListeners()

        {

            matchBtn.AddListener(ClickMatch);

            dayAwardBtn.AddListener(ClickDayAward);

        }



@@ -53,22 +52,46 @@
        {

            UpdateMatchInfo();

            UpdatePKInfo();

            UpdateActivityState();

        }



        private void UpdateMatchInfo()

        {

            dayScoreText.text = StringUtility.Contact(crossServerModel.dayGetScore,"/",crossServerModel.dayMaxScore);

            reaminNumText.text = StringUtility.Contact(crossServerModel.dayMatchNum,"/",crossServerModel.dayMaxMatchNum);

        }



        private void UpdatePKInfo()

        {

            winRateText.text = StringUtility.Contact(crossServerModel.curWinRate,"%");

            winNumText.text = crossServerModel.curWinNum.ToString();

            failNumText.text = crossServerModel.curFailNum.ToString();

            sumNumText.text = crossServerModel.sumBattleNum.ToString();

        }



        private void UpdateActivityState()

        {

            bool isInTime = false;

            bool isOpen = false;

            matchBtn.RemoveAllListeners();

            if(!isInTime)

            {

                matchBtn_Text.text = "即将开启";

                matchBtn_Img.material = MaterialUtility.GetDefaultSpriteGrayMaterial();

            }

            else

            {

                matchBtn_Text.text = "开始匹配";

                if(isOpen)

                {

                    matchBtn_Img.material = MaterialUtility.GetUIDefaultGraphicMaterial();

                    matchBtn.AddListener(ClickMatch);

                }

                else

                {

                    matchBtn_Img.material = MaterialUtility.GetDefaultSpriteGrayMaterial();

                }

            }



        }



        private void ClickDayAward()

        {

            WindowCenter.Instance.Open<CrossServerDayAwardsWin>();


 System/CrossServerOneVsOne/CrossServerModel.cs

@@ -45,7 +45,6 @@


        #region 表数据

        public int dayMaxMatchNum { get; private set; } //匹配次数上限

        public int dayMaxScore { get; private set; } //今日积分上限

        public List<AwardType> dayAwardTypelist { get; private set; }

        private void ParseFuncConfig()

        {

@@ -142,11 +141,11 @@
        public int curRank { get; private set; } //当前段位

        public int curScore { get; private set; } //当前积分

        public int curWinRate { get; private set; } //当前胜率

        public int curWinNum { get; private set; } //当前胜场次数

        public int curFailNum { get; private set; } //当前失败次数

        public int sumBattleNum { get; private set; } //对战总场数

        public int dayMatchNum { get; private set; } //今日匹配次数

        public int dayGetScore { get; private set; } //今日获取积分

        #endregion



        #region 红点

        #endregion



    }