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

client_Zxw

2018-08-14 53e8e14f53ad83005d5b382b82e238392b3a07cc

 System/Team/TeamModel.cs

@@ -554,7 +554,7 @@
            GameNetSystem.Instance.SendInfo(sendInfo);

        }



        public void ReqeustPrepareEnterDungeon(bool _prepare)

        public void RequestPrepareEnterDungeon(bool _prepare)

        {

            var sendInfo = new CB909_tagCGTeamMemberPrepare();

            sendInfo.PrepareState = (byte)(_prepare ? 1 : 2);

@@ -935,7 +935,7 @@
        {

            if (!AssetSource.sceneFromEditor && VersionConfig.Get().assetAccess != InstalledAsset.IngoreDownLoad && !AssetVersionUtility.unPriorAssetDownLoadDone)

            {

                ReqeustPrepareEnterDungeon(false);

                RequestPrepareEnterDungeon(false);

                return;

            }



@@ -1103,6 +1103,7 @@
        {

            if (isMatching)

            {

                SysNotifyMgr.Instance.ShowTip("TeamMatchingTimeOut");

                RequestCancelAutoMatchTeam();

            }

        }