少年修仙传客户端代码仓库
client_linchunjie
2018-09-06 520a55769c8a533659be0c1d53dcc8548024e496
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
7个文件已修改
168 ■■■■ 已修改文件
Fight/Actor/AI/AI_BossDSX.cs 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/HeroBehaviour.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GA_Hero.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActor.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/IsPlayerUIeffect.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/FairyJadeInvestmentModel.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowJump/WindowJumpMgr.cs 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/AI/AI_BossDSX.cs
@@ -295,6 +295,32 @@
        GA_Hero.s_MapSwitching = false;
    }
    private void OnCastSkill(int id)
    {
        Debug.LogFormat("DSX_AI: skillID: {0}", id);
        HeroBehaviour.OnUserClickSkill -= OnCastSkill;
        if (id == 190)
        {
            Time.timeScale = 1;
            GA_Hero.s_MapSwitching = false;
            if (PreFightMission.Instance.m_HuaShouEffect)
            {
                EffectMgr.Instance.RecyleUIEffect(1050, PreFightMission.Instance.m_HuaShouEffect.gameObject);
                PreFightMission.Instance.m_HuaShouEffect = null;
            }
            if (m_UIEffect)
            {
                EffectMgr.Instance.RecyleUIEffect(m_UIEffect.effect, m_UIEffect.gameObject);
                m_UIEffect = null;
            }
            Transform _temp1 = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/JoyStick");
            _temp1.gameObject.SetActive(true);
        }
    }
    protected override void OutOfSleepUpdate()
    {
        base.OutOfSleepUpdate();
@@ -314,10 +340,10 @@
                _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/JoyStick");
                _temp.gameObject.SetActive(false);
                HeroBehaviour.OnUserClickSkill += OnCastSkill;
                m_Step = 12;
                m_TimeCount = 0;
            }
        }
        else if (m_Step == 12)
@@ -335,27 +361,7 @@
                _model.direction = 2;
                _model.pressedClose = false;
                _model.clickClosed = true;
                _model.onClose = () =>
                {
                    Time.timeScale = 1;
                    GA_Hero.s_MapSwitching = false;
                    if (PreFightMission.Instance.m_HuaShouEffect)
                    {
                        EffectMgr.Instance.RecyleUIEffect(1050, PreFightMission.Instance.m_HuaShouEffect.gameObject);
                        PreFightMission.Instance.m_HuaShouEffect = null;
                    }
                    PlayerDatas.Instance.hero.CastSkill(190);
                    if (m_UIEffect)
                    {
                        EffectMgr.Instance.RecyleUIEffect(m_UIEffect.effect, m_UIEffect.gameObject);
                        m_UIEffect = null;
                    }
                    Transform _temp1 = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/JoyStick");
                    _temp1.gameObject.SetActive(true);
                };
                _model.onClose = null;
                WindowCenter.Instance.Open<NewGuideWin>();
                Transform _temp = skillContainer.blinkSkill.transform.Find("Img_BackGround");
Fight/Actor/HeroBehaviour.cs
@@ -324,10 +324,17 @@
            return;
        }
        if (!PreFightMission.Instance.IsFinished() && skill.id == 190)
        {
        }
        else
        {
        if (skill == null || GA_Hero.s_MapSwitching)
        {
            return;
        }
        }
        if (m_Hero.ActorInfo.serverDie)
        {
Fight/GameActor/GA_Hero.cs
@@ -744,9 +744,16 @@
            return;
        }
        if (!PreFightMission.Instance.IsFinished() && skillID == 190)
        {
        }
        else
        {
        if (!CanCastSkill())
        {
            return;
            }
        }
        Skill _skill = SkillMgr.Get(skillID);
@@ -766,8 +773,10 @@
                        SkillMgr.CurCastSkill.SkillCompelete = true;
                    }
                    Behaviour.StartKillUntilDieAI(skillID);
                    aiHandler.currentType = E_HeroAIType.None;
                    Behaviour.DoAttack(_skill);
                    return;
                }
            }
Fight/GameActor/GActor.cs
@@ -53,6 +53,19 @@
                {
                    m_Root.rotation = m_Rotation;
                }
                // if (ServerInstID == PlayerDatas.Instance.PlayerId)
                // {
                //     System.Diagnostics.StackTrace st = new System.Diagnostics.StackTrace();
                //     System.Diagnostics.StackFrame[] sfs = st.GetFrames();
                //     string _content = "";
                //     for (int u = 0; u < sfs.Length; ++u)
                //     {
                //         System.Reflection.MethodBase mb = sfs[u].GetMethod();
                //         _content += string.Format("[CALL STACK][{0}]: {1}.{2}\r\n", u, mb.DeclaringType.FullName, mb.Name);
                //     }
                //     Debug.Log(_content);
                // }
            }
        }
    }
System/MainInterfacePanel/IsPlayerUIeffect.cs
@@ -38,6 +38,7 @@
            if (m_IsPlayUIEffect)
            {
                m_UIEffect.Play();
                m_IsPlayUIEffect = false;
            }
        }
System/Vip/FairyJadeInvestmentModel.cs
@@ -358,10 +358,42 @@
            }
        }
    }
    public void MessageNotification()
    {
        var _funcOrder = 0;
        if (!OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))
        {
            SysNotifyMgr.Instance.ShowTip("JadeInvestmentLimit1");//信息提示
            return;
        }
        else if (InvestmentGrade <= 0 && PlayerDatas.Instance.baseData.LV >= 300)
        {
            SysNotifyMgr.Instance.ShowTip("JadeInvestmentLimit2");//信息提示
            return;
        }
        else
        {
            bool isOpen = false;
            if (InvestmentGrade == 4)
            {
                foreach (int key in InfoSeriors.Keys)
                {
                    if (InfoSeriors[key] != 4)
                    {
                        isOpen = true;
                    }
                }
            }
            if (!isOpen && PlayerDatas.Instance.baseData.LV >= 300)
            {
                SysNotifyMgr.Instance.ShowTip("JadeInvestmentLimit3");//信息提示
                return;
            }
        }
    }
}
System/WindowJump/WindowJumpMgr.cs
@@ -220,13 +220,53 @@
                    return;
                }
                break;
            case JumpUIType.FlashSale:
                {
                    if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
                    {
                        OperationTimeHepler.Instance.ProcessConditionError(Operation.FlashSale);
                        return;
                    }
                }
                break;
            case JumpUIType.ConsumreRebate:
                {
                    if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
                    {
                        OperationTimeHepler.Instance.ProcessConditionError(Operation.ConsumeRebate);
                        return;
                    }
                }
                break;
            case JumpUIType.LimitedTimePackage:
                {
                    if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
                    {
                        OperationTimeHepler.Instance.ProcessConditionError(Operation.GiftPackage);
                        return;
                    }
                }
                break;
            case JumpUIType.BossReborn:
                {
                    if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
                    {
                        OperationTimeHepler.Instance.ProcessConditionError(Operation.BossReborn);
                        return;
                    }
                }
                break;
            case JumpUIType.VipRechargeFunc3:
                {
                    if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
                    {
                        ModelCenter.Instance.GetModel<FairyJadeInvestmentModel>().MessageNotification();
                        return;
                    }
                }
                break;
            case JumpUIType.OpenServerRank:
            case JumpUIType.OSTimeLimitGift:
            case JumpUIType.VipRechargeFunc3:
            case JumpUIType.FlashSale:
            case JumpUIType.ConsumreRebate:
            case JumpUIType.LimitedTimePackage:
            case JumpUIType.BossReborn:
            case JumpUIType.OpenServerActivityFunc2_1:
            case JumpUIType.OpenServerActivityFunc2_2:
                if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))