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

client_Wu Xijin

2019-03-30 fab0a9d927c4662816453f465071ae024ebb9e49

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

 Fight/Stage/MapEditor/Game/ClientSceneManager.cs

@@ -204,11 +204,14 @@
        m_TransferGroupList.Clear();

        ReConnectClear();

        m_MapData = null;
        TriggerHandler.OnEnter -= OnTriggerEnter;
        TriggerHandler.OnExit -= OnTriggerExit;

        m_Inited = false;
        IsClientFightMode = false;
        m_EventActorDict.Clear();
        m_EventHandlerDict.Clear();
    }

    public void ReConnectClear()

 Fight/Stage/StageLoadProcessor.cs

@@ -134,6 +134,7 @@
                        if (PlayerDatas.Instance.hero != null)
                        {
                            PlayerDatas.Instance.hero.Behaviour.StopHandupAI(true);
                            GAMgr.Instance.ServerDie(PlayerDatas.Instance.baseData.PlayerID);
                            GAMgr.Instance.Release(PlayerDatas.Instance.hero);
                            PlayerDatas.Instance.hero = null;
                        }

 System/Auction/AuctionInquiry.cs

@@ -9,25 +9,10 @@
//拍卖查询

namespace Snxxz.UI

{

    [XLua.Hotfix]
    public class QueryAuctionItem

    {

        public int Job;//职业，0为不限制

        public List<uint> ItemTypeList;//指定的物品类型

        public int ClassLV;//过滤阶数，0为不限制

        public List<uint> SpecItemIDList;//指定物品ID

        public string FromItemGUID;//从哪个物品开始查询

        public int QueryDir;//查询方向，1-往后查，2-往前查

        public int QueryCount;//查询个数，0为全部



    }

    public class AuctionInquiry : Singleton<AuctionInquiry>

    {

        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }

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

        public string locationGuid = string.Empty;

        public int GetInquiryIndex()//获取当前拍卖列表的索引类型

        {

@@ -51,72 +36,6 @@
            }

            // DebugEx.Log(sendNumber + "查询类型");

            return sendNumber;

        }

        public void SendQueryAuction(string itemGUID, int indexId, int queryDir, int queryCount = 10)//拍卖行查询拍卖中的物品(物品GUID，查询方向，查询个数)

        {

            var auctionIndex = AuctionIndexConfig.Get(indexId);

            if (auctionIndex == null)

            {

                DebugEx.LogError("拍卖索引表没有查到对应的ID" + indexId);

                return;

            }

            QueryAuctionItem queryAuctionItem = new QueryAuctionItem();

            queryAuctionItem.FromItemGUID = itemGUID;

            queryAuctionItem.Job = auctionIndex.Job;

            queryAuctionItem.ItemTypeList = new List<uint>();

            if (auctionIndex.ItemType != null && auctionIndex.ItemType.Length > 0)

            {

                for (int i = 0; i < auctionIndex.ItemType.Length; i++)

                {

                    queryAuctionItem.ItemTypeList.Add((uint)auctionIndex.ItemType[i]);

                }

            }

            queryAuctionItem.ClassLV = auctionIndex.Order;

            queryAuctionItem.SpecItemIDList = new List<uint>();

            if (auctionIndex.SpecItemID != null && auctionIndex.SpecItemID.Length > 0)

            {

                for (int i = 0; i < auctionIndex.SpecItemID.Length; i++)

                {

                    queryAuctionItem.SpecItemIDList.Add((uint)auctionIndex.SpecItemID[i]);

                }

            }

            queryAuctionItem.QueryDir = queryDir;

            queryAuctionItem.QueryCount = queryCount;

            SendQueryAuctionItem(queryAuctionItem);

        }



        public void JumpAuctionWin(string itemGUID)//邮件超链接跳转

        {

            if (model.FamilyAuctionItemDic.ContainsKey(itemGUID))

            {

                locationGuid = itemGUID;

                WindowCenter.Instance.Open<AuctionHouseWin>(true, 1);

            }

            else if (model.BiddingItemInfoDic.ContainsKey(itemGUID))

            {

                locationGuid = itemGUID;

                WindowCenter.Instance.Open<AuctionHouseWin>(true, 0);

            }

            else

            {

                SendQueryTagAuctionItem(itemGUID);

            }

        }


        private void SendQueryAuctionItem(QueryAuctionItem queryAuctionItem)//拍卖行查询拍卖中的物品

        {

            CB510_tagCGQueryAuctionItem cb510 = new CB510_tagCGQueryAuctionItem();

            cb510.Job = (byte)queryAuctionItem.Job;

            cb510.ItemTypeCount = (byte)queryAuctionItem.ItemTypeList.Count;

            cb510.ItemTypeList = queryAuctionItem.ItemTypeList.ToArray();

            cb510.ClassLV = (byte)queryAuctionItem.ClassLV;

            cb510.SpecItemIDCount = (byte)queryAuctionItem.SpecItemIDList.Count;

            cb510.SpecItemIDList = queryAuctionItem.SpecItemIDList.ToArray();

            cb510.FromItemGUID = queryAuctionItem.FromItemGUID;

            cb510.QueryDir = (byte)queryAuctionItem.QueryDir;

            cb510.QueryCount = (byte)queryAuctionItem.QueryCount;

            GameNetSystem.Instance.SendInfo(cb510);

        }

        public void SendQueryPlayerAuctionItem()// 拍卖行查询个人拍卖中的物品


 System/Auction/AuctionModel.cs

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

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

{

    public class AuctionModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

    {



        public string locationItemGuid { get; set; }



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



        public override void Init()

        {



        }



        public void OnBeforePlayerDataInitialize()

        {



        }



        public void OnPlayerLoginOk()

        {



        }



        public override void UnInit()

        {



        }



        public void SendInquiryServerAcution(int inquiryIndex, string guid, int inquiryDir, int inquiryCount = 10)

        {

            var inquiryConfig = AuctionIndexConfig.Get(inquiryIndex);



            if (inquiryConfig == null)

            {

                DebugEx.LogErrorFormat("不存在的查询Index:{0}", inquiryIndex);

                return;

            }



            uint[] itemTypes = null;

            if (inquiryConfig.ItemType != null

                && inquiryConfig.ItemType.Length > 0)

            {

                itemTypes = new uint[inquiryConfig.ItemType.Length];

                Array.Copy(inquiryConfig.ItemType, itemTypes, inquiryConfig.ItemType.Length);

            }



            uint[] specialItemIds = null;

            if (inquiryConfig.SpecItemID != null

                && inquiryConfig.SpecItemID.Length > 0)

            {

                specialItemIds = new uint[inquiryConfig.SpecItemID.Length];

                Array.Copy(inquiryConfig.SpecItemID, specialItemIds, inquiryConfig.SpecItemID.Length);

            }



            var pak = new CB510_tagCGQueryAuctionItem();

            pak.Job = (byte)inquiryConfig.Job;

            pak.ItemTypeCount = itemTypes == null ? (byte)0 : (byte)itemTypes.Length;

            pak.ItemTypeList = itemTypes == null ? new uint[0] : itemTypes;

            pak.ClassLV = (byte)inquiryConfig.Order;



            pak.SpecItemIDCount = specialItemIds == null ? (byte)0 : (byte)specialItemIds.Length;

            pak.SpecItemIDList = specialItemIds == null ? new uint[0] : specialItemIds;



            pak.FromItemGUID = guid;

            pak.QueryDir = (byte)inquiryDir;

            pak.QueryCount = (byte)inquiryCount;

            GameNetSystem.Instance.SendInfo(pak);

        }



        public void SendLocationServerItem(string guid)

        {

            var pak = new CB517_tagCGQueryTagAuctionItem();

            pak.ItemGUID = guid;

            GameNetSystem.Instance.SendInfo(pak);

        }



        public void LocationItemByGuid(string guid)

        {

            if (model.FamilyAuctionItemDic.ContainsKey(guid))

            {

                locationItemGuid = guid;

                WindowCenter.Instance.Open<AuctionHouseWin>(true, 1);

            }

            else if (model.BiddingItemInfoDic.ContainsKey(guid))

            {

                locationItemGuid = guid;

                WindowCenter.Instance.Open<AuctionHouseWin>(true, 0);

            }

            else

            {

                SendLocationServerItem(guid);

            }

        }

    }

}


 System/Auction/AuctionModel.cs.meta

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

 System/Auction/FamilyAuctionWin.cs

@@ -15,6 +15,8 @@
    public class FamilyAuctionWin : Window
    {

        [SerializeField] ScrollerController m_ScrollerControllerItem;



        AuctionModel auctionModel { get { return ModelCenter.Instance.GetModel<AuctionModel>(); } }

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

        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }
        List<AuctionItem> FamilyAuctionList = new List<AuctionItem>();
@@ -36,13 +38,13 @@

            var index = FamilyAuctionList.FindIndex((x) =>

             {

                 return x.itemGuid.Equals(AuctionInquiry.Instance.locationGuid);

                 return x.itemGuid.Equals(auctionModel.locationItemGuid);

             });
            if (index != -1)

            {

                m_ScrollerControllerItem.JumpIndex(index);

            }
            AuctionInquiry.Instance.locationGuid = string.Empty;
            auctionModel.locationItemGuid = string.Empty;
        }

        protected override void OnAfterOpen()

 System/Auction/FullServiceAuctionWin.cs

@@ -28,6 +28,8 @@
        [SerializeField] Text m_TypeTipText;



        List<string> m_ServerAuctionItems = new List<string>();//全服拍品列表



        AuctionModel auctionModel { get { return ModelCenter.Instance.GetModel<AuctionModel>(); } }

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

        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }



@@ -66,14 +68,14 @@
            OnCreateGridLineCellType(m_ScrollerControllerType);

            OnCreateGridLineCellItem(m_ScrollerControllerItem);



            var index = m_ServerAuctionItems.IndexOf(AuctionInquiry.Instance.locationGuid);

            var index = m_ServerAuctionItems.IndexOf(auctionModel.locationItemGuid);

            if (index != -1)

            {

                m_ScrollerControllerItem.JumpIndex(index);

            }



            model.LocationQuery = false;

            AuctionInquiry.Instance.locationGuid = string.Empty;

            auctionModel.locationItemGuid = string.Empty;


            SetTipText();
        }
@@ -312,12 +314,12 @@
        private void ResetServerAuctionInquiry()//重置查询

        {

            model.ResetServerAuctionInquiry();

            var sendNumber = AuctionInquiry.Instance.GetInquiryIndex();

            if (sendNumber != 0)

            var inquiryIndex = AuctionInquiry.Instance.GetInquiryIndex();

            if (inquiryIndex != 0)

            {

                if (!model.LocationQuery)

                {

                    AuctionInquiry.Instance.SendQueryAuction(string.Empty, sendNumber, 1);

                    auctionModel.SendInquiryServerAcution(inquiryIndex, string.Empty, 1);

                }

            }

        }

 System/Auction/FullServiceAuctioncell.cs

@@ -32,6 +32,8 @@


        [SerializeField] Button m_BiddingButton;//竞价按钮

        [SerializeField] TextEx m_JadeNumber2;



        AuctionModel auctionModel { get { return ModelCenter.Instance.GetModel<AuctionModel>(); } }

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

        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }

        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

@@ -79,7 +81,7 @@
            {

                if (inquiryIndex != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool)

                {

                    AuctionInquiry.Instance.SendQueryAuction(auctionItem.itemGuid, inquiryIndex, 2);

                    auctionModel.SendInquiryServerAcution(inquiryIndex, auctionItem.itemGuid, 2);

                    auctionHelpModel.Wait = false;

                }

            }

@@ -87,7 +89,7 @@
            {

                if (inquiryIndex != 0 && auctionHelpModel.Wait && model.QueryRemaining.DownBool && !auctionHelpModel.isOpenPanel)

                {

                    AuctionInquiry.Instance.SendQueryAuction(auctionItem.itemGuid, inquiryIndex, 1);

                    auctionModel.SendInquiryServerAcution(inquiryIndex, auctionItem.itemGuid, 1);

                    auctionHelpModel.Wait = false;

                }

            }


 System/MainInterfacePanel/IsShowXpButton.cs

@@ -9,9 +9,11 @@
using System.Collections.Generic;
using System;
//是否显示XP
namespace Snxxz.UI {
namespace Snxxz.UI
{

    public class IsShowXpButton:MonoBehaviour {
    public class IsShowXpButton : MonoBehaviour
    {
        [SerializeField] UIEffect m_UiEffect;
        List<int> ProhibitedToRelease = new List<int>();
        PlayerMainDate m_MainModel;
@@ -41,19 +43,25 @@
                return;
            }
            _XpSkill = SkillConfig.Get(SkillID);
            Skill _skill = PlayerDatas.Instance.hero.SkillMgr.Get(_XpSkill.SkillID);
            if (_skill.IsValid())
            if (_XpSkill != null)
            {
                if (!m_UiEffect.IsPlaying)
                if (PlayerDatas.Instance.hero != null)
                {
                    m_UiEffect.Play();
                }
            }
            else
            {
                if (m_UiEffect.IsPlaying)
                {
                    m_UiEffect.Stop();
                    Skill _skill = PlayerDatas.Instance.hero.SkillMgr.Get(_XpSkill.SkillID);
                    if (_skill.IsValid())
                    {
                        if (!m_UiEffect.IsPlaying)
                        {
                            m_UiEffect.Play();
                        }
                    }
                    else
                    {
                        if (m_UiEffect.IsPlaying)
                        {
                            m_UiEffect.Stop();
                        }
                    }
                }
            }
        }
@@ -107,7 +115,7 @@

        }

      

        private void StorageList()
        {
            if (ProhibitedToRelease.Count <= 0)

 System/Message/RichNormalEvent.cs

@@ -114,8 +114,7 @@
                    {

                        var guid = href.mSplits["auctionbidding"];

                        guid = guid.Trim('\"');

                        AuctionInquiry.Instance.JumpAuctionWin(guid);//定位查询

                        //--竞价

                        ModelCenter.Instance.GetModel<AuctionModel>().LocationItemByGuid(guid);

                    }

                }

                break;


 System/WindowBase/ModelCenter.cs

@@ -230,6 +230,7 @@
            RegisterModel<RuneResolveModel>();

            RegisterModel<ReikiRootModel>();

            RegisterModel<AuctionNewGetShowModel>();

            RegisterModel<AuctionModel>();

            inited = true;

        }