2355 【1.2】集市，翅膀筛选项问题

client_linchunjie

2018-11-13 3b0532558db4ea4c6d155cd8cb613ece34a18025

2355 【1.2】集市，翅膀筛选项问题

 Core/GameEngine/Model/Config/MarketConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Saturday, January 06, 2018
//    [  Date ]:           Tuesday, November 13, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -11,16 +11,15 @@
    
    public partial class MarketConfig : ConfigBase {

        public int type { get ; private set ; }
        public string name { get ; private set; } 
        public int limitLv { get ; private set ; }
        public int[] queryType;
        public int[] ChooseType;
        public string[] ChooseName;
        public int[] ChooseItem1;
        public int[] ChooseItem2;
        public int[] ChooseItem3;
        public string[] itemTypeName;
        public int type { get ; private set ; }

        public string name { get ; private set; } 
        public int limitLv { get ; private set ; }

        public int[] queryType;

        public string[] ChooseName;

        public int[] ChooseItem1;

        public int[] ChooseItem2;

        public int[] ChooseItem3;

        public string[] itemTypeName;

        public string[] itemTypeIcon;

        public override string getKey()
@@ -31,52 +30,45 @@
        public override void Parse() {
            try
            {
                type=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
			
                name = rawContents[1].Trim();
			
                limitLv=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
			
                type=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
			
                name = rawContents[1].Trim();

			
                limitLv=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
			
                string[] queryTypeStringArray = rawContents[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                queryType = new int[queryTypeStringArray.Length];
                for (int i=0;i<queryTypeStringArray.Length;i++)
                {
                     int.TryParse(queryTypeStringArray[i],out queryType[i]);
                }
			
                string[] ChooseTypeStringArray = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                ChooseType = new int[ChooseTypeStringArray.Length];
                for (int i=0;i<ChooseTypeStringArray.Length;i++)
                {
                     int.TryParse(ChooseTypeStringArray[i],out ChooseType[i]);
                }
			
                ChooseName = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
			
                string[] ChooseItem1StringArray = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                }

			
                ChooseName = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);

			
                string[] ChooseItem1StringArray = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                ChooseItem1 = new int[ChooseItem1StringArray.Length];
                for (int i=0;i<ChooseItem1StringArray.Length;i++)
                {
                     int.TryParse(ChooseItem1StringArray[i],out ChooseItem1[i]);
                }
			
                string[] ChooseItem2StringArray = rawContents[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                }

			
                string[] ChooseItem2StringArray = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                ChooseItem2 = new int[ChooseItem2StringArray.Length];
                for (int i=0;i<ChooseItem2StringArray.Length;i++)
                {
                     int.TryParse(ChooseItem2StringArray[i],out ChooseItem2[i]);
                }
			
                string[] ChooseItem3StringArray = rawContents[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                }

			
                string[] ChooseItem3StringArray = rawContents[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                ChooseItem3 = new int[ChooseItem3StringArray.Length];
                for (int i=0;i<ChooseItem3StringArray.Length;i++)
                {
                     int.TryParse(ChooseItem3StringArray[i],out ChooseItem3[i]);
                }
			
                itemTypeName = rawContents[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
			
                itemTypeIcon = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                }

			
                itemTypeName = rawContents[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);

			
                itemTypeIcon = rawContents[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            }
            catch (Exception ex)
            {

 Core/GameEngine/Model/Config/MarketConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 4c474987e54f6844b990bac5c188fc0b
timeCreated: 1515213657
timeCreated: 1542089923
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/Config/MarketQueryConfig.cs

New file
@@ -0,0 +1,46 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Tuesday, November 13, 2018
//--------------------------------------------------------

using UnityEngine;
using System;

namespace TableConfig {

    
    public partial class MarketQueryConfig : ConfigBase {

        public int queryType { get ; private set ; }

        public int[] ChooseType;

        public override string getKey()
        {
            return queryType.ToString();
        }

        public override void Parse() {
            try
            {
                queryType=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
			
                string[] ChooseTypeStringArray = rawContents[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                ChooseType = new int[ChooseTypeStringArray.Length];
                for (int i=0;i<ChooseTypeStringArray.Length;i++)
                {
                     int.TryParse(ChooseTypeStringArray[i],out ChooseType[i]);
                }
            }
            catch (Exception ex)
            {
                DebugEx.Log(ex);
            }
        }
	
    }

}





 Core/GameEngine/Model/Config/MarketQueryConfig.cs.meta

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

 Core/GameEngine/Model/ConfigManager.cs

@@ -203,6 +203,7 @@
        AddAsyncTask<TalentConfig>();

        AddAsyncTask<ChatBubbleBoxConfig>();

        AddAsyncTask<GuardConfig>();

        AddAsyncTask<MarketQueryConfig>();

        while (!AllCompleted())

        {

            var completedCount = 0;


 System/Market/MarketDealWin.cs

@@ -49,6 +49,11 @@
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<MarketModel>());

            }

        }



        RolePromoteModel promoteModel

        {

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

        }

        #region Built-in

        protected override void BindController()

        {

@@ -186,17 +191,24 @@
                                {

                                    if (fitterDic[type] >= 0)

                                    {

                                        ItemConfig cfg = Config.Instance.Get<ItemConfig>((int)list[i].ItemTypeID);

                                        if (cfg != null)

                                        var config = Config.Instance.Get<ItemConfig>((int)list[i].ItemTypeID);

                                        if (config != null)

                                        {

                                            if (cfg.LV != fitterDic[type]) throughFitter = false;

                                            if (!promoteModel.wingLv2GenerDict.ContainsKey(config.LV)

                                                || promoteModel.wingLv2GenerDict[config.LV] != fitterDic[type])

                                            {

                                                throughFitter = false;

                                            }

                                        }

                                    }

                                }

                                break;

                        }

                    }

                    if (!throughFitter) continue;

                    if (!throughFitter)

                    {

                        continue;

                    }

                    model.marketDealItems.Add(list[i]);

                }

                model.marketDealItems.Sort(Compare);

@@ -322,12 +334,22 @@
                OpenPwdFitterWin();

                return;

            }

            MarketConfig cfg = model.marketCfgDict[model.presentType];

            int type = cfg.ChooseType[id];

            MarketQueryConfig queryConfig = Config.Instance.Get<MarketQueryConfig>(model.presentItemType);

            int type = queryConfig.ChooseType[id];

            var config = model.marketCfgDict[model.presentType];

            int[] intarray = null;

            if (id == 0) intarray = cfg.ChooseItem1;

            else if (id == 1) intarray = cfg.ChooseItem2;

            else if (id == 2) intarray = cfg.ChooseItem3;

            if (id == 0)

            {

                intarray = config.ChooseItem1;

            }

            else if (id == 1)

            {

                intarray = config.ChooseItem2;

            }

            else if (id == 2)

            {

                intarray = config.ChooseItem3;

            }

            fitterTypeDic.Clear();

            presentFitterType = (MarketDealFitterType)type;

            presentFitterIndex = id;

@@ -348,7 +370,7 @@
                    break;

                case MarketDealFitterType.Quality:

                    {

                        if (model.presentItemType == cfg.queryType[0])

                        if (model.presentItemType == config.queryType[0])

                        {

                            fitterTypeDic.Add(-1, Language.Get("Market_Text_53"));

                            if (model.fitters != null)

@@ -512,23 +534,24 @@
            }

            else

            {

                MarketConfig cfg = model.marketCfgDict[model.presentType];

                MarketConfig config = model.marketCfgDict[model.presentType];

                MarketQueryConfig queryConfig = Config.Instance.Get<MarketQueryConfig>(model.presentItemType);

                fitterDic.Clear();

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

                {

                    if (i < cfg.ChooseType.Length)

                    if (i < queryConfig.ChooseType.Length)

                    {

                        if (cfg.ChooseType[i] != 0)

                        if (queryConfig.ChooseType[i] != 0)

                        {

                            fitterDic.Add((MarketDealFitterType)cfg.ChooseType[i], -1);

                            fitterDic.Add((MarketDealFitterType)queryConfig.ChooseType[i], -1);

                            m_FitterImgs[i].transform.parent.gameObject.SetActive(true);

                            switch ((MarketDealFitterType)cfg.ChooseType[i])

                            switch ((MarketDealFitterType)queryConfig.ChooseType[i])

                            {

                                case MarketDealFitterType.Password:

                                    m_FitterTxts[i].text = cfg.ChooseName[i];

                                    m_FitterTxts[i].text = config.ChooseName[i];

                                    break;

                                case MarketDealFitterType.Quality:

                                    if (model.presentItemType == cfg.queryType[0])

                                    if (model.presentItemType == config.queryType[0])

                                    {

                                        m_FitterTxts[i].text = Language.Get("Market_Text_53");

                                    }


 System/Market/MarketPutawayWin.cs

@@ -52,6 +52,7 @@
        {

            putawayItemCtrl.OnRefreshCell += OnRefreshPutawayItemCell;

            bagItemCtrl.OnRefreshCell += OnRefreshBagItemCell;

            bagItemCtrl.lockType = EnhanceLockType.KeepVertical;

        }



        protected override void AddListeners()