8536 【前端】协助伤害增加菜单 -优化组队

hch

2020-10-10 40d3270ff952af54c0a3630fca878bf7a24d7fdd

8536 【前端】协助伤害增加菜单 -优化组队

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -25,6 +25,7 @@
        [SerializeField] FunctionForecastTip m_FunctionForecastTip;//功能预告

        [SerializeField] FairyLeagueRemindBehaviour m_FairyLeagueRemind;

        [SerializeField] TeamInvitationEntrance m_TeamInvitationEntrance;

        [SerializeField] TeamApplyEntrance m_TeamApplyEntrance;

        [SerializeField] MapSwitchingBehaviour m_MapSwitchingBehaviour;

        [SerializeField] DungeonBossBriefInfoContainer m_BossBriefInfos;

        [SerializeField] RightBottomFadeInOut m_RightBottomFadeInOut;

@@ -100,6 +101,7 @@
            m_TaskListTip.Init();

            m_TopRightTip.Init();

            m_TeamInvitationEntrance.Init();

            m_TeamApplyEntrance.Init();

            m_MapSwitchingBehaviour.Init();

            m_FairyLeagueRemind.Init();

            m_MainButtonMisc.Init();

@@ -196,6 +198,7 @@
            m_TopRightTip.UnInit();

            m_FunctionForecastTip.Unit();

            m_TeamInvitationEntrance.UnInit();

            m_TeamApplyEntrance.UnInit();

            m_AssistBehaviour.UnInit();

            m_FairyLeagueRemind.UnInit();

            m_MainButtonMisc.UnInit();


 System/Team/MyTeamWin.cs

@@ -217,7 +217,7 @@


        private void ViewApplicationList()

        {

            if (model.myTeam.iamCaptainer)

            if (model.myTeam.iamCaptainer || model.applications.Count > 0)

            {

                WindowCenter.Instance.Open<TeamApplicationWin>();

            }

@@ -276,8 +276,9 @@


            var able = model.myTeam.iamCaptainer;



            m_ApplicationIcon.gray = !able;

            m_ApplicationText.colorType = able ? TextColType.NavyBrown : TextColType.White;

            //非队长情况也可以 同意申请入队（目前用于boss伤害列表）

            m_ApplicationIcon.gray = !able && model.applications.Count == 0;

            m_ApplicationText.colorType = !m_ApplicationIcon.gray ? TextColType.NavyBrown : TextColType.White;



            m_WorldInviteInTeam.gameObject.SetActive(able);

            m_WorldInviteNoTeam.gameObject.SetActive(!able);


 System/Team/TeamApplicationWin.cs

@@ -84,6 +84,10 @@
        private void ShowApplications()
        {
            m_ApplicationList.Init(model.applications);
            if (model.applications.Count == 0)
            {
                CloseClick();
            }
        }

    }

 System/Team/TeamApplyEntrance.cs

New file
@@ -0,0 +1,55 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Wednesday, October 18, 2017
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;

namespace Snxxz.UI
{

    public class TeamApplyEntrance : MonoBehaviour
    {
        [SerializeField] Button m_ApplyList;

        TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }

        public void Init()
        {
            OnApplyChange();

            m_ApplyList.RemoveAllListeners();
            m_ApplyList.AddListener(OpenInvitations);
            model.applicationsChangeEvent += OnApplyChange;
        }

        public void UnInit()
        {
            model.applicationsChangeEvent -= OnApplyChange;
        }

        private void OpenInvitations()
        {
            WindowCenter.Instance.Open<TeamApplicationWin>();

        }

        private void OnApplyChange()
        {
            if (CrossServerUtility.IsCrossServer() || ClientCrossServerOneVsOne.isClientCrossServerOneVsOne)
            {
                m_ApplyList.gameObject.SetActive(false);
            }
            else
            {
                m_ApplyList.gameObject.SetActive(model.applications.Count > 0);
            }
        }

    }

}




 System/Team/TeamApplyEntrance.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 76e9480a487954543974448455e023b8
timeCreated: 1602310934
licenseType: Free
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/Team/TeamModel.cs

@@ -184,7 +184,8 @@
        public event Action memberPrepareStateChangeEvent;



        Redpoint entranceRedpoint = new Redpoint(27);

        Redpoint applicationRedpoint = new Redpoint(27, 2701);

        Redpoint applyRedpoint = new Redpoint(27, 2702);

        public Redpoint applicationRedpoint = new Redpoint(2702, 2701);

        Redpoint invitationRedpoint = new Redpoint(28);

        Redpoint memberCountRedpoint = new Redpoint(34);




 System/Tip/PlayerDetailWin.cs

@@ -308,7 +308,16 @@
                    }
                    else
                    {
                        m_TeamModel.RequestApplyForJoin(PlayerDetails.PlayerID);
                        if (PlayerDetails.openType == PlayerDetails.OpenType.Assist && 
                        PlayerDetails.IsInTeam == 1)
                        {
                            //此处代表队伍ID
                            m_TeamModel.RequestApplyForJoinByTeam(PlayerDetails.PlayerID);
                        }
                        else
                        {
                            m_TeamModel.RequestApplyForJoin(PlayerDetails.PlayerID);
                        }
                    }
                    break;
                case PlayerDetails.DetailType.InviteTeam: