From 217627970593db2f63ddb62d6c3d4c5e787871fe Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 25 三月 2019 20:43:11 +0800
Subject: [PATCH] 6385 【后端】【2.0】五行灵根开发
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 104 ++++++++++++++++++++++++++--------------------------
1 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 64116bb..12dc9b2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -68,27 +68,29 @@
Def_BuffValue_Count = 3 # buff记录的value个数
#游戏对象属性--------------------------------------------
-Def_Calc_AllAttrType_MAX = 127
+Def_Calc_AllAttrType_MAX = 125
#基本属性BUFF计算，顺序与 ObjProperty_AttrByIndex 对应，同时也为buff效果ID同步通知策划
TYPE_Calc_AttrList = (
#基础属性
-TYPE_Calc_AttrCurSTR, # 力量 1
-TYPE_Calc_AttrCurPNE, # 灵力（智力） 2
-TYPE_Calc_AttrCurPHY, # 身法（敏捷） 3
-TYPE_Calc_AttrCurCON, # 体质 4
+TYPE_Calc_Metal, # 金 1
+TYPE_Calc_Wood, # 木 2
+TYPE_Calc_Water, # 水 3
+TYPE_Calc_Fire, # 火 4
+TYPE_Calc_Earth, # 土 5
#战斗属性
-TYPE_Calc_AttrHP, # 当前HP 5
-TYPE_Calc_AttrMP, # 当前MP 6
-TYPE_Calc_AttrMaxHP, # 最大血量 7
-TYPE_Calc_AttrMaxMP, # 最大魔法值 8
-TYPE_Calc_AttrATKMin, # 最小攻击力 9
-TYPE_Calc_AttrATKMax, # 最大攻击力 10
-TYPE_Calc_AttrMATKMin, # 最小魔法攻击力 11 #废弃：NPC表字段代表境界
-TYPE_Calc_AttrMATKMax, # 最大魔法攻击力 12 #废弃
-TYPE_Calc_AttrDEF, # 防御力 13
-TYPE_Calc_AttrHit, # 命中 14
-TYPE_Calc_AttrMiss, # 闪避 15
+TYPE_Calc_AttrMaxHP, # 最大血量 6
+TYPE_Calc_AttrMaxMP, # 最大魔法值 7
+TYPE_Calc_AttrDEF, # 防御力 8
+TYPE_Calc_AttrHit, # 命中 9
+TYPE_Calc_AttrMiss, # 闪避 10
+TYPE_Calc_AttrATKMin, # 最小攻击力 11
+TYPE_Calc_AttrATKMax, # 最大攻击力 12
+TYPE_Calc_AttrHP, # 当前HP 13
+TYPE_Calc_AttrMP, # 当前MP 14
+#TYPE_Calc_AttrMATKMin, # 最小魔法攻击力 #废弃：NPC表字段代表境界
+#TYPE_Calc_AttrMATKMax, # 最大魔法攻击力 #废弃
+TYPE_Calc_Luck, # 气运 15
TYPE_Calc_AttrSpeed, # 移动速度 16
TYPE_Calc_AttrAtkSpeed, # 攻击速度 17
@@ -209,8 +211,6 @@
TYPE_Calc_SuiteBasePer, # 套装基础属性百分比
TYPE_Calc_PlusBaseAtkPer, # 强化基础攻击百分比
TYPE_Calc_ProDef, # 当前防护值 130
-TYPE_Calc_ZhuxianRate, # 诛仙一击的概率
-TYPE_Calc_ZhuxianHurtPer, # 诛仙一击的伤害比
) = range(1, Def_Calc_AllAttrType_MAX)
@@ -497,19 +497,6 @@
Def_Max_Update_Talent_Time = 3 #最大使用造化丹次数
#写死的物品效果都放这边
-
-#增加%d伤害值,其中a值为最小伤害值,b值为最大伤害值
-Def_Effect_AddAtk = ShareDefine.Def_Effect_AddAtk
-#增加%d防御值
-Def_Effect_Def = ShareDefine.Def_Effect_Def
-#增加%d力量
-Def_Effect_STR = ShareDefine.Def_Effect_STR
-#增加%d真元
-Def_Effect_PNE = ShareDefine.Def_Effect_PNE
-#增加%d筋骨
-Def_Effect_PHY = ShareDefine.Def_Effect_PHY
-#增加%d体魄
-Def_Effect_CON = ShareDefine.Def_Effect_CON
#立刻恢复%d的HP(单次恢复)
Def_Effect_AddHP_Once = 207
@@ -3220,6 +3207,16 @@
Def_PlayerKey_WingHPPer = "WingHPPer" # 翅膀生命百分比
Def_PlayerKey_SuiteBasePer = "SuiteBasePer" # 套装基础属性百分比
Def_PlayerKey_PlusBaseAtkPer = "PlusBaseAtkPer" # 强化基础攻击百分比
+Def_PlayerKey_Metal = "PointMetal" # 金
+Def_PlayerKey_Wood = "PointWood" # 木
+Def_PlayerKey_Water = "PointWater" # 水
+Def_PlayerKey_Fire = "PointFire" # 火
+Def_PlayerKey_Earth = "PointEarth" # 土
+Def_PlayerKey_MetalQualityLV = "MetalQualityLV" # 金灵根品级
+Def_PlayerKey_WoodQualityLV = "WoodQualityLV" # 木灵根品级
+Def_PlayerKey_WaterQualityLV = "WaterQualityLV" # 水灵根品级
+Def_PlayerKey_FireQualityLV = "FireQualityLV" # 火灵根品级
+Def_PlayerKey_EarthQualityLV = "EarthQualityLV" # 土灵根品级
#功能索引ShareDefine.Def_AttrFruitFuncList
Def_PlayerKey_FruitAttr = "FruitAttr_%s_%s" # 属性果实增加的属性，参数为(功能索引, 物品效果id)
@@ -3507,6 +3504,7 @@
Def_PDict_ExcActionItemCnt = "ExcI_%s_%s" # 活动兑换物品已兑换次数,参数(活动key,兑换物品对应次数编号标识)
+Def_PDict_AddPointValue = "AddPointValue_%s" # 已加属性点数, 参数(属性ID)
Def_PDict_AttrFruitEatCnt = "AttrFruitEatCnt_%s" # 已吃属性果实个数，参数为物品id
Def_PDict_AttrFruitAddValue = "AttrFruitAddValue_%s" # 已吃属性果实增加的属性，参数为物品id
@@ -4071,10 +4069,11 @@
#对应 Def_Calc_AllAttrType_MAX
ItemEffect_AttrDict = {
#基础属性
- Def_Effect_STR:[[TYPE_Calc_AttrCurSTR], True, TYPE_Linear], # 力量
- Def_Effect_PNE:[[TYPE_Calc_AttrCurPNE], True, TYPE_Linear], # 智力
- Def_Effect_PHY:[[TYPE_Calc_AttrCurPHY], True, TYPE_Linear], # 敏捷
- Def_Effect_CON:[[TYPE_Calc_AttrCurCON], True, TYPE_Linear], # 体力
+ ShareDefine.Def_Effect_Metal:[[TYPE_Calc_Metal], True, TYPE_Linear],
+ ShareDefine.Def_Effect_Wood:[[TYPE_Calc_Wood], True, TYPE_Linear],
+ ShareDefine.Def_Effect_Water:[[TYPE_Calc_Water], True, TYPE_Linear],
+ ShareDefine.Def_Effect_Fire:[[TYPE_Calc_Fire], True, TYPE_Linear],
+ ShareDefine.Def_Effect_Earth:[[TYPE_Calc_Earth], True, TYPE_Linear],
#战斗线性
ShareDefine.Def_Effect_MaxHP:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
@@ -4092,7 +4091,7 @@
# TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
ShareDefine.Def_Effect_AddAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],
#ShareDefine.Def_Effect_AddAtk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
- ShareDefine.Def_Effect_AddMAtk:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
+ #ShareDefine.Def_Effect_AddMAtk:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
ShareDefine.Def_Effect_AtkSpeed:[[TYPE_Calc_AttrAtkSpeed], False, TYPE_Linear],
ShareDefine.Def_Effect_ToxinDef:[[TYPE_Calc_AttrPoisonDef], False, TYPE_Linear],
ShareDefine.Def_Effect_ThunderDef:[[TYPE_Calc_AttrThunderDef], False, TYPE_Linear],
@@ -4103,11 +4102,12 @@
ShareDefine.Def_Effect_LuckyHit:[[TYPE_Calc_LuckyHit], False, TYPE_Linear],
ShareDefine.Def_Effect_LuckyHitRate:[[TYPE_Calc_LuckyHitRate], False, TYPE_Linear],
ShareDefine.Def_Effect_LuckyHitRateReduce:[[TYPE_Calc_LuckyHitRateReduce], False, TYPE_Linear],
+ ShareDefine.Def_Effect_Luck:[[TYPE_Calc_Luck], False, TYPE_Linear],
ShareDefine.Def_Effect_ReduceSkillCD:[[TYPE_Calc_ReduceSkillCD], False, TYPE_Linear],
AttrName_MinAtk:[[TYPE_Calc_AttrATKMin], False, TYPE_Linear],
AttrName_MaxAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],
- AttrName_MinMAtk:[[TYPE_Calc_AttrMATKMin], False, TYPE_Linear],
- AttrName_MaxMAtk:[[TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
+ #AttrName_MinMAtk:[[TYPE_Calc_AttrMATKMin], False, TYPE_Linear],
+ #AttrName_MaxMAtk:[[TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
AttrName_Def:[[TYPE_Calc_AttrDEF], False, TYPE_Linear],
AttrName_DefRate:[[TYPE_Calc_AttrMiss], False, TYPE_Linear],
AttrName_MaxHP:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear],
@@ -4130,7 +4130,7 @@
AttrName_Hit:[[TYPE_Calc_AttrHit], False, TYPE_Linear],
AttrName_Atk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
#AttrName_Atk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
- AttrName_MAtk:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
+ #AttrName_MAtk:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
AttrName_AutoRestoreHPPer:[[TYPE_Calc_HPRestorePer], False, TYPE_Linear],
ShareDefine.Def_Effect_HPRestore:[[TYPE_Calc_HPRestorePer], False, TYPE_Linear],
AttrName_GreatHitRate:[[TYPE_Calc_GreatHitRate], False, TYPE_Linear],
@@ -4225,14 +4225,14 @@
ShareDefine.Def_Effect_DefPer:[[TYPE_Calc_AttrDEF], False, TYPE_NoLinear],
ShareDefine.Def_Effect_HitRate:[[TYPE_Calc_AttrHit], False, TYPE_NoLinear],
ShareDefine.Def_Effect_MissRate:[[TYPE_Calc_AttrMiss], False, TYPE_NoLinear],
- ShareDefine.Def_Effect_AddMAtkByPer:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_NoLinear],
+ #ShareDefine.Def_Effect_AddMAtkByPer:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_NoLinear],
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_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],
- AttrName_MagAtkPer:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_NoLinear],
+ #AttrName_MagAtkPer:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_NoLinear],
AttrName_AtkPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
#AttrName_AtkPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
AttrName_BothAtkPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
@@ -4325,14 +4325,14 @@
#刷属性功能分类索引
CalcAttrFuncList = (
Def_CalcAttrFunc_RoleBase, # 角色基础 0
-Def_CalcAttrFunc_EquipBaseWeapon, # 武器物品表基础属性 1 - 废弃
-Def_CalcAttrFunc_EquipBaseArmor, # 防具物品表基础属性 2 - 废弃
-Def_CalcAttrFunc_EquipBaseRelics, # 圣器物品表基础属性 3 - 废弃
-Def_CalcAttrFunc_Equip, # 装备其他(传奇属性 + ) 4 - 废弃
+Def_CalcAttrFunc_1,
+Def_CalcAttrFunc_2,
+Def_CalcAttrFunc_LingGenQuailty, # 灵根品质附加属性 3
+Def_CalcAttrFunc_LingGen, # 灵根 4
Def_CalcAttrFunc_Plus, # 装备位强化 5
-Def_CalcAttrFunc_PlusEx, # 装备位强化累加 6 - 废弃
+Def_CalcAttrFunc_6,
Def_CalcAttrFunc_Stone, # 装备宝石 7
-Def_CalcAttrFunc_Suit, # 套装 8 - 废弃
+Def_CalcAttrFunc_8,
Def_CalcAttrFunc_Wing, # 翅膀 9
Def_CalcAttrFunc_Wash, # 洗练 10
Def_CalcAttrFunc_Pet, # 灵宠 11
@@ -4341,10 +4341,10 @@
Def_CalcAttrFunc_GodWeapon, # 神兵 14
Def_CalcAttrFunc_Dienstgrad, # 称号 15
Def_CalcAttrFunc_Rune, # 符印 16
-Def_CalcAttrFunc_17, #
+Def_CalcAttrFunc_17,
Def_CalcAttrFunc_MagicWeapon1, # 人族法宝属性 18
Def_CalcAttrFunc_EquipOutOfPrint, # 绝版属性随等级变化 19
-Def_CalcAttrFunc_EquipAllStars, # 装备全身星级属性 20 - 废弃
+Def_CalcAttrFunc_20,
Def_CalcAttrFunc_Success, # 成就属性 21
Def_CalcAttrFunc_VIP, # VIP属性 22
Def_CalcAttrFunc_Stove, # 炼丹炉 23
@@ -4358,7 +4358,7 @@
Def_CalcAttrFunc_PetSkill, # 宠物技能属性 31
Def_CalcAttrFunc_StoveYao, # 炼丹炉丹药 32
Def_CalcAttrFunc_PetSign, # 宠物签到 33
-Def_CalcAttrFunc_MagicWeaponSoul, # 法宝之魂属性34- 废弃
+Def_CalcAttrFunc_34,
Def_CalcAttrFunc_Dogz, # 神兽35
Def_CalcAttrFunc_DogzBattleSkill, # 助战神兽技能36
Def_CalcAttrFunc_DogzEquip, # 神兽装备37
@@ -4390,7 +4390,7 @@
# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
CalcAttrExFuncList = [Def_CalcAttrFunc_MagicWeapon1, Def_CalcAttrFunc_MagicWeapon2, Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_MagicWeapon4,
Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP, Def_CalcAttrFunc_PetSoul, Def_CalcAttrFunc_HorseSoul,
- Def_CalcAttrFunc_StoveYao, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_MagicWeaponSoul
+ Def_CalcAttrFunc_StoveYao, Def_CalcAttrFunc_PetSign
]
# 在此列表中的功能属性，不享受百分比加成，--属性不参与战力计算，战力由技能配置决定
@@ -4401,6 +4401,7 @@
MFPTypeAttrFuncIndexDict = {ShareDefine.Def_MFPType_Role:[Def_CalcAttrFunc_RoleBase],
# 因为装备评分和实际战力一直出现不匹配的情况，所以装备战力修改为直接由装备评分做为参数计算战力，所以装备评分计算的所有属性不列入战力计算，祥见评分计算函数 ItemCommom.CalcEquipGS
# ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipOutOfPrint],
+ ShareDefine.Def_MFPType_LingGen:[Def_CalcAttrFunc_LingGenQuailty, Def_CalcAttrFunc_LingGen],
ShareDefine.Def_MFPType_Plus:[Def_CalcAttrFunc_Plus],
ShareDefine.Def_MFPType_Stone:[Def_CalcAttrFunc_Stone],
ShareDefine.Def_MFPType_Wing:[Def_CalcAttrFunc_Wing],
@@ -4418,7 +4419,6 @@
ShareDefine.Def_MFPType_MagicWeapon3:[Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP],
ShareDefine.Def_MFPType_MagicWeapon4:[Def_CalcAttrFunc_MagicWeapon4],
ShareDefine.Def_MFPType_StoveYao:[Def_CalcAttrFunc_StoveYao],
- ShareDefine.Def_MFPType_MagicWeaponSoul:[Def_CalcAttrFunc_MagicWeaponSoul],
ShareDefine.Def_MFPType_GatherSoul:[Def_CalcAttrFunc_GatherSoul],
ShareDefine.Def_MFPType_Coat:[Def_CalcAttrFunc_Coat],
# 诛仙装备战力、神兽战力同装备模块战力一致，受评分影响，装备评分相关的战力另外算
--
Gitblit v1.8.0