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

client_Zxw

2018-12-28 d09e7a7de4b153b94bbba69d2bb663d4f4de0d75

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

 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/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