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

client_Zxw

2018-09-25 f077c9cba2d4eae2b7ac7c7102711f4477534eb8

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

 Fight/PreFightMission.cs

@@ -1556,7 +1556,9 @@
        {

            yield break;

        }



        
        CameraController.Instance.MaskCamera.gameObject.SetActive(false);

        
        if (m_MoveToEffect)

        {

            SFXPlayUtility.Instance.Release(m_MoveToEffect);


 System/Chat/ChatCenter.cs

@@ -754,7 +754,7 @@
            {

                return;

            }

            if (!WindowCenter.Instance.Open<MainInterfaceWin>()

            if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>()

                || WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()

                || StageManager.Instance.isLoading

                || NewBieCenter.Instance.inGuiding)


 System/Dogz/DogzPackWin.cs

@@ -24,6 +24,8 @@
        [SerializeField] ScrollerController m_PackController;

        [SerializeField] Button qualitySelectBtn;

        [SerializeField] Button starSelectBtn;

        [SerializeField] Transform qualityArrow;

        [SerializeField] Transform starArrow;

        [SerializeField] SortTable qualitySort;

        [SerializeField] SortTable starSort;



@@ -63,14 +65,19 @@
            playerPack.RefreshItemCountAct += RefreshDogzItemEvent;

            qualitySort.onSelectSortEvent += RefreshDogzSelectEvent;

            starSort.onSelectSortEvent += RefreshDogzSelectEvent;

            qualitySort.onSortCloseEvent += CloseQualitySort;

            starSort.onSortCloseEvent += CloseStarSort;

            dogzModel.SelectDogzItemQuality = 0;

            dogzModel.SelectDogzItemStart = 0;



            starSort.SetDefault();

            qualitySort.SetDefault();

            UpdateDogzEquip();

            UpdateDogzPack();

            starSort.gameObject.SetActive(false);

            qualitySort.gameObject.SetActive(false);

            starArrow.localRotation = Quaternion.Euler(0, 0, 180);

            qualityArrow.localRotation = Quaternion.Euler(0, 0, 180);

        }



        protected override void OnAfterOpen()

@@ -83,6 +90,8 @@
            playerPack.RefreshItemCountAct -= RefreshDogzItemEvent;

            qualitySort.onSelectSortEvent -= RefreshDogzSelectEvent;

            starSort.onSelectSortEvent -= RefreshDogzSelectEvent;

            qualitySort.onSortCloseEvent -= CloseQualitySort;

            starSort.onSortCloseEvent -= CloseStarSort;

        }



        protected override void OnAfterClose()

@@ -183,12 +192,31 @@


        private void ClickStarSelect()

        {

            starSort.gameObject.SetActive(!starSort.gameObject.activeInHierarchy);

            starArrow.localRotation = Quaternion.Euler(0, 0, 0);

            if (!starSort.gameObject.activeInHierarchy)

            {

                starSort.gameObject.SetActive(true);

            }

        }



        private void ClickQualitySelect()

        {

            qualitySort.gameObject.SetActive(!qualitySort.gameObject.activeInHierarchy);

            qualityArrow.localRotation = Quaternion.Euler(0, 0, 0);

            if (!qualitySort.gameObject.activeInHierarchy)

            {

                qualitySort.gameObject.SetActive(true);

            }

        }





        private void CloseQualitySort()

        {

            qualityArrow.localRotation = Quaternion.Euler(0, 0, 180);

        }



        private void CloseStarSort()

        {

            starArrow.localRotation = Quaternion.Euler(0, 0, 180);

        }



        [Serializable]


 System/DogzDungeon/DogzDungeonModel.cs

@@ -286,17 +286,25 @@
                }
            }

            if (containBox)
            {
                dogzDungeonBox.UpdateBoxRefreshTime(boxRefreshSecond);
            }

            if (containElite)
            {
                dogzDungeonElite.UpdateEliteRefreshTime(eliteRefreshSecond);
            }

            if (WindowCenter.Instance.CheckOpen("DogzDungeonWin"))
            {
                if (containBox)
                {
                    dogzDungeonBox.UpdateBoxRefreshTime(boxRefreshSecond);
                    RequestBoxSurplusInfo();
                }

                if (containElite)
                {
                    dogzDungeonElite.UpdateEliteRefreshTime(eliteRefreshSecond);
                    RequestEliteSurplusInfo();
                }
            }

 System/Dungeon/DungeonModel.cs

@@ -453,7 +453,7 @@
                            }

                            else

                            {

                                CancelGroupEnter(_dungeon.mapId);

                                CancelGroupEnter(_dungeon);

                            }

                        });

                    }

@@ -479,9 +479,9 @@
            }

        }



        private void CancelGroupEnter(int _mapId)

        private void CancelGroupEnter(Dungeon _dungeon)

        {

            switch (_mapId)

            switch (_dungeon.mapId)

            {

                case RealmModel.REALM_DUNGEON_ID:

                    if (!WindowCenter.Instance.CheckOpen<TeamFrameWin>())

@@ -491,6 +491,14 @@
                        WindowCenter.Instance.Open<TeamFrameWin>(false, teamModel.myTeam.inTeam ? 1 : 0);

                    }

                    break;

                default:

                    if (!WindowCenter.Instance.CheckOpen<TeamFrameWin>())

                    {

                        var teamModel = ModelCenter.Instance.GetModel<TeamModel>();

                        teamModel.missionBuf = teamModel.currentMission = new TeamMission(_dungeon.mapId, _dungeon.lineId);

                        WindowCenter.Instance.Open<TeamFrameWin>(false, teamModel.myTeam.inTeam ? 1 : 0);

                    }

                    break;

            }

        }