3335 物品相关类型重构

client_Wu Xijin

2019-02-23 64d0668ab9be92adc9fa21106b8a5eaa027e212e

3335 物品相关类型重构

 Core/NetworkPackage/DTCFile/ClientPack.meta

File was deleted

 Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta

File was deleted

 Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta

File was deleted

 Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta

File was deleted

 Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta

File was deleted

 Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta

File was deleted

 Core/NetworkPackage/ServerPack/HAE_Truck.meta

File was deleted

 Core/NetworkPackage/ServerPack/HAF_Merge.meta

File was deleted

 Core/NetworkPackage/ServerPack/HB0_Event.meta

File was deleted

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -17,8 +17,6 @@


        Dictionary<int, Dictionary<int, string>> wingsLegendAttrColorDict { get; set; }



        public Dictionary<int, int> wingsLegendAttrCntPreviewDict { get; private set; } //key 阶数 value属性数

        public Dictionary<int, Dictionary<int, List<int>>> wingsLegendAttrValuePreviewDict { get; private set; } //key 阶数 value 属性ID 属性数值

        public Dictionary<int, Dictionary<LegendAttrType, List<int>>> dogzLegendAttrIDPreviewDict { get; private set; } // key 装备位 value 属性类型，属性ID

        public Dictionary<int, Dictionary<int, int>> dogzLegendAttrColorValuePreviewDict { get; private set; } // key 属性ID value 装备品质，属性数值

        Dictionary<string, Dictionary<LegendAttrType, int>> dogzLegendAttrCntPreviewDict { get; set; } // key 品质+星级  value 属性条目数

@@ -183,43 +181,6 @@
                        if (dogzlegendAttrColorData[attrID][i].IsArray)

                        {

                            legendValueDic.Add(int.Parse(dogzlegendAttrColorData[attrID][i][0].ToString()), int.Parse(dogzlegendAttrColorData[attrID][i][1].ToString()));

                        }

                    }

                }

            }



            FuncConfigConfig wingsLegendAtrrCntPreview = FuncConfigConfig.Get("WingLegendAttrCountPreview");

            JsonData wingsLegendAttrCntData = JsonMapper.ToObject(wingsLegendAtrrCntPreview.Numerical1);

            wingsLegendAttrCntPreviewDict = new Dictionary<int, int>();

            if (wingsLegendAttrCntData.IsArray)

            {

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

                {

                    JsonData data1 = wingsLegendAttrCntData[i];

                    if (wingsLegendAttrCntData[i].IsArray)

                    {

                        wingsLegendAttrCntPreviewDict.Add(int.Parse(wingsLegendAttrCntData[i][0].ToString())

                            , int.Parse(wingsLegendAttrCntData[i][1].ToString()));

                    }

                }

            }



            FuncConfigConfig wingsLegendAtrrValuePreview = FuncConfigConfig.Get("WingLegendAttrValuePreview");

            JsonData wingsLegendAttrValueData = JsonMapper.ToObject(wingsLegendAtrrValuePreview.Numerical1);

            wingsLegendAttrValuePreviewDict = new Dictionary<int, Dictionary<int, List<int>>>();

            foreach (var lv in wingsLegendAttrValueData.Keys)

            {

                Dictionary<int, List<int>> attrValueDic = new Dictionary<int, List<int>>();

                wingsLegendAttrValuePreviewDict.Add(int.Parse(lv.ToString()), attrValueDic);

                foreach (var attrId in wingsLegendAttrValueData[lv].Keys)

                {

                    List<int> attrValuelist = new List<int>();

                    attrValueDic.Add(int.Parse(attrId.ToString()), attrValuelist);

                    if (wingsLegendAttrValueData[lv][attrId].IsArray)

                    {

                        for (int i = 0; i < wingsLegendAttrValueData[lv][attrId].Count; i++)

                        {

                            attrValuelist.Add(int.Parse(wingsLegendAttrValueData[lv][attrId][i].ToString()));

                        }

                    }

                }

@@ -2171,13 +2132,15 @@
        #endregion



        #region 解锁背包格子数据

        public int OpenCount {

        public int OpenCount

        {

            get; private set;

        }



        public PackType packType { get; private set; }



        public int Index {

        public int Index

        {

            get; private set;

        }



@@ -3000,17 +2963,18 @@
        {

            ids = new List<int>();

            values = new List<int>();



            if (itemTipsModel.wingsLegendAttrValuePreviewDict.ContainsKey(itemConfig.LV))

            var level = itemConfig.LV;

            var count = LegendPropertyUtility.GetWingPropertyCount(level);

            var properties = LegendPropertyUtility.GetWingProperties(level);

            if (properties != null)

            {

                Dictionary<int, List<int>> attrIdDict = itemTipsModel.wingsLegendAttrValuePreviewDict[itemConfig.LV];

                foreach (var attrId in attrIdDict.Keys)

                for (var i = 0; ids.Count < count && i < properties.Count; i++)

                {

                    ids.Add(attrId);

                    values.Add(attrIdDict[attrId][0]);

                    var propertyId = properties[i];

                    ids.Add(propertyId);

                    values.Add(LegendPropertyUtility.GetWingPropertyValues(level, propertyId)[0]);

                }

            }



        }



        private void SetEquipLegendAttrPreview(out List<int> ids, out List<int> values)


 System/KnapSack/Logic/LegendPropertyUtility.cs

@@ -145,6 +145,21 @@
        return wingPropertyValue.GetMax(level, property);
    }

    public static bool HasWingProperties(int level)
    {
        return wingPropertyValue.Has(level);
    }

    public static List<int> GetWingProperties(int level)
    {
        return wingPropertyValue.GetProperties(level);
    }

    public static List<int> GetWingPropertyValues(int level, int property)
    {
        return wingPropertyValue.GetValues(level, property);
    }

    public class PropertyColor
    {
        Dictionary<int, Dictionary<int, string>> wingLegendPropertyColors = new Dictionary<int, Dictionary<int, string>>();
@@ -510,23 +525,26 @@

    public class WingPropertyValue
    {
        Dictionary<int, Dictionary<int, Int2>> levelPropertyValues = new Dictionary<int, Dictionary<int, Int2>>();
        Dictionary<int, Dictionary<int, List<int>>> levelPropertyValues = new Dictionary<int, Dictionary<int, List<int>>>();

        public WingPropertyValue()
        {
            var json = JsonMapper.ToObject(FuncConfigConfig.Get("WingLegendAttrValuePreview").Numerical1);
            foreach (var key in json.Keys)
            {
                var levelValues = new Dictionary<int, Int2>();
                var levelValues = new Dictionary<int, List<int>>();
                levelPropertyValues.Add(int.Parse(key), levelValues);

                var subJson = json[key];
                foreach (var propertyId in subJson.Keys)
                {
                    var count = subJson[propertyId].Count;
                    var min = (int)subJson[propertyId][0];
                    var max = (int)subJson[propertyId][count - 1];
                    levelValues[int.Parse(propertyId)] = new Int2(min, max);
                    var values = new List<int>();
                    levelValues[int.Parse(propertyId)] = values;
                    foreach (var item in subJson[propertyId].Keys)
                    {
                        values.Add((int)subJson[propertyId][item]);
                    }
                }
            }
        }
@@ -550,7 +568,7 @@
        {
            if (Has(level, propertyId))
            {
                return levelPropertyValues[level][propertyId].x;
                return levelPropertyValues[level][propertyId][0];
            }
            else
            {
@@ -562,7 +580,8 @@
        {
            if (Has(level, propertyId))
            {
                return levelPropertyValues[level][propertyId].y;
                var count = levelPropertyValues[level][propertyId].Count;
                return levelPropertyValues[level][propertyId][count - 1];
            }
            else
            {
@@ -570,6 +589,30 @@
            }
        }

        public List<int> GetProperties(int level)
        {
            if (Has(level))
            {
                return new List<int>(levelPropertyValues[level].Keys);
            }
            else
            {
                return null;
            }
        }

        public List<int> GetValues(int level, int propertyId)
        {
            if (Has(level, propertyId))
            {
                return levelPropertyValues[level][propertyId];
            }
            else
            {
                return null;
            }
        }

    }
}


 System/KnapSack/Logic/PackModelInterface.cs

@@ -294,23 +294,19 @@
            return properties;

        }



        private Dictionary<int, int> GetWingsLegendProperties(int itemId)

        public Dictionary<int, int> GetWingsLegendProperties(int itemId)

        {

            var config = ItemConfig.Get(itemId);

            int attrCnt = LegendPropertyUtility.GetWingPropertyCount(config.LV);

            var attrValueDict = itemTipsModel.wingsLegendAttrValuePreviewDict;

            var properties = new Dictionary<int, int>();

            if (attrValueDict.ContainsKey(config.LV))

            var level = config.LV;

            var count = LegendPropertyUtility.GetWingPropertyCount(level);

            var ids = LegendPropertyUtility.GetWingProperties(level);

            if (ids != null)

            {

                var attrIdDict = attrValueDict[config.LV];

                foreach (var attrId in attrIdDict.Keys)

                for (var i = 0; properties.Count < count && i < properties.Count; i++)

                {

                    if (properties.Count >= attrCnt)

                    {

                        break;

                    }



                    properties[attrId] = attrIdDict[attrId][0];

                    var propertyId = ids[i];

                    properties[propertyId] = LegendPropertyUtility.GetWingPropertyValues(level, propertyId)[0];

                }

            }




 System/MainInterfacePanel/MainButtonMisc.cs

@@ -285,7 +285,7 @@
                if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error))

                {

                    var bossInfoConfig = BossInfoConfig.Get(fairyGrabBossModel.cacheGotoBossId);

                    var flyItemCount = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.rptItem, GeneralDefine.flyBootItemId);

                    var flyItemCount = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.Item, GeneralDefine.flyBootItemId);

                    var freeFly = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0;

                    if (bossInfoConfig != null)

                    {