Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-12-28 6da355d7a62c0f6672cab2ccb1fe1acbf4ecd05e

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0113_tagServerHeart.cs

@@ -6,38 +6,24 @@


public class DTC0113_tagServerHeart : DtcBasic

{

    static bool m_BeginCheck = false;

    public static bool beginCheck {

        get { return m_BeginCheck; }

        set {

            m_BeginCheck = value;

        }

    }



    static DateTime m_LastHeartTime = DateTime.Now;

    public static bool overTime {

        get {

            return (m_BeginCheck && (DateTime.Now - m_LastHeartTime).TotalSeconds > 35);

        }

    }



    public override void Done(GameNetPackBasic vNetPack)

    {

        base.Done(vNetPack);

        m_BeginCheck = true;

        m_LastHeartTime = DateTime.Now;



        var sendInfo = new C0104_tagCOnlineReturn();

        sendInfo.Type = 0;



        if (!GameNetSystem.Instance.crossServerSocketConnected && vNetPack.socketType == GameNetSystem.SocketType.Main)

        switch (vNetPack.socketType)

        {

            GameNetSystem.Instance.SendInfo(sendInfo);// 在线回应

        }



        if (GameNetSystem.Instance.crossServerSocketConnected && vNetPack.socketType == GameNetSystem.SocketType.CrossSever)

        {

            GameNetSystem.Instance.SendToCrossServer(sendInfo);// 在线回应

            case GameNetSystem.SocketType.Main:

                GameNetSystem.Instance.SendInfo(sendInfo);// 在线回应

                break;

            case GameNetSystem.SocketType.CrossSever:

                GameNetSystem.Instance.SendToCrossServer(sendInfo);// 在线回应

                break;

            default:

                break;

        }

    }




 System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs

@@ -30,20 +30,26 @@
        CrossServerOneVsOneModel.AwardType awardType;

        float height = 0;

        bool isLineMove = false;



        private void Awake()

        {

            recieveBtn.AddListener(ClickRecieve);

            
        }



        public override void Display(object _data)

        {

            base.Display(_data);

            isLineMove = false;

            recieveBtn.AddListener(ClickRecieve);

            crossServerModel.UpdateDayAwardsEvent += UpdateDayAwards;

            awardType = (CrossServerOneVsOneModel.AwardType)_data;

            DisplayDayAward();

            crossServerModel.UpdateDayAwardsEvent -= UpdateDayAwards;

            crossServerModel.UpdateDayAwardsEvent += UpdateDayAwards;

        }



        public override void Dispose()

        {

            base.Dispose();

            recieveBtn.RemoveAllListeners();

            crossServerModel.UpdateDayAwardsEvent -= UpdateDayAwards;

        }




 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -85,6 +85,7 @@


        protected override void OnActived()

        {

            dungeonEndTime = dungeonModel.GetCoolDownEndTime(DungeonCoolDownType.TowerTake);

            Viewport1.gameObject.SetActive(false);
            Viewport2.gameObject.SetActive(false);

        }

 System/CrossServerOneVsOne/RankingWin.cs

@@ -197,14 +197,22 @@
        {

            int danlv = CrossServerOneVsOnePlayerInfo.Instance.DanLV;

            var config = Config.Instance.Get<CrossServerArenaConfig>(danlv);

            if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100)

            {

                m_TextMyRank.text = (crossServerRewardModel.MyRank + 1).ToString();

            }

            else

            if (CrossServerOneVsOnePKSeason.Instance.ZoneID != crossServerRewardModel.ZoneID)

            {

                m_TextMyRank.text = Language.Get("CrossServer122");

            }

            else

            {

                if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100)

                {

                    m_TextMyRank.text = (crossServerRewardModel.MyRank + 1).ToString();

                }

                else

                {

                    m_TextMyRank.text = Language.Get("CrossServer123");

                }

            }

            
        }

        private void SetZoneAndSeasonNum()


 System/CrossServerOneVsOne/SeasonRewardCell.cs

@@ -171,6 +171,7 @@
            if (config != null)

            {

                m_Segmenttext.text = config.Name;

                m_Segmenttext.color = UIHelper.GetDanLVColor(config.DanLV, true);

            }

            if (CrossServerOneVsOnePKSeason.Instance.SeasonState != 2)

            {


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -670,7 +670,7 @@
                    break;

                case ItemWinType.KingTreasure:

                    var kingTreasureShow = ModelCenter.Instance.GetModel<KingTreasureShowModel>();

                    kingTreasureShow.SetInitData(curAttrData.itemConfig.EffectValueA1,0);

                    kingTreasureShow.SetInitData(curAttrData.itemId);

                    break;

            }

        }


 System/KnapSack/New/KingTreasureShowModel.cs

@@ -11,6 +11,7 @@
    {

        KingTreasureModel kingTreasureModel { get { return ModelCenter.Instance.GetModel<KingTreasureModel>(); } }

        public string effectDes { get; private set;}

        public KingTreasureItemConfig kingTreasureItemConfig { get; private set; }

        public int treasureId { get; private set; }

        public string treasureSource { get; private set;}

        public override void Init()

@@ -33,17 +34,17 @@
           

        }



        public void SetTreasureSource(string treasureSource)

        public void SetInitData(int itemId)

        {

            this.treasureSource = treasureSource;

        }

            ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(itemId);

            kingTreasureItemConfig = Config.Instance.Get<KingTreasureItemConfig>(itemId);

            if (kingTreasureItemConfig == null || itemConfig == null) return;



        public void SetInitData(int treasureId, int rewardLv)

        {

            this.treasureId = treasureId;

            this.treasureId = itemConfig.EffectValueA1;

            this.treasureSource = kingTreasureItemConfig.description;

            effectDes = string.Empty;

            KingTreasureModel.Division division;

            bool isDivision = kingTreasureModel.TryGetDivision(treasureId,rewardLv, out division);

            bool isDivision = kingTreasureModel.TryGetDivision(treasureId,kingTreasureItemConfig.rewardLevel, out division);

            if(isDivision)

            {

                SetEffectDes(division.basePropertys);