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

client_Hale

2019-01-17 b270cd52ea99c27fd82ad1e73673e6a850709ea1

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

 System/Activity/ActivityNotifyBehaviour.cs

@@ -112,6 +112,11 @@
                        }

                        break;

                    case DailyQuestType.FairyFeast:

                        if (CrossServerUtility.IsCrossServer())

                        {

                            SysNotifyMgr.Instance.ShowTip("CrossMap10");

                            break;

                        }

                        dungeonModel.SingleChallenge(config.RelatedID);

                        break;

                    case DailyQuestType.Trial:


 System/DailyQuest/DailyQuestWin.cs

@@ -258,6 +258,11 @@
                    WindowCenter.Instance.Open<UnionPanel>(false, 4);

                    break;

                case DailyQuestType.FairyFeast:

                    if (CrossServerUtility.IsCrossServer())

                    {

                        SysNotifyMgr.Instance.ShowTip("CrossMap10");

                        break;

                    }

                    var config = Config.Instance.Get<DailyQuestConfig>(_id);

                    dungeonModel.SingleChallenge(config.RelatedID);

                    break;


 System/FairyAu/FairyLeagueWin.cs

@@ -464,6 +464,11 @@
                model.DisplayErrorTip(_error);

                return;

            }

            if (CrossServerUtility.IsCrossServer())

            {

                SysNotifyMgr.Instance.ShowTip("CrossMap10");

                return;

            }

            ModelCenter.Instance.GetModel<DungeonModel>().SingleChallenge(FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);

        }




 System/MainInterfacePanel/ChatFrame.cs

@@ -344,6 +344,11 @@
        BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }

        void OneKeyButton()//地图挂机按钮

        {

            if (CrossServerUtility.IsCrossServerBoss())

            {

                SysNotifyMgr.Instance.ShowTip("CrossMap10");

                return;

            }



            if (OneKeyList.Contains(PlayerDatas.Instance.baseData.MapID))

            {