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

Client_PangDeRong

2019-01-11 6c97f4ae03df3b29fa2e4f751553d35317b47e1d

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

 Core/GameEngine/Login/Launch.cs

@@ -201,7 +201,7 @@
            case InstalledAsset.IngoreDownLoad:

                progressBuf = progress;

                timer = 0f;

                duration = 50f;

                duration = 30f;



                if (!SDKUtility.Instance.AssetCopyFinished)

                {

@@ -210,7 +210,7 @@
                    while (!SDKUtility.Instance.AssetCopyFinished)

                    {

                        timer += Time.deltaTime;

                        progress = Mathf.Clamp(progressBuf + timer / duration * 0.6f, progressBuf, progressBuf + 0.6f);

                        progress = Mathf.Clamp(progressBuf + timer / duration * 0.7f, progressBuf, progressBuf + 0.7f);

                        yield return null;

                    }

                }

@@ -221,7 +221,7 @@
                    var decompressProgress = AssetDeCompressTask.DecompressAync(ResourcesPath.Instance.ExternalStorePath);

                    while (!decompressProgress.done)

                    {

                        progress = progressBuf + decompressProgress.progress * 0.3f;

                        progress = progressBuf + decompressProgress.progress * 0.2f;

                        yield return null;

                    }




 System/Team/TeamModel.cs

@@ -553,6 +553,12 @@


        public void RequestAutoMatchTeam(TeamMission _mission)

        {

            if (CrossServerUtility.IsCrossServer())

            {

                SysNotifyMgr.Instance.ShowTip("CrossMatching3");

                return;

            }



            if (myTeam.inTeam && !myTeam.iamCaptainer)

            {

                SysNotifyMgr.Instance.ShowTip("DungeonGroupAutoOnlyLeader");

@@ -765,7 +771,7 @@


        public void OnTeamClear(H0905_tagTeamClear _serverInfo)

        {

            if (_serverInfo.socketType==GameNetSystem.SocketType.CrossSever)

            if (_serverInfo.socketType == GameNetSystem.SocketType.CrossSever)

            {

                return;

            }

@@ -789,7 +795,7 @@


        public void OnTeammateLeave(H0906_tagPlayerLeaveTeamMsg _leaveTeam)

        {

            if (_leaveTeam.socketType==GameNetSystem.SocketType.CrossSever)

            if (_leaveTeam.socketType == GameNetSystem.SocketType.CrossSever)

            {

                return;

            }