snxxz_scripts.git

parent: 69592dca | 补丁 | 提交 | ignore whitespace

client_Wu Xijin

2019-04-01 e7fb1027df9ede9f7bf9e9d6cc35fd8148e65933

6409 【前端】【2.0】装备评分

2个文件已删除

5个文件已修改

	Core/GameEngine/Model/Config/EquipGSParamConfig.cs	118 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/TelPartialConfig/tagEquipGSParamConfig.cs	41 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Lua/Gen/EquipGSParamConfigWrap.cs	1015 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Lua/Gen/EquipGSParamConfigWrap.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Lua/Gen/XLuaGenAutoRegister.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/ItemLogicUtility.cs	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/GameEngine/Model/Config/EquipGSParamConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------

//    [Author]:           Fish

//    [  Date ]:           Thursday, February 14, 2019

//    [  Date ]:           Monday, April 01, 2019

//--------------------------------------------------------



using System.Collections.Generic;

@@ -16,46 +16,20 @@
    public readonly int ID;

    public readonly int EquipClass;

    public readonly int EquipColor;

    public readonly int EquipStar;

    public readonly int AtkPerC;

    public readonly int DamagePerC;

    public readonly int SuperHitRateC;

    public readonly int IsSuit;

    public readonly int BaseEquipMaxHPAddPerC;

    public readonly int BaseEquipAtkAddPerC;

    public readonly int SuperHitC;

    public readonly int SuperHitPerC;

    public readonly int DamReduceC;

    public readonly int MaxHPPerC;

    public readonly int DefPerC;

    public readonly int LuckyHitRateC;

    public readonly int PetDamPerC;

    public readonly int LuckyHitRateReduceC;

    public readonly int LuckPerC;

    public readonly int PerLVAtkC;

    public readonly int MissRateC;

    public readonly int HitRateC;

    public readonly int DamBackPerC;

    public readonly int PerLVMaxHPC;

    public readonly int DropEquipPerC;

    public readonly int DropMoneyPerC;

    public readonly int IgnoreDefRateReduceC;

    public readonly int DamChanceDefC;

    public readonly int SuperHitReduceC;

    public readonly int SkillAtkRateC;

    public readonly int SpeedPerC;

    public readonly int AtkSpeedC;

    public readonly int SkillAtkRateReduceC;

    public readonly int HitC;

    public readonly int MissC;

    public readonly int SkillAddPerAC;

    public readonly int SkillAddPerBC;

    public readonly int SkillAddPerCC;

    public readonly int SkillAddPerDC;

    public readonly int SkillAddPerEC;

    public readonly int SkillAddPerFC;

    public readonly int SkillAddPerGC;

    public readonly int SkillReducePerAC;

    public readonly int SkillReducePerBC;

    public readonly int SkillReducePerCC;

    public readonly int SkillReducePerDC;

    public readonly int SkillReducePerEC;

    public readonly int SkillReducePerFC;

    public readonly int SkillReducePerGC;



    public EquipGSParamConfig()

    {

@@ -73,85 +47,33 @@


            int.TryParse(tables[2],out EquipColor); 



            int.TryParse(tables[3],out EquipStar); 
            int.TryParse(tables[3],out IsSuit); 


            int.TryParse(tables[4],out AtkPerC); 
            int.TryParse(tables[4],out BaseEquipMaxHPAddPerC); 


            int.TryParse(tables[5],out DamagePerC); 
            int.TryParse(tables[5],out BaseEquipAtkAddPerC); 


            int.TryParse(tables[6],out SuperHitRateC); 
            int.TryParse(tables[6],out SuperHitC); 


            int.TryParse(tables[7],out SuperHitPerC); 



            int.TryParse(tables[8],out DamReduceC); 
            int.TryParse(tables[8],out LuckyHitRateC); 


            int.TryParse(tables[9],out MaxHPPerC); 
            int.TryParse(tables[9],out LuckyHitRateReduceC); 


            int.TryParse(tables[10],out DefPerC); 
            int.TryParse(tables[10],out LuckPerC); 


            int.TryParse(tables[11],out LuckyHitRateC); 
            int.TryParse(tables[11],out PerLVAtkC); 


            int.TryParse(tables[12],out PetDamPerC); 
            int.TryParse(tables[12],out PerLVMaxHPC); 


            int.TryParse(tables[13],out PerLVAtkC); 
            int.TryParse(tables[13],out DropMoneyPerC); 


            int.TryParse(tables[14],out MissRateC); 
            int.TryParse(tables[14],out SuperHitReduceC); 


            int.TryParse(tables[15],out HitRateC); 
            int.TryParse(tables[15],out HitC); 


            int.TryParse(tables[16],out DamBackPerC); 


            int.TryParse(tables[17],out PerLVMaxHPC); 


            int.TryParse(tables[18],out DropEquipPerC); 


            int.TryParse(tables[19],out DropMoneyPerC); 


            int.TryParse(tables[20],out IgnoreDefRateReduceC); 


            int.TryParse(tables[21],out DamChanceDefC); 


            int.TryParse(tables[22],out SuperHitReduceC); 


            int.TryParse(tables[23],out SkillAtkRateC); 


            int.TryParse(tables[24],out SpeedPerC); 


            int.TryParse(tables[25],out AtkSpeedC); 


            int.TryParse(tables[26],out SkillAtkRateReduceC); 


            int.TryParse(tables[27],out HitC); 


            int.TryParse(tables[28],out MissC); 


            int.TryParse(tables[29],out SkillAddPerAC); 


            int.TryParse(tables[30],out SkillAddPerBC); 


            int.TryParse(tables[31],out SkillAddPerCC); 


            int.TryParse(tables[32],out SkillAddPerDC); 


            int.TryParse(tables[33],out SkillAddPerEC); 


            int.TryParse(tables[34],out SkillAddPerFC); 


            int.TryParse(tables[35],out SkillAddPerGC); 


            int.TryParse(tables[36],out SkillReducePerAC); 


            int.TryParse(tables[37],out SkillReducePerBC); 


            int.TryParse(tables[38],out SkillReducePerCC); 


            int.TryParse(tables[39],out SkillReducePerDC); 


            int.TryParse(tables[40],out SkillReducePerEC); 


            int.TryParse(tables[41],out SkillReducePerFC); 


            int.TryParse(tables[42],out SkillReducePerGC); 
            int.TryParse(tables[16],out MissC); 
        }

        catch (Exception ex)

        {


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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b14139202185e114e8c1b11ee6917430
timeCreated: 1550121197
timeCreated: 1554085324
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/TelPartialConfig/tagEquipGSParamConfig.cs

@@ -8,64 +8,33 @@


    public void OnConfigParseCompleted()

    {

        string key = StringUtility.Contact(EquipClass, EquipColor, EquipStar);

        string key = StringUtility.Contact(EquipClass, EquipColor, IsSuit);

        s_tagGSModelDict.Add(key, this);

    }



    public static EquipGSParamConfig GetGSModel(int lv, int color, int star)

    public static EquipGSParamConfig GetGSModel(int lv, int color, int isSuit)

    {

        string key = StringUtility.Contact(lv, color, star);

        string key = StringUtility.Contact(lv, color, isSuit);

        EquipGSParamConfig gsModel = null;

        s_tagGSModelDict.TryGetValue(key, out gsModel);

        return gsModel;

    }



    public static Dictionary<PropertyType, int> GetTagGsProValueDict(int lv, int color, int star)

    public static Dictionary<PropertyType, int> GetTagGsProValueDict(int lv, int color, int isSuit)

    {

        _tagGsProValueDict.Clear();

        EquipGSParamConfig gsModel = GetGSModel(lv, color, star);

        EquipGSParamConfig gsModel = GetGSModel(lv, color, isSuit);

        if (gsModel == null)

            return null;



        _tagGsProValueDict.Add(PropertyType.AtkPrecent, gsModel.AtkPerC);

        _tagGsProValueDict.Add(PropertyType.AddHurt, gsModel.DamagePerC);

        _tagGsProValueDict.Add(PropertyType.CritChance, gsModel.SuperHitRateC);

        _tagGsProValueDict.Add(PropertyType.CritHurtPrecent, gsModel.SuperHitPerC);

        _tagGsProValueDict.Add(PropertyType.ReduceHurt, gsModel.DamReduceC);

        _tagGsProValueDict.Add(PropertyType.HpPrecent, gsModel.MaxHPPerC);

        _tagGsProValueDict.Add(PropertyType.DefencePrecent, gsModel.DefPerC);

        _tagGsProValueDict.Add(PropertyType.HeartHit, gsModel.LuckyHitRateC);

        _tagGsProValueDict.Add(PropertyType.PetAddHurt, gsModel.PetDamPerC);

        _tagGsProValueDict.Add(PropertyType.EveryLvAddAtk, gsModel.PerLVAtkC);

        _tagGsProValueDict.Add(PropertyType.DodgePrecent, gsModel.MissRateC);

        _tagGsProValueDict.Add(PropertyType.HitPrecent, gsModel.HitRateC);

        _tagGsProValueDict.Add(PropertyType.HurtReflect, gsModel.DamBackPerC);

        _tagGsProValueDict.Add(PropertyType.EveryLvAddHp, gsModel.PerLVMaxHPC);

        _tagGsProValueDict.Add(PropertyType.AddEquipDropPrecent, gsModel.DropEquipPerC);

        _tagGsProValueDict.Add(PropertyType.AddCoinsPrecent, gsModel.DropMoneyPerC);

        _tagGsProValueDict.Add(PropertyType.DefyDefResis, gsModel.IgnoreDefRateReduceC);

        _tagGsProValueDict.Add(PropertyType.DefChance, gsModel.DamChanceDefC);

        _tagGsProValueDict.Add(PropertyType.CritResis, gsModel.SuperHitReduceC);

        _tagGsProValueDict.Add(PropertyType.SkillHurt, gsModel.SkillAtkRateC);

        _tagGsProValueDict.Add(PropertyType.MoveSpeedPrecent, gsModel.SpeedPerC);

        _tagGsProValueDict.Add(PropertyType.ATKSPEED, gsModel.AtkSpeedC);

        _tagGsProValueDict.Add(PropertyType.SkillHurtPrecent, gsModel.SkillAtkRateReduceC);

        _tagGsProValueDict.Add(PropertyType.HIT, gsModel.HitC);

        _tagGsProValueDict.Add(PropertyType.MISS, gsModel.MissC);

        _tagGsProValueDict.Add(PropertyType.SkillAddPerA, gsModel.SkillAddPerAC);

        _tagGsProValueDict.Add(PropertyType.SkillAddPerB, gsModel.SkillAddPerBC);

        _tagGsProValueDict.Add(PropertyType.SkillAddPerC, gsModel.SkillAddPerCC);

        _tagGsProValueDict.Add(PropertyType.SkillAddPerD, gsModel.SkillAddPerDC);

        _tagGsProValueDict.Add(PropertyType.SkillAddPerE, gsModel.SkillAddPerEC);

        _tagGsProValueDict.Add(PropertyType.SkillAddPerF, gsModel.SkillAddPerFC);

        _tagGsProValueDict.Add(PropertyType.SkillAddPerG, gsModel.SkillAddPerGC);

        _tagGsProValueDict.Add(PropertyType.SkillReducePerA, gsModel.SkillReducePerAC);

        _tagGsProValueDict.Add(PropertyType.SkillReducePerB, gsModel.SkillReducePerBC);

        _tagGsProValueDict.Add(PropertyType.SkillReducePerC, gsModel.SkillReducePerCC);

        _tagGsProValueDict.Add(PropertyType.SkillReducePerD, gsModel.SkillReducePerDC);

        _tagGsProValueDict.Add(PropertyType.SkillReducePerE, gsModel.SkillReducePerEC);

        _tagGsProValueDict.Add(PropertyType.SkillReducePerF, gsModel.SkillReducePerFC);

        _tagGsProValueDict.Add(PropertyType.SkillReducePerG, gsModel.SkillReducePerGC);

        return _tagGsProValueDict;

    }

}


 Lua/Gen/EquipGSParamConfigWrap.cs

File was deleted

 Lua/Gen/EquipGSParamConfigWrap.cs.meta

File was deleted

 Lua/Gen/XLuaGenAutoRegister.cs

@@ -218,9 +218,6 @@
            translator.DelayWrapLoader(typeof(EquipDeComposeConfig), EquipDeComposeConfigWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(EquipGSParamConfig), EquipGSParamConfigWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(EquipPlaceMapConfig), EquipPlaceMapConfigWrap.__Register);
        
        

 System/KnapSack/Logic/ItemLogicUtility.cs

@@ -301,7 +301,7 @@
            Equation.Instance.Clear();
            curEquipAttrDict.Clear();

            var GSProValueDict = EquipGSParamConfig.GetTagGsProValueDict(config.LV, config.ItemColor, config.StarLevel);
            var GSProValueDict = EquipGSParamConfig.GetTagGsProValueDict(config.LV, config.ItemColor, config.SuiteiD > 0 ? 1 : 0);
            foreach (var key in properties.Keys)
            {
                var attrType = (PropertyType)key;
@@ -335,16 +335,6 @@
                }
            }

            var gSParamModel = EquipGSParamConfig.GetGSModel(config.LV, config.ItemColor, config.StarLevel);
            if (gSParamModel != null)
            {
                Equation.Instance.AddKeyValue("AtkSpeedC", gSParamModel.AtkSpeedC);
            }
            else
            {
                Equation.Instance.AddKeyValue("AtkSpeedC", 0);
            }

            if (type == PackType.Deleted)
            {
                type = GeneralDefine.GetPackTypeByItemType(config.Type);
@@ -360,41 +350,6 @@
            }
        }

        private void ConvertAttrId(int attrId, int attrValue, Dictionary<int, int> keyValues)
        {
            switch ((PropertyType)attrId)
            {
                case PropertyType.ATK:
                    if (!keyValues.ContainsKey((int)PropertyType.MinAtk))
                    {
                        keyValues.Add(((int)PropertyType.MinAtk), attrValue);
                    }
                    else
                    {
                        keyValues[(int)PropertyType.MinAtk] += attrValue;
                    }

                    if (!keyValues.ContainsKey((int)PropertyType.MaxAtk))
                    {
                        keyValues.Add(((int)PropertyType.MaxAtk), attrValue);
                    }
                    else
                    {
                        keyValues[(int)PropertyType.MaxAtk] += attrValue;
                    }
                    break;
                default:
                    if (!keyValues.ContainsKey(attrId))
                    {
                        keyValues.Add(attrId, attrValue);
                    }
                    else
                    {
                        keyValues[attrId] += attrValue;
                    }
                    break;
            }
        }
        #endregion

        #region 主界面物品弹框展示

			@@ -1,6 +1,6 @@
			//--------------------------------------------------------
			// [Author]: Fish
			// [ Date ]: Thursday, February 14, 2019
			// [ Date ]: Monday, April 01, 2019
			//--------------------------------------------------------

			using System.Collections.Generic;
			@@ -16,46 +16,20 @@
			public readonly int ID;
			public readonly int EquipClass;
			public readonly int EquipColor;
			public readonly int EquipStar;
			public readonly int AtkPerC;
			public readonly int DamagePerC;
			public readonly int SuperHitRateC;
			public readonly int IsSuit;
			public readonly int BaseEquipMaxHPAddPerC;
			public readonly int BaseEquipAtkAddPerC;
			public readonly int SuperHitC;
			public readonly int SuperHitPerC;
			public readonly int DamReduceC;
			public readonly int MaxHPPerC;
			public readonly int DefPerC;
			public readonly int LuckyHitRateC;
			public readonly int PetDamPerC;
			public readonly int LuckyHitRateReduceC;
			public readonly int LuckPerC;
			public readonly int PerLVAtkC;
			public readonly int MissRateC;
			public readonly int HitRateC;
			public readonly int DamBackPerC;
			public readonly int PerLVMaxHPC;
			public readonly int DropEquipPerC;
			public readonly int DropMoneyPerC;
			public readonly int IgnoreDefRateReduceC;
			public readonly int DamChanceDefC;
			public readonly int SuperHitReduceC;
			public readonly int SkillAtkRateC;
			public readonly int SpeedPerC;
			public readonly int AtkSpeedC;
			public readonly int SkillAtkRateReduceC;
			public readonly int HitC;
			public readonly int MissC;
			public readonly int SkillAddPerAC;
			public readonly int SkillAddPerBC;
			public readonly int SkillAddPerCC;
			public readonly int SkillAddPerDC;
			public readonly int SkillAddPerEC;
			public readonly int SkillAddPerFC;
			public readonly int SkillAddPerGC;
			public readonly int SkillReducePerAC;
			public readonly int SkillReducePerBC;
			public readonly int SkillReducePerCC;
			public readonly int SkillReducePerDC;
			public readonly int SkillReducePerEC;
			public readonly int SkillReducePerFC;
			public readonly int SkillReducePerGC;

			public EquipGSParamConfig()
			{
			@@ -73,85 +47,33 @@

			int.TryParse(tables[2],out EquipColor);

			int.TryParse(tables[3],out EquipStar);
			int.TryParse(tables[3],out IsSuit);

			int.TryParse(tables[4],out AtkPerC);
			int.TryParse(tables[4],out BaseEquipMaxHPAddPerC);

			int.TryParse(tables[5],out DamagePerC);
			int.TryParse(tables[5],out BaseEquipAtkAddPerC);

			int.TryParse(tables[6],out SuperHitRateC);
			int.TryParse(tables[6],out SuperHitC);

			int.TryParse(tables[7],out SuperHitPerC);

			int.TryParse(tables[8],out DamReduceC);
			int.TryParse(tables[8],out LuckyHitRateC);

			int.TryParse(tables[9],out MaxHPPerC);
			int.TryParse(tables[9],out LuckyHitRateReduceC);

			int.TryParse(tables[10],out DefPerC);
			int.TryParse(tables[10],out LuckPerC);

			int.TryParse(tables[11],out LuckyHitRateC);
			int.TryParse(tables[11],out PerLVAtkC);

			int.TryParse(tables[12],out PetDamPerC);
			int.TryParse(tables[12],out PerLVMaxHPC);

			int.TryParse(tables[13],out PerLVAtkC);
			int.TryParse(tables[13],out DropMoneyPerC);

			int.TryParse(tables[14],out MissRateC);
			int.TryParse(tables[14],out SuperHitReduceC);

			int.TryParse(tables[15],out HitRateC);
			int.TryParse(tables[15],out HitC);

			int.TryParse(tables[16],out DamBackPerC);

			int.TryParse(tables[17],out PerLVMaxHPC);

			int.TryParse(tables[18],out DropEquipPerC);

			int.TryParse(tables[19],out DropMoneyPerC);

			int.TryParse(tables[20],out IgnoreDefRateReduceC);

			int.TryParse(tables[21],out DamChanceDefC);

			int.TryParse(tables[22],out SuperHitReduceC);

			int.TryParse(tables[23],out SkillAtkRateC);

			int.TryParse(tables[24],out SpeedPerC);

			int.TryParse(tables[25],out AtkSpeedC);

			int.TryParse(tables[26],out SkillAtkRateReduceC);

			int.TryParse(tables[27],out HitC);

			int.TryParse(tables[28],out MissC);

			int.TryParse(tables[29],out SkillAddPerAC);

			int.TryParse(tables[30],out SkillAddPerBC);

			int.TryParse(tables[31],out SkillAddPerCC);

			int.TryParse(tables[32],out SkillAddPerDC);

			int.TryParse(tables[33],out SkillAddPerEC);

			int.TryParse(tables[34],out SkillAddPerFC);

			int.TryParse(tables[35],out SkillAddPerGC);

			int.TryParse(tables[36],out SkillReducePerAC);

			int.TryParse(tables[37],out SkillReducePerBC);

			int.TryParse(tables[38],out SkillReducePerCC);

			int.TryParse(tables[39],out SkillReducePerDC);

			int.TryParse(tables[40],out SkillReducePerEC);

			int.TryParse(tables[41],out SkillReducePerFC);

			int.TryParse(tables[42],out SkillReducePerGC);
			int.TryParse(tables[16],out MissC);
			}
			catch (Exception ex)
			{

			@@ -1,6 +1,6 @@
			fileFormatVersion: 2
			guid: b14139202185e114e8c1b11ee6917430
			timeCreated: 1550121197
			timeCreated: 1554085324
			licenseType: Pro
			MonoImporter:
			serializedVersion: 2

			@@ -8,64 +8,33 @@

			public void OnConfigParseCompleted()
			{
			string key = StringUtility.Contact(EquipClass, EquipColor, EquipStar);
			string key = StringUtility.Contact(EquipClass, EquipColor, IsSuit);
			s_tagGSModelDict.Add(key, this);
			}

			public static EquipGSParamConfig GetGSModel(int lv, int color, int star)
			public static EquipGSParamConfig GetGSModel(int lv, int color, int isSuit)
			{
			string key = StringUtility.Contact(lv, color, star);
			string key = StringUtility.Contact(lv, color, isSuit);
			EquipGSParamConfig gsModel = null;
			s_tagGSModelDict.TryGetValue(key, out gsModel);
			return gsModel;
			}

			public static Dictionary<PropertyType, int> GetTagGsProValueDict(int lv, int color, int star)
			public static Dictionary<PropertyType, int> GetTagGsProValueDict(int lv, int color, int isSuit)
			{
			_tagGsProValueDict.Clear();
			EquipGSParamConfig gsModel = GetGSModel(lv, color, star);
			EquipGSParamConfig gsModel = GetGSModel(lv, color, isSuit);
			if (gsModel == null)
			return null;

			_tagGsProValueDict.Add(PropertyType.AtkPrecent, gsModel.AtkPerC);
			_tagGsProValueDict.Add(PropertyType.AddHurt, gsModel.DamagePerC);
			_tagGsProValueDict.Add(PropertyType.CritChance, gsModel.SuperHitRateC);
			_tagGsProValueDict.Add(PropertyType.CritHurtPrecent, gsModel.SuperHitPerC);
			_tagGsProValueDict.Add(PropertyType.ReduceHurt, gsModel.DamReduceC);
			_tagGsProValueDict.Add(PropertyType.HpPrecent, gsModel.MaxHPPerC);
			_tagGsProValueDict.Add(PropertyType.DefencePrecent, gsModel.DefPerC);
			_tagGsProValueDict.Add(PropertyType.HeartHit, gsModel.LuckyHitRateC);
			_tagGsProValueDict.Add(PropertyType.PetAddHurt, gsModel.PetDamPerC);
			_tagGsProValueDict.Add(PropertyType.EveryLvAddAtk, gsModel.PerLVAtkC);
			_tagGsProValueDict.Add(PropertyType.DodgePrecent, gsModel.MissRateC);
			_tagGsProValueDict.Add(PropertyType.HitPrecent, gsModel.HitRateC);
			_tagGsProValueDict.Add(PropertyType.HurtReflect, gsModel.DamBackPerC);
			_tagGsProValueDict.Add(PropertyType.EveryLvAddHp, gsModel.PerLVMaxHPC);
			_tagGsProValueDict.Add(PropertyType.AddEquipDropPrecent, gsModel.DropEquipPerC);
			_tagGsProValueDict.Add(PropertyType.AddCoinsPrecent, gsModel.DropMoneyPerC);
			_tagGsProValueDict.Add(PropertyType.DefyDefResis, gsModel.IgnoreDefRateReduceC);
			_tagGsProValueDict.Add(PropertyType.DefChance, gsModel.DamChanceDefC);
			_tagGsProValueDict.Add(PropertyType.CritResis, gsModel.SuperHitReduceC);
			_tagGsProValueDict.Add(PropertyType.SkillHurt, gsModel.SkillAtkRateC);
			_tagGsProValueDict.Add(PropertyType.MoveSpeedPrecent, gsModel.SpeedPerC);
			_tagGsProValueDict.Add(PropertyType.ATKSPEED, gsModel.AtkSpeedC);
			_tagGsProValueDict.Add(PropertyType.SkillHurtPrecent, gsModel.SkillAtkRateReduceC);
			_tagGsProValueDict.Add(PropertyType.HIT, gsModel.HitC);
			_tagGsProValueDict.Add(PropertyType.MISS, gsModel.MissC);
			_tagGsProValueDict.Add(PropertyType.SkillAddPerA, gsModel.SkillAddPerAC);
			_tagGsProValueDict.Add(PropertyType.SkillAddPerB, gsModel.SkillAddPerBC);
			_tagGsProValueDict.Add(PropertyType.SkillAddPerC, gsModel.SkillAddPerCC);
			_tagGsProValueDict.Add(PropertyType.SkillAddPerD, gsModel.SkillAddPerDC);
			_tagGsProValueDict.Add(PropertyType.SkillAddPerE, gsModel.SkillAddPerEC);
			_tagGsProValueDict.Add(PropertyType.SkillAddPerF, gsModel.SkillAddPerFC);
			_tagGsProValueDict.Add(PropertyType.SkillAddPerG, gsModel.SkillAddPerGC);
			_tagGsProValueDict.Add(PropertyType.SkillReducePerA, gsModel.SkillReducePerAC);
			_tagGsProValueDict.Add(PropertyType.SkillReducePerB, gsModel.SkillReducePerBC);
			_tagGsProValueDict.Add(PropertyType.SkillReducePerC, gsModel.SkillReducePerCC);
			_tagGsProValueDict.Add(PropertyType.SkillReducePerD, gsModel.SkillReducePerDC);
			_tagGsProValueDict.Add(PropertyType.SkillReducePerE, gsModel.SkillReducePerEC);
			_tagGsProValueDict.Add(PropertyType.SkillReducePerF, gsModel.SkillReducePerFC);
			_tagGsProValueDict.Add(PropertyType.SkillReducePerG, gsModel.SkillReducePerGC);
			return _tagGsProValueDict;
			}
			}

			@@ -218,9 +218,6 @@
			translator.DelayWrapLoader(typeof(EquipDeComposeConfig), EquipDeComposeConfigWrap.__Register);


			translator.DelayWrapLoader(typeof(EquipGSParamConfig), EquipGSParamConfigWrap.__Register);


			translator.DelayWrapLoader(typeof(EquipPlaceMapConfig), EquipPlaceMapConfigWrap.__Register);

			@@ -301,7 +301,7 @@
			Equation.Instance.Clear();
			curEquipAttrDict.Clear();

			var GSProValueDict = EquipGSParamConfig.GetTagGsProValueDict(config.LV, config.ItemColor, config.StarLevel);
			var GSProValueDict = EquipGSParamConfig.GetTagGsProValueDict(config.LV, config.ItemColor, config.SuiteiD > 0 ? 1 : 0);
			foreach (var key in properties.Keys)
			{
			var attrType = (PropertyType)key;
			@@ -335,16 +335,6 @@
			}
			}

			var gSParamModel = EquipGSParamConfig.GetGSModel(config.LV, config.ItemColor, config.StarLevel);
			if (gSParamModel != null)
			{
			Equation.Instance.AddKeyValue("AtkSpeedC", gSParamModel.AtkSpeedC);
			}
			else
			{
			Equation.Instance.AddKeyValue("AtkSpeedC", 0);
			}

			if (type == PackType.Deleted)
			{
			type = GeneralDefine.GetPackTypeByItemType(config.Type);
			@@ -360,41 +350,6 @@
			}
			}

			private void ConvertAttrId(int attrId, int attrValue, Dictionary<int, int> keyValues)
			{
			switch ((PropertyType)attrId)
			{
			case PropertyType.ATK:
			if (!keyValues.ContainsKey((int)PropertyType.MinAtk))
			{
			keyValues.Add(((int)PropertyType.MinAtk), attrValue);
			}
			else
			{
			keyValues[(int)PropertyType.MinAtk] += attrValue;
			}

			if (!keyValues.ContainsKey((int)PropertyType.MaxAtk))
			{
			keyValues.Add(((int)PropertyType.MaxAtk), attrValue);
			}
			else
			{
			keyValues[(int)PropertyType.MaxAtk] += attrValue;
			}
			break;
			default:
			if (!keyValues.ContainsKey(attrId))
			{
			keyValues.Add(attrId, attrValue);
			}
			else
			{
			keyValues[attrId] += attrValue;
			}
			break;
			}
			}
			#endregion

			#region 主界面物品弹框展示