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

client_linchunjie

2019-03-30 69ade7bccc9a7990fde3cb2284f32b16005d8ce7

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

 Fight/Stage/MapEditor/Game/ClientSceneManager.cs

@@ -204,11 +204,14 @@
        m_TransferGroupList.Clear();

        ReConnectClear();

        m_MapData = null;
        TriggerHandler.OnEnter -= OnTriggerEnter;
        TriggerHandler.OnExit -= OnTriggerExit;

        m_Inited = false;
        IsClientFightMode = false;
        m_EventActorDict.Clear();
        m_EventHandlerDict.Clear();
    }

    public void ReConnectClear()

 Fight/Stage/StageLoadProcessor.cs

@@ -134,6 +134,7 @@
                        if (PlayerDatas.Instance.hero != null)
                        {
                            PlayerDatas.Instance.hero.Behaviour.StopHandupAI(true);
                            GAMgr.Instance.ServerDie(PlayerDatas.Instance.baseData.PlayerID);
                            GAMgr.Instance.Release(PlayerDatas.Instance.hero);
                            PlayerDatas.Instance.hero = null;
                        }

 System/EquipStar/EquipStarModel.cs

@@ -97,6 +97,18 @@
                return;
            }

            var equip = packModel.GetItemByGuid(equipModel.GetEquip(equipPosition));
            if (equip == null)
            {
                return;
            }

            if (equip.config.ItemColor < 4)
            {
                SysNotifyMgr.Instance.ShowTip("StarLevelUp4");
                return;
            }

            var maxLevel = GetMaxStarLevel(equipPosition.x);
            if (starLevel > maxLevel)
            {

 System/MainInterfacePanel/IsShowXpButton.cs

@@ -9,9 +9,11 @@
using System.Collections.Generic;
using System;
//是否显示XP
namespace Snxxz.UI {
namespace Snxxz.UI
{

    public class IsShowXpButton:MonoBehaviour {
    public class IsShowXpButton : MonoBehaviour
    {
        [SerializeField] UIEffect m_UiEffect;
        List<int> ProhibitedToRelease = new List<int>();
        PlayerMainDate m_MainModel;
@@ -41,19 +43,25 @@
                return;
            }
            _XpSkill = SkillConfig.Get(SkillID);
            Skill _skill = PlayerDatas.Instance.hero.SkillMgr.Get(_XpSkill.SkillID);
            if (_skill.IsValid())
            if (_XpSkill != null)
            {
                if (!m_UiEffect.IsPlaying)
                if (PlayerDatas.Instance.hero != null)
                {
                    m_UiEffect.Play();
                }
            }
            else
            {
                if (m_UiEffect.IsPlaying)
                {
                    m_UiEffect.Stop();
                    Skill _skill = PlayerDatas.Instance.hero.SkillMgr.Get(_XpSkill.SkillID);
                    if (_skill.IsValid())
                    {
                        if (!m_UiEffect.IsPlaying)
                        {
                            m_UiEffect.Play();
                        }
                    }
                    else
                    {
                        if (m_UiEffect.IsPlaying)
                        {
                            m_UiEffect.Stop();
                        }
                    }
                }
            }
        }
@@ -107,7 +115,7 @@

        }

      

        private void StorageList()
        {
            if (ProhibitedToRelease.Count <= 0)