Merge branch 'master' into GrowthFund

client_Zxw

2019-01-15 4c6d58af44cd4235501e15a78bf79674ba2fcc4a

 System/CrossServerBoss/CrossServerBossModel.cs

@@ -8,7 +8,7 @@
{
    [XLua.Hotfix]
    [XLua.LuaCallCSharp]
    public class CrossServerBossModel : Model
    public class CrossServerBossModel : Model, IMapInitOk
    {
        public const int DATA_MAPID = 32020;
        public const int REDPOINT = 77002;
@@ -90,6 +90,17 @@
            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFunctionStateChange;
        }

        public void OnMapInitOk()
        {
            if (PlayerDatas.Instance.baseData.MapID == DATA_MAPID)
            {
                if (selectedBoss != 0)
                {
                    MapTransferUtility.Instance.MoveToNPC(selectedBoss);
                }
            }
        }

        public void RequestEnter()
        {
            var sendInfo = new CC105_tagCMEnterCrossServer();