少年修仙传客户端代码仓库
client_Zxw
2018-12-24 245e389da4b8ce87c93890ae732d2f0df03e3e19
5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发
4个文件已修改
100 ■■■■■ 已修改文件
System/CrossServerOneVsOne/CrossServerRewardModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/FightingPKWin.cs 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonFightWin.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainInterfaceWin.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -217,7 +217,7 @@
        GameNetSystem.Instance.SendInfo(c103);
    }
    public bool IsCrossServer()//是否再跨服副本中
    public static bool IsCrossServer()//是否再跨服副本中
    {
        bool _bool = false;
        int mapId = PlayerDatas.Instance.baseData.MapID;
System/CrossServerOneVsOne/FightingPKWin.cs
@@ -15,6 +15,8 @@
    {
        [SerializeField] RoleInformation m_RoleInformation1;
        [SerializeField] RoleInformation m_RoleInformation2;
        [SerializeField] Button m_AutoBtn;
        [SerializeField] GameObject m_AutoImg;
        #region Built-in
        protected override void BindController()
        {
@@ -22,6 +24,7 @@
        protected override void AddListeners()
        {
            m_AutoBtn.AddListener(AutoButton);
        }
        protected override void OnPreOpen()
@@ -46,7 +49,9 @@
        protected override void OnAfterOpen()
        {
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//数据的刷新(h0418)
            GA_Player.s_OnRefreshLife += OnRefreshPlayerLifeBar;
            GA_Player.s_OnRefreshLife += OnRefreshPlayerLifeBar;
            HeroBehaviour.OnStopHandupAI += OnHeroHandupAIStopPassive;
            HeroBehaviour.OnStartHandupAI += OnHeroHandupAIStarted;
        }
       
@@ -54,13 +59,26 @@
        protected override void OnPreClose()
        {
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418)
            GA_Player.s_OnRefreshLife -= OnRefreshPlayerLifeBar;
            GA_Player.s_OnRefreshLife -= OnRefreshPlayerLifeBar;
            HeroBehaviour.OnStopHandupAI -= OnHeroHandupAIStopPassive;
            HeroBehaviour.OnStartHandupAI -= OnHeroHandupAIStarted;
        }
        protected override void OnAfterClose()
        {
        }
        protected override void LateUpdate()
        {
            if (PlayerDatas.Instance.hero.aiHandler.IsAuto())
            {
                m_AutoImg.SetActive(false);
            }
            else
            {
                m_AutoImg.SetActive(false);
            }
        }
        #endregion
        private void Updatefighting(PlayerDataRefresh _tCDBPlayerRefresh)
@@ -86,6 +104,45 @@
        private void OnRefreshPlayerLifeBar(uint _instanceId, ulong _hp, ulong _maxHp)
        {
            m_RoleInformation2.SetHeroHP((int)_maxHp,(int)_hp);
        }
        private void OnHeroHandupAIStopPassive()
        {
            if (!m_AutoImg.activeSelf)
            {
                m_AutoImg.SetActive(true);
            }
        }
        void OnHeroHandupAIStarted()
        {
            if (m_AutoImg.activeSelf)
            {
                m_AutoImg.SetActive(false);
            }
        }
        private void AutoButton()
        {
            var _hero = PlayerDatas.Instance.hero;
            if (_hero != null && !_hero.ActorInfo.serverDie)
            {
                if (!_hero.aiHandler.IsAuto())
                {
                    if (!WindowCenter.Instance.IsOpen<ExperienceOpenWin>())
                    {
                        WindowCenter.Instance.Open<ExperienceOpenWin>(true);
                    }
                    _hero.Behaviour.StartHandupAI();
                }
                else
                {
                    if (WindowCenter.Instance.IsOpen<ExperienceOpenWin>())
                    {
                        WindowCenter.Instance.CloseImmediately<ExperienceOpenWin>();
                    }
                    _hero.Behaviour.StopHandupAI();
                }
            }
            m_AutoImg.SetActive(!m_AutoImg.activeSelf);
        }
    }
System/Dungeon/DungeonFightWin.cs
@@ -74,7 +74,8 @@
            m_Inspire.gameObject.SetActive(false);
            m_Liquid.gameObject.SetActive(false);
            var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
            m_ExitDungeon.gameObject.SetActive(dataMapId != DemonJarModel.DEMONJAR_MAPID);
            m_ExitDungeon.gameObject.SetActive(dataMapId != DemonJarModel.DEMONJAR_MAPID
                && !CrossServerRewardModel.IsCrossServer());
            m_ContainerAncient.gameObject.SetActive(dataMapId == 31160);
            m_BossInfosContainer.gameObject.SetActive(dataMapId == ElderGodAreaModel.ELDERGODAREA_MAPID || dataMapId == BossHomeModel.BOSSHOME_MAPID);
            m_GatherSoulDungeonBehaviour.gameObject.SetActive(dataMapId == GatherSoulDungeonModel.DUNGEON_MAPID);
System/MainInterfacePanel/MainInterfaceWin.cs
@@ -247,6 +247,7 @@
            purchaseModel.UpdateNewMysticalEvent += UpdateMysticalPurchaseImag;
            fairyGrabBossModel.gotoBossStateUpdate += ShowFairyGrabBoss;
            ChatTip.OnChatUpEvent += RefreshAdaptiveChat;
            IsCrossServerOneVsOne();
        }
        private void CompletionOfTaskEvent(int obj)
@@ -1265,6 +1266,37 @@
            m_ContainerAdaptiveChat.sizeDelta = m_ContainerAdaptiveChat.sizeDelta.SetY(
                ChatTip.Inst.IsChatUp ? ChatTip.Inst.chatHighSize.y : ChatTip.Inst.chatLowSize.y);
        }
        private void IsCrossServerOneVsOne()
        {
            if (CrossServerRewardModel.IsCrossServer())//是否再跨服副本中
            {
                if (!WindowCenter.Instance.IsOpen("FightingPKWin"))
                {
                    WindowCenter.Instance.Open<FightingPKWin>();
                }
                m_HeadPortraitTip.gameObject.SetActive(false);
                CopyOfThePanel.gameObject.SetActive(false);
                _SwitchShowBtn.gameObject.SetActive(false);
                m_ChatTip.gameObject.SetActive(false);
                m_FunctionForecastTip.gameObject.SetActive(false);
                m_TaskSwithButton.gameObject.SetActive(false);
                if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//技能面板收起状态
                {
                    ShowCastSkill();//显示技能组,隐藏按钮组(强制切换)
                }
            }
            else
            {
                m_HeadPortraitTip.gameObject.SetActive(true);
                CopyOfThePanel.gameObject.SetActive(true);
                _SwitchShowBtn.gameObject.SetActive(true);
                m_ChatTip.gameObject.SetActive(true);
                m_FunctionForecastTip.gameObject.SetActive(true);
                m_TaskSwithButton.gameObject.SetActive(true);
            }
        }
    }
}