少年修仙传客户端代码仓库
client_Wu Xijin
2019-01-23 4f4fa813f0f485ef27d5e097aa7d437f44f334f9
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
10个文件已修改
105 ■■■■ 已修改文件
Fight/Actor/AI/HeroAI_KillUntilDie.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/HeroBehaviour.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/UserInputHandler.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActor.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActorPlayerBase.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyBoss/JadeDynastyBossModel.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyDecomposeWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/PackModelInterface.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/SortTable.cs 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/AI/HeroAI_KillUntilDie.cs
@@ -226,6 +226,12 @@
                m_IsMovingToTarget = true;
                if (!_hero.IsRushing && UserInputHandler.isTouched)
                {
                    m_LimitOnce = true;
                    _hero.StopPathFind();
                }
                return;
            }
Fight/Actor/HeroBehaviour.cs
@@ -139,7 +139,8 @@
            }
        }
        if (m_Hero.aiHandler.currentType == E_HeroAIType.None)
        if (m_Hero.aiHandler.currentType == E_HeroAIType.None
         || m_Hero.aiHandler.currentType == E_HeroAIType.KillUntilDie)
        {
            byte _type = (byte)E_HeroAIType.KillUntilDie;
            KillUntilDieData _data = m_Hero.aiHandler.aiData[_type] as KillUntilDieData;
Fight/Actor/UserInputHandler.cs
@@ -278,6 +278,7 @@
                    _hero.Run();
                    _hero.State = E_ActorState.CtrlRun;
                    _hero.Behaviour.StopKillUntilDieAI();
                }
            }
        }
@@ -296,13 +297,17 @@
        GA_Hero _hero = PlayerDatas.Instance.hero;
        if ((StatusMgr.IsValid()
         && StatusMgr.Instance.CanMove(PlayerDatas.Instance.PlayerId)))
        if (_hero != null)
        {
            if (_hero != null
             && _hero.State == E_ActorState.AutoRun)
            _hero.Behaviour.StopKillUntilDieAI();
            if ((StatusMgr.IsValid()
             && StatusMgr.Instance.CanMove(PlayerDatas.Instance.PlayerId)))
            {
                _hero.StopPathFind();
                if (_hero.State == E_ActorState.AutoRun)
                {
                    _hero.StopPathFind();
                }
            }
        }
    }
Fight/GameActor/GActor.cs
@@ -282,11 +282,12 @@
        return m_Path.corners;
    }
    public void MoveToTarget(GActor target, float keepDist = 0)
    public void MoveToTarget(GActor target, float keepDist = 0, bool force = false)
    {
        if (PathFindStatus == E_PathFindStatus.Moving
         && m_SearchType == E_SearchType.Dynamic
         && TargetActor == target)
         && TargetActor == target
         && !force)
        {
            return;
        }
@@ -335,16 +336,16 @@
    public void StopPathFind()
    {
        PathFindStatus = E_PathFindStatus.Stop;
        if (State != E_ActorState.AutoRun)
        {
            return;
        }
        PathFindStatus = E_PathFindStatus.Stop;
        TargetActor = null;
        DestPos = Vector3.zero;
        m_CornerIndex = 0;
        if (NextAction != GAStaticDefine.Act_Dead
         && NextAction != 200
Fight/GameActor/GActorPlayerBase.cs
@@ -1191,11 +1191,6 @@
        {
            if (null != m_Guard)
            {
                if (m_Guard.itemID == guardID)
                {
                    return;
                }
                m_Guard.UnInit();
                m_Guard = null;
            }
System/JadeDynastyBoss/JadeDynastyBossModel.cs
@@ -80,6 +80,7 @@
            dungeonModel.updateDungeonBuyCnt += OnDungeonBuyCount;
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
            packModel.RefreshItemCountAct += RefreshItemCountAct;
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;
        }
        public void OnBeforePlayerDataInitialize()
@@ -104,6 +105,7 @@
            dungeonModel.updateDungeonBuyCnt -= OnDungeonBuyCount;
            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
            packModel.RefreshItemCountAct -= RefreshItemCountAct;
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent;
        }
        void ParseConfig()
@@ -420,6 +422,15 @@
            }
        }
        private void PlayerDataRefreshInfoEvent(PlayerDataRefresh refreshType)
        {
            if(refreshType==PlayerDataRefresh.OfficialRank
                || refreshType == PlayerDataRefresh.LV)
            {
                UpdateRedpoint();
            }
        }
        private void RefreshItemCountAct(PackType packType, int arg2, int arg3)
        {
            if (packType == PackType.rptJadeDynastyEquip)
@@ -436,8 +447,25 @@
        {
            if (FuncOpen.Instance.IsFuncOpen(FUNCTIONID))
            {
                var count = dungeonModel.GetTotalTimes(JADEDYNASTY_MAP) - dungeonModel.GetEnterTimes(JADEDYNASTY_MAP);
                redpoint.count = count;
                var existAnyChallengeable = false;
                var condition = 0;
                foreach (var boss in jadeDynastyBosses)
                {
                    if (IsBossUnLocked(boss.bossNpcId, out condition))
                    {
                        existAnyChallengeable = true;
                        break;
                    }
                }
                if (existAnyChallengeable)
                {
                    var count = dungeonModel.GetTotalTimes(JADEDYNASTY_MAP) - dungeonModel.GetEnterTimes(JADEDYNASTY_MAP);
                    redpoint.count = count;
                }
                else
                {
                    redpoint.count = 0;
                }
            }
            else
            {
System/JadeDynastyKnapSack/JadeDynastyDecomposeWin.cs
@@ -37,7 +37,7 @@
            decomposeModel.UpdateSelectItemEvent += UpdateSelectItem;
            sortTable.onSortCloseEvent += CloseSortTable;
            sortTable.onSelectSortEvent += UpdateSelectEquipLv;
            sortTable.SetDefault();
            sortTable.SetDefault(decomposeModel.selectEquipLv);
            SetDisplay();
        }
System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs
@@ -89,7 +89,7 @@
            }
            else
            {
                titleText.text = Language.Get("进阶属性");
                titleText.text = Language.Get("JadeDynastyEquip4");
            }
            List<int> suitTypes = equipModel.suitTypeDict.Keys.ToList();
@@ -199,7 +199,7 @@
                        }
                        else
                        {
                            equipsName = StringUtility.Contact(" ", equipName);
                            equipsName = StringUtility.Contact(equipsName, " ", equipName);
                        }
                    }
                    string conditionSB = Language.Get("JadeDynastyEquip1",equipsName,suitAttrData.suitLv);
System/KnapSack/Logic/PackModelInterface.cs
@@ -1673,10 +1673,6 @@
                        }
                    }
                }
                else
                {
                    putOnModel = putOnModel2;
                }
                int equipScore1 = 0;
                if (putOnModel != null)
UI/Common/SortTable.cs
@@ -80,12 +80,31 @@
            _sortCell.sortTypeTxt.text = Language.Get(m_SortElements[cell.index].textKey);
        }
        public void SetDefault()
        public void SetDefault(int value = 0)
        {
            if (m_TargetDisplay != null && m_SortElements != null && m_SortElements.Count > 0)
            if(value == 0)
            {
                m_TargetDisplay.text = Language.Get(m_SortElements[0].textKey);
                if (m_TargetDisplay != null && m_SortElements != null && m_SortElements.Count > 0)
                {
                    m_TargetDisplay.text = Language.Get(m_SortElements[0].textKey);
                }
            }
            else
            {
                if (m_TargetDisplay != null && m_SortElements != null && m_SortElements.Count > 0)
                {
                    foreach(var key in m_SortElements)
                    {
                        if(key.type == value)
                        {
                            m_TargetDisplay.text = Language.Get(key.textKey);
                            break;
                        }
                    }
                }
            }
        }
    }