From 80344b714003facc6731e3eb9d62d1fb53e30529 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 02 七月 2021 19:09:45 +0800
Subject: [PATCH] 9046 【主干】【BT2】【BT3】【后端】培养功能（同步主干 冲突内容）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 5c98be4..990d379 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -74,7 +74,7 @@
Def_BuffValue_Count = 3 # buff记录的value个数
#游戏对象属性--------------------------------------------
-Def_Calc_AllAttrType_MAX = 149
+Def_Calc_AllAttrType_MAX = 159
#基本属性BUFF计算，顺序与 ObjProperty_AttrByIndex 对应，同时也为buff效果ID同步通知策划
TYPE_Calc_AttrList = (
TYPE_Calc_Metal, # 金 1
@@ -237,6 +237,16 @@
TYPE_Calc_SkillReducePer5, # 受到技能伤害减少5
TYPE_Calc_SkillReducePer6, # 受到技能伤害减少6
TYPE_Calc_SkillReducePer7, # 受到技能伤害减少7
+TYPE_Calc_ZhuXianRate, # 诛仙一击： 概率直接减少BOSS当前10%血量
+TYPE_Calc_ZhuXianReducePer, # 诛仙护体： 受到BOSS伤害减免 万分率 150
+TYPE_Calc_HorseMaxHPPer, # 坐骑生命加成
+TYPE_Calc_PetAtkPer, # 灵宠攻击加成
+TYPE_Calc_HorseTrainAttrPer, # 坐骑培养属性加成（攻防血）
+TYPE_Calc_PetTrainAttrPer, # 灵宠培养属性加成（攻防血）
+TYPE_Calc_GuardTrainAttrPer, # 守护培养属性加成（攻防血） 155
+TYPE_Calc_WingTrainAttrPer, # 翅膀培养属性加成（攻防血）
+TYPE_Calc_PeerlessWeaponTrainAttrPer, # 灭世培养属性加成（攻防血）
+TYPE_Calc_PeerlessWeapon2TrainAttrPer, # 弑神培养属性加成（攻防血）
) = range(1, Def_Calc_AllAttrType_MAX)
## 支持大数值属性，超过20E
@@ -3268,6 +3278,14 @@
Def_PlayerKey_CurePer = "CurePer" # 治疗加成 默认百分百
Def_PlayerKey_BeHurtPer = "BeHurtPer" # 加深受到伤害百分比
Def_PlayerKey_HorseAtkPer = "HorseAtkPer" # 坐骑攻击百分比
+Def_PlayerKey_HorseMaxHPPer = "HorseMaxHPPer" # 坐骑生命加成
+Def_PlayerKey_PetAtkPer = "PetAtkPer" # 灵宠攻击加成
+Def_PlayerKey_HorseTrainAttrPer = "HorseTrainAttrPer" # 坐骑培养属性加成
+Def_PlayerKey_PetTrainAttrPer = "PetTrainAttrPer" # 灵宠培养属性加成
+Def_PlayerKey_GuardTrainAttrPer = "GuardTrainAttrPer" # 守护培养属性加成
+Def_PlayerKey_WingTrainAttrPer = "WingTrainAttrPer" # 翅膀培养属性加成
+Def_PlayerKey_PeerlessWeaponTrainAttrPer = "PeerlessWeaponTrainAttrPer" # 灭世培养属性加成
+Def_PlayerKey_PeerlessWeapon2TrainAttrPer = "PeerlessWeapon2TrainAttrPer" # 弑神培养属性加成
Def_PlayerKey_StoneBasePer = "StoneBasePer" # 宝石基础属性百分比
Def_PlayerKey_RealmBasePer = "RealmBasePer" # 境界基础属性百分比
Def_PlayerKey_WingHPPer = "WingHPPer" # 翅膀生命百分比
@@ -3639,6 +3657,10 @@
Def_PDict_EquipWashValue = "EquipWashV_%s_%s" # 装备部位洗练当前值，参数为(place, 属性编号)
Def_PDict_EquipWashValueTemp = "EquipWashVT_%s_%s" # 装备部位洗练当前临时洗练值，参数为(place, 属性编号)
+# 灵器培养
+Def_PDict_LingQiTrainLV = "LingQiTrainLV_%s_%s" # 培养等阶，参数为(place, 培养类型)
+Def_PDict_LingQiTrainItemCount = "LingQiTrainItemCount_%s_%s" # 培养当前阶已吃培养丹个数，参数为(place, 培养类型)
+
# 百战之地
Def_PDict_BZZD_TotalFightExp = "BZZD_TExp" # 最后一次进入副本挑战获得总经验, 领取多倍奖励时用
Def_PDict_BZZD_TotalFightExpPoint = "BZZD_TExpPoint" # 最后一次进入副本挑战获得总经验点, 领取多倍奖励时用
@@ -3653,6 +3675,8 @@
# 宠物
Def_PDict_FightPetIndex = "FightPetIndex" # 出战的宠物索引
+Def_PDict_PetTrainLV = "PetTrainLV_%s" # 灵宠培养等阶，参数（培养类型）
+Def_PDict_PetTrainItemCount = "PetTrainItemCount_%s" # 灵宠培养当前阶已吃培养丹个数，参数（培养类型）
#装备分解
Def_PDict_EquipDecomposeLV = "EquipDecomposeLV" #等级
@@ -3916,6 +3940,8 @@
Def_PDict_HorserLV = "HorserLV" # 坐骑等级
Def_PDict_HorserEatItemCount = "HorserEatItemCount" # 当前阶已吃培养丹个数
Def_PDict_HorserSkinPlusState = "HorserSkinPlusState" # 坐骑幻化皮肤激活状态，按二进制位存储，每位代表幻化ID是否已激活
+Def_PDict_HorserTrainLV = "HorserTrainLV_%s" # 坐骑培养等阶，参数（培养类型）
+Def_PDict_HorserTrainItemCount = "HorserTrainItemCount_%s" # 坐骑培养当前阶已吃培养丹个数，参数（培养类型）
#骑宠觉醒
Def_PDict_HorsePetSkinData = "HorsePetSkinData%d_%s" #觉醒等级*100+外观索引 参数(类型,关联ID) 1-坐骑 2-灵宠
@@ -4443,6 +4469,7 @@
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_AddAtkByPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
+ ShareDefine.Def_Effect_PetAtkPer:[[TYPE_Calc_PetMinAtk, TYPE_Calc_PetMaxAtk], 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],
@@ -4473,6 +4500,13 @@
ShareDefine.Def_Effect_StoneBasePer:[[TYPE_Calc_StoneBasePer], False, TYPE_NoLinear],
ShareDefine.Def_Effect_RealmBasePer:[[TYPE_Calc_RealmBasePer], False, TYPE_NoLinear],
ShareDefine.Def_Effect_HorseAtkPer:[[TYPE_Calc_HorseAtkPer], False, TYPE_NoLinear],
+ ShareDefine.Def_Effect_HorseMaxHPPer:[[TYPE_Calc_HorseMaxHPPer], False, TYPE_NoLinear],
+ ShareDefine.Def_Effect_HorseTrainAttrPer:[[TYPE_Calc_HorseTrainAttrPer], False, TYPE_NoLinear],
+ ShareDefine.Def_Effect_PetTrainAttrPer:[[TYPE_Calc_PetTrainAttrPer], False, TYPE_NoLinear],
+ ShareDefine.Def_Effect_GuardTrainAttrPer:[[TYPE_Calc_GuardTrainAttrPer], False, TYPE_NoLinear],
+ ShareDefine.Def_Effect_WingTrainAttrPer:[[TYPE_Calc_WingTrainAttrPer], False, TYPE_NoLinear],
+ ShareDefine.Def_Effect_PeerlessWeaponTrainAttrPer:[[TYPE_Calc_PeerlessWeaponTrainAttrPer], False, TYPE_NoLinear],
+ ShareDefine.Def_Effect_PeerlessWeapon2TrainAttrPer:[[TYPE_Calc_PeerlessWeapon2TrainAttrPer], False, TYPE_NoLinear],
ShareDefine.Def_Effect_WingHPPer:[[TYPE_Calc_WingHPPer], False, TYPE_NoLinear],
ShareDefine.Def_Effect_SuiteBasePer:[[TYPE_Calc_SuiteBasePer], False, TYPE_NoLinear],
ShareDefine.Def_Effect_PlusBaseAtkPer:[[TYPE_Calc_PlusBaseAtkPer], False, TYPE_NoLinear],
@@ -4495,6 +4529,19 @@
TYPE_Calc_RealmBasePer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
TYPE_Calc_HorseAtkPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
+ TYPE_Calc_HorseMaxHPPer:[TYPE_Calc_AttrMaxHP],
+ TYPE_Calc_HorseTrainAttrPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
+ TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
+ TYPE_Calc_PetTrainAttrPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
+ TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
+ TYPE_Calc_WingTrainAttrPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
+ TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
+ TYPE_Calc_GuardTrainAttrPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
+ TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
+ TYPE_Calc_PeerlessWeaponTrainAttrPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
+ TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
+ TYPE_Calc_PeerlessWeapon2TrainAttrPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
+ TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
TYPE_Calc_WingHPPer:[TYPE_Calc_AttrMaxHP],
TYPE_Calc_SuiteBasePer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
TYPE_Calc_AttrMaxHP],
@@ -4581,7 +4628,14 @@
Def_CalcAttrFunc_LingQiAttr, # 灵器属性 38
Def_CalcAttrFunc_HorseSkin, # 坐骑觉醒 39
Def_CalcAttrFunc_PetSkin, # 灵宠觉醒 40
-) = range(41)
+Def_CalcAttrFunc_LingQiJingLianAttr, # 灵器精炼 41
+Def_CalcAttrFunc_HorseTarin, # 坐骑培养 42
+Def_CalcAttrFunc_PetTarin, # 灵宠培养 43
+Def_CalcAttrFunc_GuardTarin, # 守护培养 44
+Def_CalcAttrFunc_WingTarin, # 翅膀培养 45
+Def_CalcAttrFunc_PeerlessWeaponTrain, # 灭世培养 46
+Def_CalcAttrFunc_PeerlessWeapon2Train, # 噬魂培养 47
+) = range(48)
# 技能功能点列表 - 默认不算战力，不享受百分比加成，技能功能点暂时配置，之后优化技能属性逻辑后可去掉
CalcAttrFuncSkillList = [Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_DogzBattleSkill]
@@ -4596,11 +4650,12 @@
ShareDefine.Def_MFPType_Star:[Def_CalcAttrFunc_Star],
ShareDefine.Def_MFPType_Plus:[Def_CalcAttrFunc_Plus],
ShareDefine.Def_MFPType_Stone:[Def_CalcAttrFunc_Stone],
- ShareDefine.Def_MFPType_LingQi:[Def_CalcAttrFunc_LingQi, Def_CalcAttrFunc_LingQiAttr],
+ ShareDefine.Def_MFPType_LingQi:[Def_CalcAttrFunc_LingQi, Def_CalcAttrFunc_LingQiAttr, Def_CalcAttrFunc_LingQiJingLianAttr, Def_CalcAttrFunc_GuardTarin,
+ Def_CalcAttrFunc_WingTarin, Def_CalcAttrFunc_PeerlessWeaponTrain, Def_CalcAttrFunc_PeerlessWeapon2Train],
ShareDefine.Def_MFPType_Wash:[Def_CalcAttrFunc_Wash],
- ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_PetSkin],
+ ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_PetSkin, Def_CalcAttrFunc_PetTarin],
ShareDefine.Def_MFPType_PetSoul:[Def_CalcAttrFunc_PetSoul],
- ShareDefine.Def_MFPType_Horse:[Def_CalcAttrFunc_Horse, Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_HorseSkin],
+ ShareDefine.Def_MFPType_Horse:[Def_CalcAttrFunc_Horse, Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_HorseSkin, Def_CalcAttrFunc_HorseTarin],
ShareDefine.Def_MFPType_HorseSoul:[Def_CalcAttrFunc_HorseSoul],
ShareDefine.Def_MFPType_Prestige:[Def_CalcAttrFunc_Prestige],
ShareDefine.Def_MFPType_GodWeapon:[Def_CalcAttrFunc_GodWeapon],
--
Gitblit v1.8.0