From 70bda4c2b79cd0972c63aaf5fac29dd6b6e7f5bb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 29 三月 2019 15:23:48 +0800
Subject: [PATCH] 6410 【后端】【2.0】装备评分

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py |   73 +++++++++--------
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py             |    1 
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py           |  118 +++++------------------------
 PySysDB/PySysDBPY.h                                                                            |   38 +--------
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py                |    1 
 5 files changed, 67 insertions(+), 164 deletions(-)

diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index 9268dbb..60713c1 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -611,46 +611,20 @@
 {
 	BYTE		_ClassLV;		// 装备阶级
 	BYTE		_EquipColor;	// 装备颜色
-	BYTE		_EquipQualityLV;	// 装备星级
-	DWORD		AtkPerC;		// 攻击百分比系数
-	DWORD		DamagePerC;	// 增加伤害系数
-	DWORD		SuperHitRateC;	// 暴击率系数
+	BYTE		_IsSuit;	// 是否套装
+	DWORD		BaseEquipMaxHPAddPerC;	// 基础防具生命百分比系数
+	DWORD		BaseEquipAtkAddPerC;	// 基础武器攻击百分比系数
+	DWORD		SuperHitC;	// 暴击值系数
 	DWORD		SuperHitPerC;	// 暴击值百分比系数
-	DWORD		DamReducePerC;	// 减少伤害系数
-	DWORD		MaxHPPerC;	// 生命上限百分比系数
-	DWORD		DefPerC;		// 防御力百分比系数
 	DWORD		LuckyHitRateC;	// 会心一击率系数
-	DWORD		PetDamPerC;	// 灵宠伤害增加百分比系数
+	DWORD		LuckyHitRateReduceC;	// 会心一击抗性系数
+	DWORD		LuckPerC;	// 气运百分比系数
 	DWORD		PerLVAtkC;	// 每级增加攻击力系数
-	DWORD		MissRateC;	// 闪避值百分比系数
-	DWORD		HitRateC;		// 命中力百分比系数
-	DWORD		DamBackPerC;	// 伤害反射百分比系数
 	DWORD		PerLVMaxHPC;	// 每级增加生命值系数
-	DWORD		DropEquipPerC;	// 增加装备掉落几率系数
 	DWORD		DropMoneyPerC;	// 增加掉落金币量百分比系数
-	DWORD		IgnoreDefRateReduceC;	// 无视防御抗性百分比系数
-	DWORD		DamChanceDefC;	// 抵御百分比系数
 	DWORD		SuperHitReduceC;	// 暴击抗性百分比系数
-	DWORD		SkillAtkRateC;	// 技能伤害百分比系数
-	DWORD		SpeedPerC;	// 移动速度百分比系数
-	DWORD		AtkSpeedC;	// 攻击速度系数
-	DWORD		SkillAtkRateReduceC;	// 技能减伤百分比系数
 	DWORD		HitC;	// 命中系数
 	DWORD		MissC;	// 闪避系数
-	DWORD		SkillAddPer1C;	// 技能伤害增强1系数
-	DWORD		SkillAddPer2C;	// 技能伤害增强2系数
-	DWORD		SkillAddPer3C;	// 技能伤害增强3系数
-	DWORD		SkillAddPer4C;	// 技能伤害增强4系数
-	DWORD		SkillAddPer5C;	// 技能伤害增强5系数
-	DWORD		SkillAddPer6C;	// 技能伤害增强6系数
-	DWORD		SkillAddPer7C;	// 技能伤害增强7系数
-	DWORD		SkillReducePer1C;	// 受到技能伤害减少1系数
-	DWORD		SkillReducePer2C;	// 受到技能伤害减少2系数
-	DWORD		SkillReducePer3C;	// 受到技能伤害减少3系数
-	DWORD		SkillReducePer4C;	// 受到技能伤害减少4系数
-	DWORD		SkillReducePer5C;	// 受到技能伤害减少5系数
-	DWORD		SkillReducePer6C;	// 受到技能伤害减少6系数
-	DWORD		SkillReducePer7C;	// 受到技能伤害减少7系数
 };
 
 //成就表
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 0643e8f..94cfe5a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -4125,6 +4125,7 @@
     ShareDefine.Def_Effect_AddAtkByPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
     ShareDefine.Def_Effect_SuperHitPer:[[TYPE_Calc_SuperHit], False, TYPE_NoLinear],
     ShareDefine.Def_Effect_SpeedPer:[[TYPE_Calc_AttrSpeed], False, TYPE_NoLinear],
+    ShareDefine.Def_Effect_LuckPer:[[TYPE_Calc_Luck], False, TYPE_NoLinear],
     ShareDefine.Def_Effect_IceAtkPer:[[TYPE_Calc_AttrIceAtk], False, TYPE_NoLinear],
     ShareDefine.Def_Effect_IceDefPer:[[TYPE_Calc_AttrIceDef], False, TYPE_NoLinear],
     #ShareDefine.Def_Effect_AddAtkByPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 3221f97..6eb9f28 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -509,46 +509,20 @@
                 "EquipGSParam":(
                         ("BYTE", "ClassLV", 1),
                         ("BYTE", "EquipColor", 1),
-                        ("BYTE", "EquipQualityLV", 1),
-                        ("DWORD", "AtkPerC", 0),
-                        ("DWORD", "DamagePerC", 0),
-                        ("DWORD", "SuperHitRateC", 0),
+                        ("BYTE", "IsSuit", 1),
+                        ("DWORD", "BaseEquipMaxHPAddPerC", 0),
+                        ("DWORD", "BaseEquipAtkAddPerC", 0),
+                        ("DWORD", "SuperHitC", 0),
                         ("DWORD", "SuperHitPerC", 0),
-                        ("DWORD", "DamReducePerC", 0),
-                        ("DWORD", "MaxHPPerC", 0),
-                        ("DWORD", "DefPerC", 0),
                         ("DWORD", "LuckyHitRateC", 0),
-                        ("DWORD", "PetDamPerC", 0),
+                        ("DWORD", "LuckyHitRateReduceC", 0),
+                        ("DWORD", "LuckPerC", 0),
                         ("DWORD", "PerLVAtkC", 0),
-                        ("DWORD", "MissRateC", 0),
-                        ("DWORD", "HitRateC", 0),
-                        ("DWORD", "DamBackPerC", 0),
                         ("DWORD", "PerLVMaxHPC", 0),
-                        ("DWORD", "DropEquipPerC", 0),
                         ("DWORD", "DropMoneyPerC", 0),
-                        ("DWORD", "IgnoreDefRateReduceC", 0),
-                        ("DWORD", "DamChanceDefC", 0),
                         ("DWORD", "SuperHitReduceC", 0),
-                        ("DWORD", "SkillAtkRateC", 0),
-                        ("DWORD", "SpeedPerC", 0),
-                        ("DWORD", "AtkSpeedC", 0),
-                        ("DWORD", "SkillAtkRateReduceC", 0),
                         ("DWORD", "HitC", 0),
                         ("DWORD", "MissC", 0),
-                        ("DWORD", "SkillAddPer1C", 0),
-                        ("DWORD", "SkillAddPer2C", 0),
-                        ("DWORD", "SkillAddPer3C", 0),
-                        ("DWORD", "SkillAddPer4C", 0),
-                        ("DWORD", "SkillAddPer5C", 0),
-                        ("DWORD", "SkillAddPer6C", 0),
-                        ("DWORD", "SkillAddPer7C", 0),
-                        ("DWORD", "SkillReducePer1C", 0),
-                        ("DWORD", "SkillReducePer2C", 0),
-                        ("DWORD", "SkillReducePer3C", 0),
-                        ("DWORD", "SkillReducePer4C", 0),
-                        ("DWORD", "SkillReducePer5C", 0),
-                        ("DWORD", "SkillReducePer6C", 0),
-                        ("DWORD", "SkillReducePer7C", 0),
                         ),
 
                 "Success":(
@@ -2399,90 +2373,38 @@
     def __init__(self):
         self.ClassLV = 0
         self.EquipColor = 0
-        self.EquipQualityLV = 0
-        self.AtkPerC = 0
-        self.DamagePerC = 0
-        self.SuperHitRateC = 0
+        self.IsSuit = 0
+        self.BaseEquipMaxHPAddPerC = 0
+        self.BaseEquipAtkAddPerC = 0
+        self.SuperHitC = 0
         self.SuperHitPerC = 0
-        self.DamReducePerC = 0
-        self.MaxHPPerC = 0
-        self.DefPerC = 0
         self.LuckyHitRateC = 0
-        self.PetDamPerC = 0
+        self.LuckyHitRateReduceC = 0
+        self.LuckPerC = 0
         self.PerLVAtkC = 0
-        self.MissRateC = 0
-        self.HitRateC = 0
-        self.DamBackPerC = 0
         self.PerLVMaxHPC = 0
-        self.DropEquipPerC = 0
         self.DropMoneyPerC = 0
-        self.IgnoreDefRateReduceC = 0
-        self.DamChanceDefC = 0
         self.SuperHitReduceC = 0
-        self.SkillAtkRateC = 0
-        self.SpeedPerC = 0
-        self.AtkSpeedC = 0
-        self.SkillAtkRateReduceC = 0
         self.HitC = 0
-        self.MissC = 0
-        self.SkillAddPer1C = 0
-        self.SkillAddPer2C = 0
-        self.SkillAddPer3C = 0
-        self.SkillAddPer4C = 0
-        self.SkillAddPer5C = 0
-        self.SkillAddPer6C = 0
-        self.SkillAddPer7C = 0
-        self.SkillReducePer1C = 0
-        self.SkillReducePer2C = 0
-        self.SkillReducePer3C = 0
-        self.SkillReducePer4C = 0
-        self.SkillReducePer5C = 0
-        self.SkillReducePer6C = 0
-        self.SkillReducePer7C = 0
+        self.MissC = 0
         return
         
     def GetClassLV(self): return self.ClassLV #  装备阶级
     def GetEquipColor(self): return self.EquipColor #  装备颜色
-    def GetEquipQualityLV(self): return self.EquipQualityLV #  装备星级
-    def GetAtkPerC(self): return self.AtkPerC #  攻击百分比系数
-    def GetDamagePerC(self): return self.DamagePerC #  增加伤害系数
-    def GetSuperHitRateC(self): return self.SuperHitRateC #  暴击率系数
+    def GetIsSuit(self): return self.IsSuit #  是否套装
+    def GetBaseEquipMaxHPAddPerC(self): return self.BaseEquipMaxHPAddPerC #  基础防具生命百分比系数
+    def GetBaseEquipAtkAddPerC(self): return self.BaseEquipAtkAddPerC #  基础武器攻击百分比系数
+    def GetSuperHitC(self): return self.SuperHitC #  暴击值系数
     def GetSuperHitPerC(self): return self.SuperHitPerC #  暴击值百分比系数
-    def GetDamReducePerC(self): return self.DamReducePerC #  减少伤害系数
-    def GetMaxHPPerC(self): return self.MaxHPPerC #  生命上限百分比系数
-    def GetDefPerC(self): return self.DefPerC #  防御力百分比系数
     def GetLuckyHitRateC(self): return self.LuckyHitRateC #  会心一击率系数
-    def GetPetDamPerC(self): return self.PetDamPerC #  灵宠伤害增加百分比系数
+    def GetLuckyHitRateReduceC(self): return self.LuckyHitRateReduceC #  会心一击抗性系数
+    def GetLuckPerC(self): return self.LuckPerC #  气运百分比系数
     def GetPerLVAtkC(self): return self.PerLVAtkC #  每级增加攻击力系数
-    def GetMissRateC(self): return self.MissRateC #  闪避值百分比系数
-    def GetHitRateC(self): return self.HitRateC #  命中力百分比系数
-    def GetDamBackPerC(self): return self.DamBackPerC #  伤害反射百分比系数
     def GetPerLVMaxHPC(self): return self.PerLVMaxHPC #  每级增加生命值系数
-    def GetDropEquipPerC(self): return self.DropEquipPerC #  增加装备掉落几率系数
     def GetDropMoneyPerC(self): return self.DropMoneyPerC #  增加掉落金币量百分比系数
-    def GetIgnoreDefRateReduceC(self): return self.IgnoreDefRateReduceC #  无视防御抗性百分比系数
-    def GetDamChanceDefC(self): return self.DamChanceDefC #  抵御百分比系数
     def GetSuperHitReduceC(self): return self.SuperHitReduceC #  暴击抗性百分比系数
-    def GetSkillAtkRateC(self): return self.SkillAtkRateC #  技能伤害百分比系数
-    def GetSpeedPerC(self): return self.SpeedPerC #  移动速度百分比系数
-    def GetAtkSpeedC(self): return self.AtkSpeedC #  攻击速度系数
-    def GetSkillAtkRateReduceC(self): return self.SkillAtkRateReduceC #  技能减伤百分比系数
     def GetHitC(self): return self.HitC #  命中系数
-    def GetMissC(self): return self.MissC #  闪避系数
-    def GetSkillAddPer1C(self): return self.SkillAddPer1C #  技能伤害增强1系数
-    def GetSkillAddPer2C(self): return self.SkillAddPer2C #  技能伤害增强2系数
-    def GetSkillAddPer3C(self): return self.SkillAddPer3C #  技能伤害增强3系数
-    def GetSkillAddPer4C(self): return self.SkillAddPer4C #  技能伤害增强4系数
-    def GetSkillAddPer5C(self): return self.SkillAddPer5C #  技能伤害增强5系数
-    def GetSkillAddPer6C(self): return self.SkillAddPer6C #  技能伤害增强6系数
-    def GetSkillAddPer7C(self): return self.SkillAddPer7C #  技能伤害增强7系数
-    def GetSkillReducePer1C(self): return self.SkillReducePer1C #  受到技能伤害减少1系数
-    def GetSkillReducePer2C(self): return self.SkillReducePer2C #  受到技能伤害减少2系数
-    def GetSkillReducePer3C(self): return self.SkillReducePer3C #  受到技能伤害减少3系数
-    def GetSkillReducePer4C(self): return self.SkillReducePer4C #  受到技能伤害减少4系数
-    def GetSkillReducePer5C(self): return self.SkillReducePer5C #  受到技能伤害减少5系数
-    def GetSkillReducePer6C(self): return self.SkillReducePer6C #  受到技能伤害减少6系数
-    def GetSkillReducePer7C(self): return self.SkillReducePer7C #  受到技能伤害减少7系数
+    def GetMissC(self): return self.MissC #  闪避系数
 
 # 成就表
 class IPY_Success():
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
index 73e4aa7..193d34f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
@@ -459,8 +459,8 @@
         
     classLV = GetItemClassLV(curItem)
     color = curItem.GetItemColor()
-    itemQuality = curItem.GetItemQuality()
-    gsParamIpyData = IpyGameDataPY.GetIpyGameData("EquipGSParam", classLV, color, itemQuality)
+    isSuit = 1 if curItem.GetSuiteID() > 0 else 0
+    gsParamIpyData = IpyGameDataPY.GetIpyGameData("EquipGSParam", classLV, color, isSuit)
     # 传奇属性
     legendAttrIDCnt = curItem.GetUserAttrCount(ShareDefine.Def_IudetLegendAttrID)
     legendAttrValueCnt = curItem.GetUserAttrCount(ShareDefine.Def_IudetLegendAttrValue)
@@ -479,48 +479,53 @@
     IceAtk = attrDict.get(ShareDefine.Def_Effect_IceAtk, 0)
     IceDef = attrDict.get(ShareDefine.Def_Effect_IceDef, 0)
     
-    AtkPer = attrDict.get(ShareDefine.Def_Effect_AddAtkByPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetAtkPerC())
-    DamagePer = attrDict.get(ShareDefine.Def_Effect_DamagePer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDamagePerC())
-    SuperHitRate = attrDict.get(ShareDefine.Def_Effect_SuperHitRate, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSuperHitRateC())
+    BaseEquipMaxHPAddPer = attrDict.get(ShareDefine.Def_Effect_BaseEquipMaxHPAddPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetBaseEquipMaxHPAddPerC())
+    BaseEquipAtkAddPer = attrDict.get(ShareDefine.Def_Effect_BaseEquipAtkAddPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetBaseEquipAtkAddPerC())
+    AtkPer = 0#attrDict.get(ShareDefine.Def_Effect_AddAtkByPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetAtkPerC())
+    DamagePer = 0#attrDict.get(ShareDefine.Def_Effect_DamagePer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDamagePerC())
+    SuperHitRate = 0#attrDict.get(ShareDefine.Def_Effect_SuperHitRate, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSuperHitRateC())
+    SuperHit = attrDict.get(ShareDefine.Def_Effect_SuperHit, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSuperHitC())
     SuperHitPer = attrDict.get(ShareDefine.Def_Effect_SuperHitPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSuperHitPerC())
-    DamReducePer = attrDict.get(ShareDefine.Def_Effect_DamReducePer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDamReducePerC())
-    MaxHPPer = attrDict.get(ShareDefine.Def_Effect_MaxHPPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetMaxHPPerC())
-    DefPer = attrDict.get(ShareDefine.Def_Effect_DefPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDefPerC())
+    DamReducePer = 0#attrDict.get(ShareDefine.Def_Effect_DamReducePer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDamReducePerC())
+    MaxHPPer = 0#attrDict.get(ShareDefine.Def_Effect_MaxHPPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetMaxHPPerC())
+    DefPer = 0#attrDict.get(ShareDefine.Def_Effect_DefPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDefPerC())
     LuckyHitRate = attrDict.get(ShareDefine.Def_Effect_LuckyHitRate, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetLuckyHitRateC())
-    PetDamPer = attrDict.get(ShareDefine.Def_Effect_PetDamPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetPetDamPerC())
+    LuckyHitRateReduce = attrDict.get(ShareDefine.Def_Effect_LuckyHitRateReduce, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetLuckyHitRateReduceC())
+    LuckPer = attrDict.get(ShareDefine.Def_Effect_LuckPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetLuckPerC())
+    PetDamPer = 0#attrDict.get(ShareDefine.Def_Effect_PetDamPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetPetDamPerC())
     PerLVAtk = attrDict.get(ShareDefine.Def_Effect_PerLVAtk, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetPerLVAtkC())
-    MissRate = attrDict.get(ShareDefine.Def_Effect_MissRate, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetMissRateC())
-    HitRate = attrDict.get(ShareDefine.Def_Effect_HitRate, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetHitRateC())
-    DamBackPer = attrDict.get(ShareDefine.Def_Effect_DamBackPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDamBackPerC())
+    MissRate = 0#attrDict.get(ShareDefine.Def_Effect_MissRate, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetMissRateC())
+    HitRate = 0#attrDict.get(ShareDefine.Def_Effect_HitRate, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetHitRateC())
+    DamBackPer = 0#attrDict.get(ShareDefine.Def_Effect_DamBackPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDamBackPerC())
     PerLVMaxHP = attrDict.get(ShareDefine.Def_Effect_PerLVMaxHP, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetPerLVMaxHPC())
-    DropEquipPer = attrDict.get(ShareDefine.Def_Effect_DropEquipPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDropEquipPerC())
+    DropEquipPer = 0#attrDict.get(ShareDefine.Def_Effect_DropEquipPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDropEquipPerC())
     DropMoneyPer = attrDict.get(ShareDefine.Def_Effect_DropMoneyPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDropMoneyPerC())
-    IgnoreDefRateReduce = attrDict.get(ShareDefine.Def_Effect_IgnoreDefRateReduce, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetIgnoreDefRateReduceC())
-    DamChanceDef = attrDict.get(ShareDefine.Def_Effect_DamChanceDef, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDamChanceDefC())
+    IgnoreDefRateReduce = 0#attrDict.get(ShareDefine.Def_Effect_IgnoreDefRateReduce, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetIgnoreDefRateReduceC())
+    DamChanceDef = 0#attrDict.get(ShareDefine.Def_Effect_DamChanceDef, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDamChanceDefC())
     SuperHitReduce = attrDict.get(ShareDefine.Def_Effect_SuperHitReduce, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSuperHitReduceC())
-    SkillAtkRate = attrDict.get(ShareDefine.Def_Effect_SkillAtkRate, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAtkRateC())
-    SpeedPer = attrDict.get(ShareDefine.Def_Effect_SpeedPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSpeedPerC())
-    SkillAtkRateReduce = attrDict.get(ShareDefine.Def_Effect_SkillAtkRateReduce, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAtkRateReduceC())
+    SkillAtkRate = 0#attrDict.get(ShareDefine.Def_Effect_SkillAtkRate, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAtkRateC())
+    SpeedPer = 0#attrDict.get(ShareDefine.Def_Effect_SpeedPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSpeedPerC())
+    SkillAtkRateReduce = 0#attrDict.get(ShareDefine.Def_Effect_SkillAtkRateReduce, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAtkRateReduceC())
     Hit = attrDict.get(ShareDefine.Def_Effect_Hit, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetHitC())
     Miss = attrDict.get(ShareDefine.Def_Effect_Miss, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetMissC())
-    SkillAddPerA = attrDict.get(ShareDefine.Def_Effect_SkillAddPer1, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer1C())
-    SkillAddPerB = attrDict.get(ShareDefine.Def_Effect_SkillAddPer2, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer2C())
-    SkillAddPerC = attrDict.get(ShareDefine.Def_Effect_SkillAddPer3, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer3C())
-    SkillAddPerD = attrDict.get(ShareDefine.Def_Effect_SkillAddPer4, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer4C())
-    SkillAddPerE = attrDict.get(ShareDefine.Def_Effect_SkillAddPer5, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer5C())
-    SkillAddPerF = attrDict.get(ShareDefine.Def_Effect_SkillAddPer6, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer6C())
-    SkillAddPerG = attrDict.get(ShareDefine.Def_Effect_SkillAddPer7, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer7C())
-    SkillReducePerA = attrDict.get(ShareDefine.Def_Effect_SkillReducePer1, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer1C())
-    SkillReducePerB = attrDict.get(ShareDefine.Def_Effect_SkillReducePer2, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer2C())
-    SkillReducePerC = attrDict.get(ShareDefine.Def_Effect_SkillReducePer3, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer3C())
-    SkillReducePerD = attrDict.get(ShareDefine.Def_Effect_SkillReducePer4, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer4C())
-    SkillReducePerE = attrDict.get(ShareDefine.Def_Effect_SkillReducePer5, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer5C())
-    SkillReducePerF = attrDict.get(ShareDefine.Def_Effect_SkillReducePer6, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer6C())
-    SkillReducePerG = attrDict.get(ShareDefine.Def_Effect_SkillReducePer7, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer7C())
+    SkillAddPerA = 0#attrDict.get(ShareDefine.Def_Effect_SkillAddPer1, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer1C())
+    SkillAddPerB = 0#attrDict.get(ShareDefine.Def_Effect_SkillAddPer2, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer2C())
+    SkillAddPerC = 0#attrDict.get(ShareDefine.Def_Effect_SkillAddPer3, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer3C())
+    SkillAddPerD = 0#attrDict.get(ShareDefine.Def_Effect_SkillAddPer4, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer4C())
+    SkillAddPerE = 0#attrDict.get(ShareDefine.Def_Effect_SkillAddPer5, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer5C())
+    SkillAddPerF = 0#attrDict.get(ShareDefine.Def_Effect_SkillAddPer6, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer6C())
+    SkillAddPerG = 0#attrDict.get(ShareDefine.Def_Effect_SkillAddPer7, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillAddPer7C())
+    SkillReducePerA = 0#attrDict.get(ShareDefine.Def_Effect_SkillReducePer1, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer1C())
+    SkillReducePerB = 0#attrDict.get(ShareDefine.Def_Effect_SkillReducePer2, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer2C())
+    SkillReducePerC = 0#attrDict.get(ShareDefine.Def_Effect_SkillReducePer3, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer3C())
+    SkillReducePerD = 0#attrDict.get(ShareDefine.Def_Effect_SkillReducePer4, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer4C())
+    SkillReducePerE = 0#attrDict.get(ShareDefine.Def_Effect_SkillReducePer5, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer5C())
+    SkillReducePerF = 0#attrDict.get(ShareDefine.Def_Effect_SkillReducePer6, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer6C())
+    SkillReducePerG = 0#attrDict.get(ShareDefine.Def_Effect_SkillReducePer7, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSkillReducePer7C())
     
     # 攻速不默认乘,仅作为参数提供策划使用
-    AtkSpeed = attrDict.get(ShareDefine.Def_Effect_AtkSpeed, 0)
-    AtkSpeedC = 1 if not gsParamIpyData else gsParamIpyData.GetAtkSpeedC()
+    AtkSpeed = 0#attrDict.get(ShareDefine.Def_Effect_AtkSpeed, 0)
+    AtkSpeedC = 1#1 if not gsParamIpyData else gsParamIpyData.GetAtkSpeedC()
     
     # 绝版
     outOfPrintAttrIDCnt = curItem.GetUserAttrCount(ShareDefine.Def_IudetOutOfPrintAttrID)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index ab51ac3..438b8fc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -531,6 +531,7 @@
 Def_Effect_JXWeaponAttrPer = 119 # 诛仙剑4属性加成百分比
 
 Def_Effect_Luck = 120 # 气运
+Def_Effect_LuckPer = 133 # 气运百分率
 
 #增加%d物理伤害值,其中a值为伤害值
 Def_Effect_AddAtk = 1005

--
Gitblit v1.8.0