From 63d429647aae8b63517b2fd67977a2fb7692462a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 10 十一月 2021 12:07:33 +0800
Subject: [PATCH] 9341 【BT5】【主干】【后端】情缘系统（主干冲突 补充）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 45b323d..38c8385 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -2250,6 +2250,7 @@
1000 * 1, # 限时抢购
1000 * 5, # 请求协助间隔
1000 * 10, # 竞技场间隔
+ 1000 * 5, # 情缘
]
TYPE_Player_Tick_Count = len(TYPE_Player_Tick_Time)
@@ -2325,6 +2326,7 @@
TYPE_Player_Tick_FlashSale, #限时抢购
TYPE_Player_Tick_RequestAssist, #请求协助间隔
TYPE_Player_Tick_Arena, #竞技场间隔
+TYPE_Player_Tick_Love, #情缘
) = range(0, TYPE_Player_Tick_Count)
#---------------------------------------------------------------------
@@ -4166,6 +4168,16 @@
Def_PDict_FuncSysPrivilegeActTime = "FuncSysPrivilegeActTime_%s" # 系统功能特权激活时间戳，参数(系统功能ID)
Def_PDict_FuncSysPrivilegeAward = "FuncSysPrivilegeAward_%s" # 系统功能特权领奖记录，参数(系统功能ID)
+#情缘
+Def_PDict_LoveCharmTotal = "LoveCharmTotal" # 魅力值 - 总
+Def_PDict_LoveCharmToday = "LoveCharmToday" # 魅力值 - 今日
+Def_PDict_LoveNewMarryTime = "LoveNewMarryTime" # 成亲时间 - 新婚时间
+Def_PDict_LoveMarryTime = "LoveMarryTime" # 成亲时间 - 最近一次提亲成功时间
+Def_PDict_LoveBridePriceState = "LoveBridePriceState" # 聘礼状态，按聘礼ID位存储每种聘礼已购买次数
+Def_PDict_LoveBridePriceMaxID = "LoveBridePriceMaxID" # 提亲最大聘礼ID，用于决定伴侣昵称颜色等
+Def_PDict_LoveRingClassLV = "LoveRingClassLV" # 情戒 - 阶级
+Def_PDict_LoveRingStarLV = "LoveRingStarLV" # 情戒 - 星级
+Def_PDict_LoveRingEatCount = "LoveRingEatCount" # 情戒 - 本星已淬炼道具数
#-------------------------------------------------------------------------------
#可以从07 41封包购买的背包类型,和对应字典{背包类型:[字典key, 默认格子数]}
@@ -4645,7 +4657,9 @@
Def_CalcAttrFunc_PeerlessWeaponTrain, # 灭世培养 46
Def_CalcAttrFunc_PeerlessWeapon2Train, # 噬魂培养 47
Def_CalcAttrFunc_FaQi, # 法器 48
-) = range(49)
+Def_CalcAttrFunc_LoveRing, # 情戒基础 49
+Def_CalcAttrFunc_LoveRingCouple, # 情戒仙侣 50
+) = range(51)
# 技能功能点列表 - 默认不算战力，不享受百分比加成，技能功能点暂时配置，之后优化技能属性逻辑后可去掉
CalcAttrFuncSkillList = [Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_DogzBattleSkill]
@@ -4668,6 +4682,7 @@
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_FaQi:[Def_CalcAttrFunc_FaQi],
+ ShareDefine.Def_MFPType_Love:[Def_CalcAttrFunc_LoveRing, Def_CalcAttrFunc_LoveRingCouple],
ShareDefine.Def_MFPType_Prestige:[Def_CalcAttrFunc_Prestige],
ShareDefine.Def_MFPType_GodWeapon:[Def_CalcAttrFunc_GodWeapon],
ShareDefine.Def_MFPType_Dienstgrad:[Def_CalcAttrFunc_Dienstgrad],
@@ -4888,6 +4903,7 @@
Def_Cost_EquipStar, #装备升星
Def_Cost_ActivityPlace, #活跃放置 50
Def_Cost_FaQi, # 法器
+Def_Cost_Love, # 情缘
#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
Def_Cost_RefreshArrestTask, # 刷新悬赏任务
Def_Cost_OffLineExp, # 兑换离线经验
@@ -4900,7 +4916,7 @@
Def_Cost_Trade, # 交易
Def_Cost_Rename, # 改名
Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 63)
+) = range(2000, 2000 + 64)
Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
@@ -4985,6 +5001,7 @@
Def_Cost_EquipStar:"EquipStar",
Def_Cost_ActivityPlace:"ActivityPlace",
Def_Cost_FaQi:"FaQi",
+Def_Cost_Love:"Love",
}
## -----------------------------------------------------
--
Gitblit v1.8.0