From 0ae1abe3455b72574e043538c85be3e4015f6bf0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 13 十二月 2021 11:03:24 +0800
Subject: [PATCH] 9341 【BT5】【主干】【后端】情缘系统(修复情缘副本刷怪阶段掉线重登报错)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 87bd2d3..7cfb252 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -200,6 +200,8 @@
 
 Def_Notify_WorldKey_AssistBoss = "AssistBoss"  # 协助boss
 
+Def_Notify_WorldKey_CoupleInfo = "CoupleInfo"  # 伴侣信息
+
 #活动类型定义
 ActTypeList = (
 ActType_OpenComm, # 开服及常规运营活动 1
@@ -617,6 +619,18 @@
 
 Def_Effect_ReduceSkillCDPer = 149   # 减少技能CD, a值为万分率
 
+Def_Effect_ZhuXianRate = 150   # 诛仙一击: 概率直接减少BOSS当前10%血量
+Def_Effect_ZhuXianReducePer = 151   # 诛仙护体: 受到BOSS伤害减免 万分率
+
+Def_Effect_HorseMaxHPPer = 152 # 坐骑生命加成
+Def_Effect_PetAtkPer = 153 # 灵宠攻击加成
+Def_Effect_HorseTrainAttrPer = 154 # 坐骑培养属性加成(攻防血)
+Def_Effect_PetTrainAttrPer = 155 # 灵宠培养属性加成(攻防血)
+Def_Effect_GuardTrainAttrPer = 156 # 守护培养属性加成(攻防血)
+Def_Effect_WingTrainAttrPer = 157 # 翅膀培养属性加成(攻防血)
+Def_Effect_PeerlessWeaponTrainAttrPer = 158 # 灭世培养属性加成(攻防血)
+Def_Effect_PeerlessWeapon2TrainAttrPer = 159 # 弑神培养属性加成(攻防血)
+
 #增加%d物理伤害值,其中a值为伤害值
 Def_Effect_AddAtk = 1005
 #增加%d魔法伤害值,其中a值为伤害值
@@ -715,9 +729,12 @@
     Def_BT_SkyTower,                          #天星塔榜
     Def_BT_Arena,                             #竞技场榜
     Def_BT_Environment,                       #环保榜 (垃圾分类活动)
+    Def_BT_CharmTotal, #魅力总榜 30
+    Def_BT_CharmWeek, #魅力周榜
+    Def_BT_CharmDay, #魅力日榜
     
     Def_BT_Max, #排行榜最大类型
-) = range(0, 29 + 2) 
+) = range(0, 32 + 2) 
 
 ''' 跨服排行榜类型, 从 150 开始
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
@@ -738,7 +755,7 @@
 #排行榜Value1存储境界信息的榜单列表
 BTValue1_OfficialRankList = [Def_BT_FightPower, Def_BT_FightPower_Warrior, Def_BT_FightPower_Wizard, Def_BT_FightPower_Assassin, 
                              Def_BT_LV, Def_BT_FightPower_Horse, Def_BT_FightPower_Pet, Def_BT_TrialTower, Def_BT_OffLineEfficient,
-                             Def_BT_SkyTower,
+                             Def_BT_SkyTower, Def_BT_CharmTotal, Def_BT_CharmWeek, Def_BT_CharmDay
                              ]
 
 ##---比率---
@@ -961,7 +978,12 @@
 CDBPlayerRefresh_Environment, # 环保值 232
 CDBPlayerRefresh_MoneyMinusGold, # 仙玉 - 负值 233
 CDBPlayerRefresh_MoneyMinusGoldPaper, # 绑玉 - 负值 234
-) = range(146, 235)
+CDBPlayerRefresh_MoneyMinusSilverPaper, # 神玉 - 负值 235
+CDBPlayerRefresh_AllCoinTotal, # 真实充值coin值 236
+CDBPlayerRefresh_ExAttr18, # ExAttr18 
+CDBPlayerRefresh_ExAttr19, # ExAttr19 
+CDBPlayerRefresh_CharmLV, # 魅力等级  239
+) = range(146, 240)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -1052,6 +1074,7 @@
 GameFuncID_SuperGift = 150      # 超值礼包
 GameFuncID_ZhuXianBoss = 163    # 诛仙BOSS
 GameFuncID_Arena = 195          # 竞技场
+GameFuncID_FaQi = 199           # 法器
 # 以下为暂时无用的
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环
@@ -1365,6 +1388,7 @@
 ClientServerMsg_CollectNPC = "CollectNPC"               # 采集NPC
 ClientServerMsg_EnterFB = "EnterFB"                     # 请求进入跨服副本
 ClientServerMsg_AddBuff = "AddBuff"                     # 添加BUFF
+ClientServerMsg_LuckyCloudBuy = "LuckyCloudBuy"         # 幸运云购
 
 #跨服广播类型定义
 CrossNotify_CrossAct = "CrossAct"
@@ -1469,7 +1493,7 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 26
+Def_MFPType_Max = 28
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
 Def_MFPType_Equip, # 装备(装备本身) 1
@@ -1491,11 +1515,13 @@
 Def_MFPType_MagicWeapon3, # 仙族法宝 17
 Def_MFPType_PetSoul, # 灵宠魂石 18
 Def_MFPType_HorseSoul, # 坐骑魂石 19
-Def_MFPType_20,
+Def_MFPType_FaQi, # 法器 20
 Def_MFPType_Dogz, # 神兽 21
 Def_MFPType_GatherSoul, # 聚魂 22
 Def_MFPType_MagicWeapon4, # 王者法宝 23
 Def_MFPType_Coat, # 时装 24
+Def_MFPType_Love, # 情缘 25
+Def_MFPType_Charm, # 魅力 26
 Def_MFPType_Other, # 其他
 ) = range(Def_MFPType_Max)
 

--
Gitblit v1.8.0