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

client_Zxw

2018-08-30 e1f99405deab2a7b50ec59bbdc7e997a468a8ed0

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

 Core/NetworkPackage/ClientPack/ClientToGameServer/CAC_Activity/CAC05_tagCGCallupFamilyMemberToBoss.cs

New file
@@ -0,0 +1,18 @@
using UnityEngine;

using System.Collections;



// AC 05 召集仙盟成员打boss #tagCGCallupFamilyMemberToBoss



public class CAC05_tagCGCallupFamilyMemberToBoss : GameNetPackBasic {

    public uint NPCID;



    public CAC05_tagCGCallupFamilyMemberToBoss () {

        combineCmd = (ushort)0x1801;

        _cmd = (ushort)0xAC05;

    }



    public override void WriteToBytes () {

        WriteBytes (NPCID, NetDataType.DWORD);

    }



}


 Core/NetworkPackage/ClientPack/ClientToGameServer/CAC_Activity/CAC05_tagCGCallupFamilyMemberToBoss.cs.meta

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

 System/Activity/ActivityModel.cs

@@ -282,12 +282,6 @@
                }

            }



            switch ((DailyQuestType)type)

            {

                case DailyQuestType.FairyGrabBoss:

                    return false;

            }



            int entertimes = dailyQuestModel.GetDailyQuestCompletedTimes(type);

            if (dailyQuestModel.GetDailyQuestTotalTimes(cfg.ID) <= entertimes)

            {


 System/FairyAu/FairyCallMemberBehaviour.cs

New file
@@ -0,0 +1,88 @@
using System;

using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;



namespace Snxxz.UI

{

    public class FairyCallMemberBehaviour : MonoBehaviour

    {

        [SerializeField] Button m_CallMember;



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



        private void Awake()

        {

            m_CallMember.AddListener(CallMember);

        }



        private void OnEnable()

        {

            model.bossGrabHintEvent += BossGrabHintEvent;

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;

            Display();

        }



        private void OnDisable()

        {

            model.bossGrabHintEvent -= BossGrabHintEvent;

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;

        }



        private void BossGrabHintEvent()

        {

            Display();

        }



        private void OnRefreshFairyInfo()

        {

            Display();

        }



        void Display()

        {

            m_CallMember.gameObject.SetActive(CheckCallMember());

        }



        bool CheckCallMember()

        {

            if (PlayerDatas.Instance.baseData.Family == 0

                || !model.grabBossHintOpen)

            {

                return false;

            }

            var fairyMember = PlayerDatas.Instance.fairyData.mine;

            if (fairyMember == null || fairyMember.LV < model.callMemberDuty)

            {

                return false;

            }

            return true;

        }



        private void CallMember()

        {

            var bossId = 0;

            var list = GAMgr.Instance.GetTypeList(E_ActorClassType.NpcFightBoss);

            if (list != null)

            {

                for (int i = 0; i < list.Count; i++)

                {

                    GA_NpcFightBoss bossActor = list[i] as GA_NpcFightBoss;

                    if (bossActor != null && model.bosses.Contains(bossActor.NpcConfig.NPCID))

                    {

                        bossId = bossActor.NpcConfig.NPCID;

                        break;

                    }

                }

            }

            if (bossId != 0)

            {

                CAC05_tagCGCallupFamilyMemberToBoss pak = new CAC05_tagCGCallupFamilyMemberToBoss();

                pak.NPCID = (uint)bossId;

                GameNetSystem.Instance.SendInfo(pak);

            }

        }

    }

}


 System/FairyAu/FairyCallMemberBehaviour.cs.meta

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

 System/FairyAu/FairyGrabBossModel.cs

@@ -73,6 +73,9 @@
        }

        public bool grabBossHintOpen { get; private set; }



        public int callMemberDuty { get; private set; }

        public int callMemberSeconds { get; private set; }



        private bool serverInited = false;

        private DateTime lastQueryProgressTime = DateTime.Now;



@@ -162,6 +165,11 @@
        public void RecheckGrabBoss()

        {

            if (!InActivityTime)

            {

                CloseGrabBossHint();

                return;

            }

            if (PlayerDatas.Instance.hero == null)

            {

                CloseGrabBossHint();

                return;

@@ -264,6 +272,10 @@
                }

                dropItemDict.Add(configs[i].NPCID, list);

            }



            var config = Config.Instance.Get<FuncConfigConfig>("FairyCallMember");

            callMemberSeconds = int.Parse(config.Numerical1);

            callMemberDuty = int.Parse(config.Numerical2);

        }



        public bool TryGetDropItems(int bossId, out List<Item> dropItems)