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

client_Wu Xijin

2018-12-28 3ba41af039371d29b9b9f3fe15264381f8035375

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

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -544,6 +544,7 @@
                            hero.SwitchRedName(StatusMgr.Instance.IsExist(PlayerId, StatusMgr.Instance.redNameBuffID));

                            hero.IdleImmediate();

                            hero.State = E_ActorState.Idle;

                            extersion.pkState = 0;

                        }

                    }

                }


 System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs

@@ -143,8 +143,16 @@


        private void UpdateLookPlayerTime()

        {

            if (!crossServerModel.IsMatching) return;



            if (!crossServerModel.IsMatching)

            {

                if(lookPlayerObj.activeInHierarchy)

                {

                    matchRedPointBeh.gameObject.SetActive(true);

                    lookPlayerObj.SetActive(false);

                }

                return;

            }

         
            if(CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch)

            {

                int totalSeconds = Mathf.RoundToInt((float)(DateTime.Now - crossServerModel.matchStartTime).TotalSeconds);


 System/CrossServerOneVsOne/CrossServerSettlementWin.cs

@@ -233,7 +233,6 @@
                m_Segment_Txt1.text = config1.Name;

                var config2 = Config.Instance.Get<CrossServerArenaConfig>(crossServerModel.pkResultInfo.DanLV);

                m_Segment_Txt2.text = config2.Name;

                m_SorceText.text = crossServerModel.pkResultInfo.CurScore + "(+" + crossServerModel.pkResultInfo.AddScore + ")";

            }

            else

            {


 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -126,11 +126,11 @@
        {

            if (PlayerDatas.Instance.hero.aiHandler.IsAuto())

            {

                m_AutoImg.SetActive(true);

                m_AutoImg.SetActive(false);

            }

            else

            {

                m_AutoImg.SetActive(false);

                m_AutoImg.SetActive(true);

            }

            if (WindowCenter.Instance.IsOpen("CrossServerSettlementWin"))

            {


 System/GatheringSoul/GatheringSoulModel.cs

@@ -1463,16 +1463,16 @@
                return;

            }

            GatherSoulItem coreItem;

            if (TryGetItem(coreHole, out coreItem))

            if (TryGetItem(coreHole, out coreItem) &&

                SatisfyLevelUp(coreItem, out error))

            {

                if (SatisfyLevelUp(coreItem, out error))

                {

                    levelUpRedpointHole = coreHole;

                    levelUpRedpoint.state = RedPointState.Simple;

                }

                levelUpRedpointHole = coreHole;

                levelUpRedpoint.state = RedPointState.Simple;

            }

            else

            {

                levelUpRedpointHole = -1;

                var cost = 0;

                for (int i = 0; i < count; i++)

                {

                    GatherSoulItem holeItem;

@@ -1480,12 +1480,19 @@
                    {

                        if (SatisfyLevelUp(holeItem, out error))

                        {

                            levelUpRedpointHole = i;

                            levelUpRedpoint.state = RedPointState.Simple;

                            return;

                            if (RequireLevelUpCost(holeItem) < cost

                                || cost == 0)

                            {

                                cost = RequireLevelUpCost(holeItem);

                                levelUpRedpointHole = i;

                            }

                        }

                    }

                }

                if (levelUpRedpointHole != -1)

                {

                    levelUpRedpoint.state = RedPointState.Simple;

                }

            }

        }

        #endregion


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -1141,7 +1141,7 @@
        private void IsShowTaskPanel()//是否显示任务面板

        {

            var inDungeon = IsDungeon();

            var IsCrossServerOneVsOne = GameNetSystem.Instance.crossServerConnected_Loigc;

            var IsCrossServerOneVsOne = PlayerDatas.Instance.baseData.ExAttr5 == 1;

            if (inDungeon || fairyGrabBossModel.grabBossHintOpen || IsCrossServerOneVsOne)

            {

                m_TaskAndTeamTip.SetActive(false);