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

client_Hale

2018-12-27 328a701ad33e4b2d38adec54e864f2fb10e05e73

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

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

@@ -32,7 +32,7 @@
        switch (vNetData.socketType)

        {

            case GameNetSystem.SocketType.Main:

                if (loginModel.reconnectBackGround || PlayerDatas.Instance.baseData.ExAttr1 == 1)

                if (loginModel.reconnectBackGround || PlayerDatas.Instance.baseData.ExAttr5 == 1)

                {

                    var mapOk = new C0107_tagCInitMapOK();

                    mapOk.MapID = PlayerDatas.Instance.baseData.MapID;


 System/CrossServerOneVsOne/CrossServerRewardModel.cs

@@ -71,6 +71,10 @@
    public int ZoneID = 0;//赛区ID

    public int SeasonID = 0;//赛季ID

    public int MyRank = -1;//我的排名

    private const int Redpoint_key1 = 2130102;//段位奖励红点

    public Redpoint redPointStre1 = new Redpoint(21301, Redpoint_key1);

    private const int Redpoint_key2 = 2130103;//赛季奖励红点

    public Redpoint redPointStre2 = new Redpoint(21301, Redpoint_key2);

    public override void Init()

    {

        GetSeasonAward();

@@ -83,22 +87,29 @@
        SeasonID = 0;

        PkDanLvNow = 0;

        crossServerModel.UpdatePkResultEvent -= UpdatePkResultEvent;

        CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfoEvent;

    }



    public void OnPlayerLoginOk()

    {

        crossServerModel.UpdatePkResultEvent += UpdatePkResultEvent;

        CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfoEvent;

        RedPointSeg();

    }





   


    public override void UnInit()

    {



    }

    private void UpdatePlayerInfoEvent()

    {

        RedPointSeg();

    }

    private void UpdatePkResultEvent()

    {

        if (IsCrossServerOneVsOne())//副本结算界面

        if (GameNetSystem.Instance.crossServerConnected_Loigc)//副本结算界面

        {

            WindowCenter.Instance.Open<CrossServerSettlementWin>();

        }

@@ -187,6 +198,7 @@
        {

            CrossRealmPKAwardStateUpdate();

        }

        RedPointSeg();

    }



    public bool IsAwardState(CrossRealmPKAwardStateEnum _cross, int Index)//是否已领取奖励

@@ -324,6 +336,27 @@
        get { return pkDanLvNow; }

        set { pkDanLvNow = value; }

    }



    private void RedPointSeg()//段位奖励红点

    {

        int Danlv = CrossServerOneVsOnePlayerInfo.Instance.DanLV;

        bool Isbool = false;

        foreach (var key in SegmentRewardDic.Keys)

        {

            if (SegmentRewardDic[key].DanLv >= Danlv && !IsAwardState(CrossRealmPKAwardStateEnum.DanLVAwardState, SegmentRewardDic[key].DanLv))

            {

                Isbool = true;

            }

        }

        if (Isbool)

        {

            redPointStre1.state = RedPointState.Simple;

        }

        else

        {

            redPointStre1.state = RedPointState.None;

        }

    }

}






 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -279,7 +279,6 @@
                        youWin += 1;

                    }

                }



            }

            if (positionType == 1)

            {

@@ -287,9 +286,9 @@
                m_ScoreText2.text = youWin.ToString();

            }

            else

            {

                m_ScoreText2.text = myWin.ToString();

            {            
                m_ScoreText1.text = youWin.ToString();

                m_ScoreText2.text = myWin.ToString();

            }

        }

        private void myBuffList()


 System/Loading/LoadingWin.cs

@@ -32,6 +32,7 @@
        [SerializeField] Image m_MapDescription;



        [SerializeField] RectTransform m_CrossServerOneVsOne;

        [SerializeField] Image m_CrossServerOneVsOneBg;

        [SerializeField] Image m_MyPortrayal;

        [SerializeField] Image m_OpponentPortrayal;

        [SerializeField] Text m_MyName;

@@ -53,6 +54,16 @@


        protected override void OnPreOpen()

        {

            var useDefautBackGround = false;

            if (!AssetSource.uiFromEditor)

            {

                var assetVersion = AssetVersionUtility.GetAssetVersion("ui/sprite/loadingbg");

                if (assetVersion == null || !assetVersion.localValid)

                {

                    useDefautBackGround = true;

                }

            }



            if (CrossServerLogin.Instance.oneVsOnePlayerData.waitForLoginCrossServer)

            {

                loadingType = LoadingType.CrossServerOneOne;

@@ -64,6 +75,16 @@


            if (loadingType == LoadingType.CrossServerOneOne)

            {

                if (useDefautBackGround)

                {

                    var sprite = BuiltInLoader.LoadSprite("Launch_1");

                    m_CrossServerOneVsOneBg.overrideSprite = sprite;

                }

                else

                {

                    m_CrossServerOneVsOneBg.SetSprite("CrossServerOneVsOne_LoadingBG");

                }



                m_ContainerNormal.gameObject.SetActive(false);

                m_CrossServerOneVsOne.gameObject.SetActive(true);



@@ -74,15 +95,6 @@
            {

                m_ContainerNormal.gameObject.SetActive(true);

                m_CrossServerOneVsOne.gameObject.SetActive(false);

                var useDefautBackGround = false;

                if (!AssetSource.uiFromEditor)

                {

                    var assetVersion = AssetVersionUtility.GetAssetVersion("ui/sprite/loadingbg");

                    if (assetVersion == null || !assetVersion.localValid)

                    {

                        useDefautBackGround = true;

                    }

                }



                if (useDefautBackGround)

                {

@@ -187,8 +199,6 @@
                    StageManager.Instance.loadingProgressEvent += UpdateLoadingProgress;

                }

            }







        }




 System/Treasure/TreasureBaseWin.cs

@@ -247,6 +247,20 @@


        private void Back()

        {

            var childrens = WindowConfig.Get().FindChildWindows("TreasureBaseWin");

            bool existAnyChildWindow = false;

            foreach (var window in childrens)

            {

                if (WindowCenter.Instance.IsOpen(window))

                {

                    existAnyChildWindow = true;

                    break;

                }

            }

            if (!existAnyChildWindow)

            {

                return;

            }

            var returnCode = 0;

            if (allowBack != null)

            {


 System/Treasure/TreasureLevelUpWin.cs

@@ -419,6 +419,11 @@
            {

                return 1;

            }

            if (NewBieCenter.Instance.inGuiding

                && NewBieCenter.Instance.currentGuide == 13)

            {

                return 1;

            }

            return 0;

        }