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

client_Wu Xijin

2018-12-21 77d885bd388227d0dd3a1b4f4009bcb9a90100a3

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

 System/CrossServerOneVsOne/CrossServerModel.cs

@@ -331,7 +331,49 @@
        #endregion



        #region 红点

        #endregion

        public const int CrossArenaRedKey = 2130101;

        public Redpoint crossArenaRedpoint = new Redpoint(CrossArenaRedKey);

        public const int CrossDayAwardsRedKey = 21301011;

        public Redpoint crossDayAwardsRedpoint = new Redpoint(CrossArenaRedKey,CrossDayAwardsRedKey);

        public const int CrossMatchRedKey = 21301012;

        public Redpoint crossMatchRedpoint = new Redpoint(CrossArenaRedKey, CrossMatchRedKey);

        public void UpdateCrossArenaRedpoint()

        {

            var playerInfo = CrossServerPlayerInfo.Instance;

            var pkSeason = CrossServerPKSeason.Instance;



            if(pkSeason.InDay(TimeUtility.ServerNow) 
                && pkSeason.InOpenTime()

                && playerInfo.GetDayRemainNum() > 0)

            {

                crossMatchRedpoint.state = RedPointState.Simple;

            }

            else

            {

                crossMatchRedpoint.state = RedPointState.None;

            }



         
            bool isReceive = false;

            for(int i = 0; i < dayAwardTypelist.Count; i++)

            {

                var awardType = dayAwardTypelist[i];

                if(awardType.progress == AwardType.CompleteProgress.Completed)

                {

                    isReceive = true;

                    break;

                }

            }



            if(isReceive)

            {

                crossDayAwardsRedpoint.state = RedPointState.Simple;

            }

            else

            {

                crossDayAwardsRedpoint.state = RedPointState.None;

            }

        }

        #endregion

    }

}


 System/CrossServerOneVsOne/CrossServerPKSeason.cs

@@ -31,7 +31,7 @@
        public event Action activityEndEvent;

        private bool inDateNotify = false;

        private bool stepDateNotify = false;

        public  const int dailyQuestId = 21;

        public  const int dailyQuestId = 31;

        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }



        public CrossServerPKSeason()


 System/CrossServerOneVsOne/CrossServerSettlementWin.cs

@@ -15,21 +15,27 @@
    {
        [SerializeField] GameObject m_BackFailure;
        [SerializeField] GameObject m_BackWin;
        [SerializeField] Transform m_ContainerResult;
        [SerializeField] Button m_DropOutBtn;
        [SerializeField] Text m_DropOutBtnText;
        [SerializeField] Text m_DropOutBtnText;



        [SerializeField] Transform m_Normal;
        [SerializeField] Transform m_BrokenLine;
        #region Built-in
        CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }
        CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }

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

        float timer = 0f;

        protected override void BindController()
        {
        }

        protected override void AddListeners()
        {
            m_DropOutBtn.AddListener(ExitDungeon);
        }

        protected override void OnPreOpen()
        {
        {

            timer = 0f;
            int WinnerID = crossServerModel.pkResultInfo.WinnerID;
            int playerID =(int)PlayerDatas.Instance.baseData.PlayerID;
            if (WinnerID == playerID)

@@ -54,9 +60,26 @@

        protected override void OnAfterClose()
        {
        }
        }

        protected override void LateUpdate()

        {

            base.LateUpdate();



            timer -= Time.deltaTime;

            if (timer < 0f)

            {

                timer = 1f;

                var endTime = model.GetCoolDownEndTime(DungeonCoolDownType.LeaveMap);

                var seconds = (endTime - DateTime.Now).TotalSeconds;

                m_DropOutBtnText.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp((int)seconds, 0, int.MaxValue));

            }

        }

        #endregion
   
        private void ExitDungeon()

        {

            model.ExitCurrentDungeon();

            CloseClick();

        }
    }

}

 System/CrossServerOneVsOne/FightingPKWin.cs

New file
@@ -0,0 +1,49 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Friday, December 21, 2018
//--------------------------------------------------------

using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;

namespace Snxxz.UI {

    public class FightingPKWin : Window
    {

        #region Built-in
        protected override void BindController()
        {
        }

        protected override void AddListeners()
        {
        }

        protected override void OnPreOpen()
        {
        }

        protected override void OnAfterOpen()
        {
        }

        protected override void OnPreClose()
        {
        }

        protected override void OnAfterClose()
        {
        }
        #endregion
   
    }

}





 System/CrossServerOneVsOne/FightingPKWin.cs.meta

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