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

client_linchunjie

2018-09-05 762cd4013179fb66170e8c932c84ef57ad9e167c

 System/MainInterfacePanel/CombatModeWin.cs

@@ -52,7 +52,7 @@
            var config = Config.Instance.Get<MapConfig>(MapID);

            var activityline = 0;

            fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);

            if (activityline == PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且在活动区域

            if (onMainModel.ActivityList.Contains(MapID) && activityline == PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且在活动区域

            {

                AtkTypeList = new int[] { 0, 5 };

            }