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

client_linchunjie

2019-01-10 0e356c5788e6c563d45f39007ee213919fe81ec7

 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -168,7 +168,7 @@


        private void UpdateFBHelp()

        {

            if (PlayerDatas.Instance.baseData.ExAttr5 != 1) return;

            if (!CrossServerUtility.IsCrossServer()) return;



            var hero = PlayerDatas.Instance.hero;

            var mission = dungeonModel.mission;

@@ -434,7 +434,7 @@
        public bool TryGetMatchTip()

        {

            int mapId = PlayerDatas.Instance.baseData.MapID;

            bool isCrossDungeon = PlayerDatas.Instance.baseData.ExAttr5 == 1;

            bool isCrossDungeon = CrossServerUtility.IsCrossServer();

            if(isCrossDungeon)

            {

                SysNotifyMgr.Instance.ShowTip("CrossMatching3");