From c6f9199f9b6fbb8cda4585fa074357c57c61f5f5 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 28 八月 2019 20:39:25 +0800
Subject: [PATCH] 0312 解析信息异常也发送邮件
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 7bdf2ab..c038414 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -167,8 +167,10 @@
Def_Notify_WorldKey_FamilyBossOpenCount = "FamilyBossOpenCount" # 仙盟boss开启次数
Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo" # 仙盟宴会数据
+Def_Notify_WorldKey_FamilyPartyAddFamilyActivity = "FamilyPartyAddFamilyActivity" # 仙盟宴会地图成员增加仙盟活跃令
Def_Notify_WorldKey_AddFamilyAuctionItem = "AddFamilyAuctionItem" # 添加仙盟拍品
+Def_Notify_WorldKey_AddSystemAuctionItem = "AddSystemAuctionItem" # 添加系统拍品
Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState" # 跨服服务器链接状态
Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen" # 跨服服务器是否开启中
@@ -326,8 +328,14 @@
Def_Effect_CON = 4
#增加HP
Def_Effect_MaxHP = 6
+Def_Effect_MaxHP_ShenPin = 152 # 神品
+Def_Effect_MaxHP_XianPin = 153 # 仙品
+Def_Effect_MaxHP_JiPin = 154 # 极品
#增加%d伤害值（物理和魔法的最大/小）,只用到a值
Def_Effect_Atk = 7
+Def_Effect_Atk_ShenPin = 149 # 神品
+Def_Effect_Atk_XianPin = 150 # 仙品
+Def_Effect_Atk_JiPin = 151 # 极品
#增加%d防御值
Def_Effect_Def = 8
#命中(A值为具体值)
@@ -366,8 +374,14 @@
Def_Effect_PetDamPer = 25
#冰攻(A值为具体值) 真实伤害元素攻击, 无视防御, 只有元素防御可以减免伤害, 此项目用冰元素代替
Def_Effect_IceAtk = 26
+Def_Effect_IceAtk_ShenPin = 155 # 神品
+Def_Effect_IceAtk_XianPin = 156 # 仙品
+Def_Effect_IceAtk_JiPin = 157 # 极品
#冰防(A值为具体值) 真实抵抗元素抵抗, 减免元素攻击造成的伤害, 此项目用冰元素代替
Def_Effect_IceDef = 27
+Def_Effect_IceDef_ShenPin = 158 # 神品
+Def_Effect_IceDef_XianPin = 159 # 仙品
+Def_Effect_IceDef_JiPin = 160 # 极品
#无视防御几率提升
Def_Effect_IgnoreDefRate = 28
#无视防御抗性, 受击时减少对方的无视防御属性
@@ -437,8 +451,14 @@
Def_Effect_IceDefPer = 62
#基础装备生命百分比
Def_Effect_BaseEquipMaxHPAddPer = 63
+Def_Effect_BaseEquipMaxHPAddPer_ShenPin = 164 # 神品
+Def_Effect_BaseEquipMaxHPAddPer_XianPin = 165 # 仙品
+Def_Effect_BaseEquipMaxHPAddPer_JiPin = 166 # 极品
#基础装备攻击百分比
Def_Effect_BaseEquipAtkAddPer = 65
+Def_Effect_BaseEquipAtkAddPer_ShenPin = 161 # 神品
+Def_Effect_BaseEquipAtkAddPer_XianPin = 162 # 仙品
+Def_Effect_BaseEquipAtkAddPer_JiPin = 163 # 极品
#防具防御百分比 - 废弃
Def_Effect_ArmorDefAddPer = 66
#主手基础属性值 百分比
@@ -619,9 +639,10 @@
Def_BT_NewFCCostGold, #消费排行榜(新仙界盛典)
Def_BT_Campaign_LingGen, #灵根总点(开服活动榜)
+ Def_BT_Campaign_StarLV, #升星等级(开服活动榜) 25
Def_BT_Max, #排行榜最大类型
-) = range(0, 24 + 2)
+) = range(0, 25 + 2)
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
@@ -1144,7 +1165,8 @@
Def_Campaign_Type_Recharge, # 累计充值排行 9
Def_Campaign_Type_PetLV, # 灵宠等级排行 10
Def_Campaign_Type_LingGen, # 灵根点数排行 11
-) = range(1, 1 + 11)
+Def_Campaign_Type_StarLV, # 升星等级排行 12
+) = range(1, 1 + 12)
# 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
Def_Campaign_Billboard_Dict = {
@@ -1159,6 +1181,7 @@
Def_Campaign_Type_Recharge:Def_BT_Campaign_Recharge,
Def_Campaign_Type_PetLV:Def_BT_Campaign_PetLV,
Def_Campaign_Type_LingGen:Def_BT_Campaign_LingGen,
+ Def_Campaign_Type_StarLV:Def_BT_Campaign_StarLV,
}
#队伍最大人数
@@ -1207,6 +1230,7 @@
ClientServerMsg_GMCMD = "GMCMD" # GM命令
ClientServerMsg_ViewPlayerCache = "ViewPlayerCache" # 查看跨服玩家信息
ClientServerMsg_PKMatch = "PKMatch" # 跨服PK匹配
+ClientServerMsg_PKRobotOver = "PKRobotOver" # 跨服PK机器人结算
ClientServerMsg_PKCancel = "PKCancel" # 跨服PK取消匹配
ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕
ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜
@@ -1254,6 +1278,8 @@
Def_IudetWingMaterialItemCount = 29 # 翅膀精炼材料个数列表
Def_IudetDogzEquipPlus = 31 # 神兽装备强化信息列表 [强化等级, 累计总熟练度]
Def_IudetItemDecompound = 33 # 拆解返还物品列表 [装备ID,材料1ID,个数,是否绑定,材料2ID,个数,是否绑定,...]
+Def_IudetLiantaiItemID = 35 # 合成该莲台的所有莲台ID [itemID, itemID, ...]
+Def_IudetAddSkillID = 37 # 可添加的技能ID列表 [skillID, skillID, ...]
Def_IudetItemColor = 16 # 物品颜色，如果该值没有就取物品
Def_IudetItemCount = 18 # 物品个数，支持20亿，目前仅特殊转化物品会用到
@@ -1278,6 +1304,8 @@
Def_IudetPet_QualityLV = 206 # 品质
Def_IudetPet_Exp = 208 # 经验
Def_IudetPet_Skill = 201 # 技能列表
+
+Def_IudetHorsePetSkinIndex = 210 # 骑宠觉醒外观索引
# ----------------------------------------------------
# 宠物物品数据状态
@@ -1415,7 +1443,7 @@
DailyActionID_EquipPlus, # 强化
DailyActionID_FieldFight, # 野外挂机
DailyActionID_OfflineFight, # 脱机挂机
-DailyActionID_RefineStove, # 炼丹材料消耗 6
+DailyActionID_RefineStove, # 炼丹材料消耗 6(废弃)
DailyActionID_Dice, # 我要太极
DailyActionID_Pray, # 祈愿
DailyActionID_WorldBOSS, # 世界BOSS
@@ -1437,7 +1465,8 @@
DailyActionID_FairyDomain, # 缥缈仙域 25
DailyActionID_AuctionItem, # 拍卖行上架/竞拍 26
DailyActionID_LeiFaBoss, # 雷罚boss 27
-) = range(1, 27 + 1)
+DailyActionID_CrossPenglai, # 跨服蓬莱仙境Boss 28
+) = range(1, 28 + 1)
@@ -1669,12 +1698,6 @@
dogzetClaw, # 神兽兽爪
dogzetScute, # 神兽鳞甲
) = range(101, 101 + 5)
-
-# 共享通用装备位，可装备同一类型装备
-ShareEquipPlace = [
- [zxetGlove, zxetGlove2],
- [zxetRing, zxetRing2],
- ]
# 请求进入副本通用检查结果，优先提示的放前面(即索引越大，提示优先级越低)
EnterFBAskResult = (
--
Gitblit v1.8.0