Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-10-30 042f11be8a7eb8ed31545a01e381b05e4f90e96d

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/FriendSystem/New/SocialModel.cs

New file
@@ -0,0 +1,57 @@
using System.Collections.Generic;



namespace Snxxz.UI

{

    public class SocialModel : Model,IBeforePlayerDataInitialize,IPlayerLoginOk

    {

        FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }



        public override void Init()

        {

          
        }



        public void OnBeforePlayerDataInitialize()

        {

            selectType = SocialType.Union;

        }



        public void OnPlayerLoginOk()

        {



        }



        public override void UnInit()

        {

          
        }

        public SocialType selectType { get; private set;}

        public void SetDefaultSelectTitle()

        {

            if(friendsModel.redpointSocial.state != RedPointState.None)

            {

                selectType = SocialType.XianYuan;

            }

            else if(ChatCtrl.Inst.GetSocialChatRedpoint(ChatInfoType.Team) != RedPointState.None)

            {

                selectType = SocialType.Team;

            }

            else if (ChatCtrl.Inst.GetSocialChatRedpoint(ChatInfoType.Fairy) != RedPointState.None)

            {

                selectType = SocialType.Union;

            }

        }



        public void UpdateSelectTitle(SocialType type)

        {

            selectType = type;

        }

        //与functionOrder对应

        public enum SocialType

        {

            Union = 0, //仙盟

            XianYuan = 1, //仙缘

            Team = 2, //队伍

        }

    }

}


 System/FriendSystem/New/SocialModel.cs.meta

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

 System/FriendSystem/New/SocialWin.cs

@@ -14,6 +14,8 @@
        [SerializeField] GameObject friendTipsObj;

        [SerializeField] ChatSendComponent m_ChatSend;



        SocialModel socialModel { get { return ModelCenter.Instance.GetModel<SocialModel>(); } }



        protected override void BindController()

        {



@@ -28,12 +30,17 @@


        protected override void OnPreOpen()

        {

            socialModel.SetDefaultSelectTitle();

            m_ChatSend.parent = this;

        }



        protected override void OnActived()

        {

            base.OnActived();

            if(!WindowJumpMgr.Instance.IsJumpState)

            {

                functionOrder = (int)socialModel.selectType;

            }

            btnGroup.TriggerByOrder(functionOrder);

        }



@@ -57,6 +64,7 @@


        private void ClickXianYuanBtn()

        {

            socialModel.UpdateSelectTitle(SocialModel.SocialType.XianYuan);

            CloseChild();

            friendTipsObj.SetActive(true);

            functionOrder = xianyuanBtn.order;

@@ -64,6 +72,7 @@


        private void TeamChat()

        {

            socialModel.UpdateSelectTitle(SocialModel.SocialType.Team);

            CloseChild();

            WindowCenter.Instance.Open<TeamChatWin>();

            functionOrder = m_TeamChat.order;

@@ -71,6 +80,7 @@


        private void FairyChat()

        {

            socialModel.UpdateSelectTitle(SocialModel.SocialType.Union);

            CloseChild();

            WindowCenter.Instance.Open<FairyChatWin>();

            functionOrder = m_FairyChat.order;


 System/WindowBase/ModelCenter.cs

@@ -201,6 +201,7 @@
            RegisterModel<FairyFeastModel>();

            RegisterModel<WishingPoolModel>();

            RegisterModel<RolePointModel>();

            RegisterModel<SocialModel>();

            inited = true;

        }