少年修仙传客户端代码仓库
client_linchunjie
2019-04-24 946fc0c3a4ded191d96d50072b3c0a56bd69d48c
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
89 ■■■■■ 已修改文件
Fight/GameActor/GA_Hero.cs 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActorPlayerBase.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/HUD/HeadUpName.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GA_Hero.cs
@@ -84,11 +84,9 @@
    /// 用户点击锁定, 被攻击锁定攻击者...
    /// </summary>
    private GActor m_LockTarget;
    public GActor LockTarget
    {
    public GActor LockTarget {
        get { return m_LockTarget; }
        set
        {
        set {
            if (m_LockTarget == value)
            {
                return;
@@ -110,14 +108,11 @@
    public MapArea currentBossArea;
    private uint _atkBossID;
    public uint atkBossID
    {
        get
        {
    public uint atkBossID {
        get {
            return _atkBossID;
        }
        set
        {
        set {
            if (_atkBossID != value)
            {
                _atkBossID = value;
@@ -133,28 +128,22 @@
        }
    }
    public sealed override int NextAction
    {
        get
        {
    public sealed override int NextAction {
        get {
            return base.NextAction;
        }
        set
        {
        set {
            base.NextAction = value;
        }
    }
    public sealed override GActor SelectTarget
    {
        get
        {
    public sealed override GActor SelectTarget {
        get {
            return base.SelectTarget;
        }
        set
        {
        set {
            if (base.SelectTarget == value)
            {
                return;
@@ -230,6 +219,7 @@
        UserInputHandler.OnCirclePanelTouched += OnCirclePanelTouched;
        UserInputHandler.OnClickedFloor += OnClickedFloor;
        HeroBehaviour.OnStopHandupAI += OnStopHandupAI;
        FuncOpen.Instance.OnFuncStateChangeEvent += OnFunctionOpen;
        ModelCenter.Instance.GetModel<EquipModel>().appearanceChangeEvent += SwitchSuit;
@@ -276,7 +266,7 @@
        OnPathFinding -= MapTransferUtility.Instance.OnHeroPathFinding;
        OnPathFindStop -= MapTransferUtility.Instance.OnHeroStopPathFind;
        ModelCenter.Instance.GetModel<EquipModel>().appearanceChangeEvent -= SwitchSuit;
        FuncOpen.Instance.OnFuncStateChangeEvent -= OnFunctionOpen;
        Behaviour = null;
        m_LockTarget = null;
@@ -627,7 +617,14 @@
            _familyName = PlayerDatas.Instance.baseData.FamilyName;
        }
        m_HeadUpName.SetPlayerInfo(PlayerDatas.Instance.baseData.realmLevel, _titleID, PlayerDatas.Instance.baseData.PlayerName, _familyName, false);
        if (FuncOpen.Instance.IsFuncOpen(12))
        {
            m_HeadUpName.SetPlayerInfo(PlayerDatas.Instance.baseData.realmLevel, _titleID, PlayerDatas.Instance.baseData.PlayerName, _familyName, false);
        }
        else
        {
            m_HeadUpName.SetPlayerInfo(999, _titleID, PlayerDatas.Instance.baseData.PlayerName, _familyName, false);
        }
        if (StatusMgr.Instance.IsExist(ServerInstID, StatusMgr.Instance.bossBelongBuffID))
        {
@@ -654,6 +651,31 @@
            return;
        }
        base.SwitchYellowName(on);
    }
    public override void SwitchRealm(int _realm)
    {
        if (m_HeadUpName == null)
        {
            return;
        }
        if (FuncOpen.Instance.IsFuncOpen(12))
        {
            m_HeadUpName.SetPlayerRealm(_realm);
        }
        else
        {
            m_HeadUpName.SetPlayerRealm(999);
        }
    }
    private void OnFunctionOpen(int functionId)
    {
        if (functionId == 12)
        {
            SwitchRealm(PlayerDatas.Instance.baseData.realmLevel);
        }
    }
    public sealed override void Die()
@@ -714,10 +736,8 @@
    }
    private HeavenBattleModel m_HeavenBattleModel = null;
    public HeavenBattleModel heavenBattleModel
    {
        get
        {
    public HeavenBattleModel heavenBattleModel {
        get {
            return m_HeavenBattleModel ?? (m_HeavenBattleModel = ModelCenter.Instance.GetModel<HeavenBattleModel>());
        }
    }
@@ -810,14 +830,11 @@
    #region 地图区域相关处理
    private int m_CurMapArea = 1 << (int)MapArea.E_Type.Normal;
    public int CurMapArea
    {
        get
        {
    public int CurMapArea {
        get {
            return m_CurMapArea;
        }
        set
        {
        set {
            m_CurMapArea = value;
        }
    }
Fight/GameActor/GActorPlayerBase.cs
@@ -479,7 +479,7 @@
    private Animator m_WingAnimator;
    private Animator m_HorseAnimator;
    public void SwitchRealm(int _realm)
    public virtual void SwitchRealm(int _realm)
    {
        if (m_HeadUpName == null)
        {
UI/HUD/HeadUpName.cs
@@ -93,7 +93,7 @@
        {
            if (m_Realm)
            {
                if (_realm > 0 && RealmConfig.Has(_realm))
                if (RealmConfig.Has(_realm))
                {
                    m_Realm.gameObject.SetActive(true);
                    m_PlayerName.alignment = TextAnchor.MiddleLeft;