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

client_Wu Xijin

2019-03-19 2be0d5c5ac651db7b8d52e785fc36748bb2f409a

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

 Core/MapEditor/Behavior/Bhv_TransferPoint.cs

@@ -17,6 +17,8 @@
        [HideInInspector]
        public CapsuleCollider capsuleCollider;

        public GameObject Effect;

        public void Save(BinaryWriter bw)
        {
            bw.Write(effectID);
@@ -43,6 +45,15 @@
            transform.position = new Vector3(_x, _y, _z);
            float _r = br.ReadSingle();
            capsuleCollider.radius = _r;
            if (EffectConfig.Has(effectID))
            {
                var _prefab = InstanceResourcesLoader.LoadEffect(effectID);
                Effect = Instantiate(_prefab);
                Effect.transform.SetParent(transform);
                Effect.transform.localPosition = Vector3.zero;
                Effect.transform.localScale = Vector3.one;
                Effect.transform.rotation = Quaternion.identity;
            }
        }

        public void Export(BinaryWriter bw)

 Core/MapEditor/Behavior/Bhv_Trasfer.cs

@@ -120,7 +120,29 @@
                        EditorGUILayout.BeginHorizontal(GUILayout.Height(22));
                        EditorGUILayout.LabelField("[" + (i + 1) + "]", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(25));
                        EditorGUILayout.LabelField("特效", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(25));
                        pointList[i].effectID = EditorGUILayout.IntField(pointList[i].effectID, guiSkin.textField, GUILayout.Height(20));
                        var _effectID = pointList[i].effectID;
                        _effectID = EditorGUILayout.IntField(_effectID, guiSkin.textField, GUILayout.Height(20));
                        if (_effectID != pointList[i].effectID)
                        {
                            if (EffectConfig.Has(_effectID))
                            {
                                var _prefab = InstanceResourcesLoader.LoadEffect(_effectID);
                                if (_prefab)
                                {
                                    if (pointList[i].Effect)
                                    {
                                        DestroyImmediate(pointList[i].Effect);
                                        pointList[i].Effect = null;
                                    }
                                    pointList[i].Effect = Instantiate(_prefab);
                                    pointList[i].Effect.transform.SetParent(pointList[i].transform);
                                    pointList[i].Effect.transform.localPosition = Vector3.zero;
                                    pointList[i].Effect.transform.localScale = Vector3.one;
                                    pointList[i].Effect.transform.rotation = Quaternion.identity;
                                    pointList[i].effectID = _effectID;
                                }
                            }
                        }
                        EditorGUILayout.EndHorizontal();

                        if (i - 1 >= 0)

 System/Realm/RealmModel.cs

@@ -73,11 +73,15 @@
        public void OnBeforePlayerDataInitialize()

        {

            isBossPass = false;

            SysNotifyMgr.Instance.OnSystemNotifyEvent -= OnSystemNotifyEvent;

        }



        public void OnPlayerLoginOk()

        {

            redpointDirty = true;



            SysNotifyMgr.Instance.OnSystemNotifyEvent -= OnSystemNotifyEvent;

            SysNotifyMgr.Instance.OnSystemNotifyEvent += OnSystemNotifyEvent;

        }



        public override void UnInit()

@@ -338,6 +342,18 @@
            }

        }



        private void OnSystemNotifyEvent(string key)

        {

            if (key == "BigRealmUpSuccess")

            {

                if (WindowCenter.Instance.IsOpen<MainInterfaceWin>()

                    && !WindowCenter.Instance.ExistAnyFullScreenOrMaskWin())

                {

                    EffectMgr.Instance.PlayUIEffect(7047, 1800, WindowCenter.Instance.uiRoot.baseCanvas, false);

                }

            }

        }



        private void PlayerDataRefreshEvent(PlayerDataType dataType)

        {

            if (dataType == PlayerDataType.RealmLevel


 System/Realm/RealmWin.cs

@@ -176,17 +176,16 @@


            if (model.SatisfyChallengeBoss(model.displayRealmLevel))

            {

                if (model.GetBossEffectShow(model.displayRealmLevel))

                {

                    DisplayEffectBoss();

                }

                else

                if (!model.GetBossEffectShow(model.displayRealmLevel))

                {

                    m_RealmAnimation.StartBossEffectShow();

                    m_GotoBoss.gameObject.SetActive(false);

                    model.SetBossEffectShow(model.displayRealmLevel);

                    return;

                }

            }

            DisplayEffectBoss();



        }



        void HideRealmUp()