From a4609786df8768c1c138dc261d1b924860c9f07b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 21 一月 2019 17:52:17 +0800
Subject: [PATCH] 5931 【后端】【1.5.100】诛仙装备开发（诛仙物品背包34、诛仙装备背包35、诛仙装备传奇属性生成规则支持）
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 88 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 72 insertions(+), 16 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index cfd7eb2..84a8327 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -167,6 +167,9 @@
Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo" # 仙盟宴会数据
+Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState" # 跨服服务器链接状态
+Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen" # 跨服服务器是否开启中
+
Def_Notify_WorldKey_CrossPKZoneID = "CrossPKZoneID" # 本服跨服PK所属赛区
Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID" # 本服跨服PK当前赛季
Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState" # 本服跨服PK赛季状态 0-关闭，1-开启中
@@ -174,7 +177,8 @@
Def_Notify_WorldKey_MixServerCampaignSaveData = "MixServerCampaignSaveData_%s" # 合服活动记录数据时机0-否 1-是
Def_Notify_WorldKey_MixServerCampaignGetAward = "MixServerCampaignGetAward_%s" # 合服活动可领奖时机0-否 1-是
-Def_Notify_WorldKey_GameWorldBossReborn = 'GameWorldBossReborn_%s' # 世界boss重生, %s为标识点28,29
+Def_Notify_WorldKey_GameWorldBossRebornCross = 'BossRebornCross_%s_%s' # 跨服世界boss重生, 参数为（zoneID, bossID）
+Def_Notify_WorldKey_GameWorldBossReborn = 'BossReborn_%s' # 世界boss重生, 参数为（bossID）
Def_Notify_WorldKey_BossKilledCnt = 'BossKilledCnt_%s' # boss击杀次数, 参数为NPCID
Def_Notify_WorldKey_GameWorldBossOnlineCnt = "GameWorldBossOnlineCnt_%s" #世界boss重生时间计算 在线人数统计 %s为bossid
Def_Notify_WorldKey_BossShuntPlayer = 'BossShuntPlayer' # boss分流玩家信息
@@ -225,11 +229,14 @@
OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
+OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
+OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate,
OperationActionName_BossReborn,OperationActionName_SpringSale,
OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
OperationActionName_RealmPoint, OperationActionName_FlashSale,
- OperationActionName_WishingWell, OperationActionName_TotalRecharge]
+ OperationActionName_WishingWell, OperationActionName_TotalRecharge,
+ OperationActionName_WeekParty, OperationActionName_LoginAward, ]
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]
@@ -779,7 +786,10 @@
CDBPlayerRefresh_SoulDust, # 魂尘 196
CDBPlayerRefresh_SoulSplinters, # 聚魂碎片 197
CDBPlayerRefresh_SoulCore, # 核心环 198
-) = range(146, 199)
+CDBPlayerRefresh_Honor, # 荣誉 199
+CDBPlayerRefresh_ZhuxianRate, # 诛仙一击概率 200
+CDBPlayerRefresh_ZhuxianHurtPer, # 诛仙一击伤害百分比 201
+) = range(146, 202)
TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
@@ -789,6 +799,7 @@
TYPE_Price_FamilyActivity = 15 # 仙盟活跃令
TYPE_Price_FBHelpPoint = 16 # 副本助战积分, 废弃
TYPE_Price_XianyuanCoin = 17 # 仙缘币
+TYPE_Price_Honor = 18 # 荣誉
TYPE_Price_Rune = 23 # 符印精华点
TYPE_Price_RuneSplinters = 24 # 符印碎片
TYPE_Price_TreasureScore = 25 # 寻宝积分
@@ -804,7 +815,6 @@
TYPE_Price_HighLadder_Currency = 102 # 天梯竞技场积分
TYPE_Price_HighLadder_Signet = 103 # 物品兑换(圣光晶石)
TYPE_Price_GongXun = 105 # 功勋点
-TYPE_Price_Honor = 108 # 荣誉商店积分
TYPE_Price_ArrestPoint = 110 # 悬赏积分
# 物品兑换
@@ -827,6 +837,7 @@
TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,
+ TYPE_Price_Honor:CDBPlayerRefresh_Honor,
}
# 高效战斗状态
@@ -869,6 +880,7 @@
GameFuncID_LittleHelper = 146 # 小助手
GameFuncID_TJG = 147 # 脱机挂
GameFuncID_SuperGift = 150 # 超值礼包
+GameFuncID_ZhuXianBoss = 163 # 诛仙BOSS
# 以下为暂时无用的
GameFuncID_Truck = 33 # 运镖
GameFuncID_RunDaily = 34 # 日常跑环
@@ -892,7 +904,9 @@
Def_TalkExtraValue_Bit_GM, #GM
Def_TalkExtraValue_Bit_JOB, #job
Def_TalkExtraValue_Bit_BubbleBox, #气泡框
-) = range(0, 4)
+Def_TalkExtraValue_Bit_ServerGroupID, #服务器组ID
+Def_TalkExtraValue_Bit_LV, #等级
+) = range(0, 6)
#聊天信息附加值中某信息数据所占位置
#{聊天信息附加值类型:[起始位置(从左往右), 结束位置(不包含)]}
@@ -901,6 +915,8 @@
Def_TalkExtraValue_Bit_GM:[2, 3], # GM
Def_TalkExtraValue_Bit_JOB:[3, 4], # job
Def_TalkExtraValue_Bit_BubbleBox:[4, 6], # 气泡框
+ Def_TalkExtraValue_Bit_ServerGroupID:[6, 13], # 服务器组ID
+ Def_TalkExtraValue_Bit_LV:[13, 17], # 等级
}
# 聊天频道 暂用语音
@@ -919,8 +935,10 @@
rptPet, # 宠物背包(用物品存储宠物的数据) 31
rptDogzItem, # 神兽物品背包 32
rptDogzEquip, # 神兽装备背包 33
+rptZhuXianItem, # 诛仙物品背包 34
+rptZhuXianEquip, # 诛仙装备背包 35
rptMax, # 最大背包类型数量，放在最后一个
-) = range(28, 28 + 7) #C++定义的枚举到２７
+) = range(28, 28 + 9) #C++定义的枚举到２７
#虚拟背包类型, 从255递减
Def_VPack_TypeList = (
@@ -949,7 +967,7 @@
Def_UniversalGameRecType_StoreServerCntRecord, #商店全服购买记录 8,
Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10
- Def_UniversalGameRecType_11,
+ Def_UniversalGameRecType_ZhuXianBossRecord, #诛仙BOSS结算记录11
Def_UniversalGameRecType_12,
Def_UniversalGameRecType_13,
Def_UniversalGameRecType_Reward, # 通用奖励表(TopBar)14
@@ -968,7 +986,7 @@
Def_UniversalGameRecType_27,
Def_UniversalGameRecType_28,
Def_UniversalGameRecType_BossInfo, # boss信息29
- Def_UniversalGameRecType_30,
+ Def_UniversalGameRecType_CrossBossInfo, # 跨服boss信息
Def_UniversalGameRecType_31,
Def_UniversalGameRecType_32,
Def_UniversalGameRecType_ManorWarInfo, # 领地争夺战占领结果33
@@ -1180,8 +1198,10 @@
] = range(3)
# 跨服服务器发送子服信息定义
+CrossServerMsg_CrossServerState = "CrossServerState" # 跨服服务器状态变更
CrossServerMsg_ExitCrossServer = "ExitCrossServer" # 退出跨服服务器
CrossServerMsg_Notify = "Notify" # 提示信息
+CrossServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天
CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果
CrossServerMsg_PKMatchReqRet = "PKMatchReqRet" # 跨服PK匹配请求结果
CrossServerMsg_PKMatchResult = "PKMatchResult" # 跨服PK匹配结果
@@ -1190,20 +1210,32 @@
CrossServerMsg_PKOverInfo = "PKOverInfo" # 跨服PK结果
CrossServerMsg_PKSeasonInfo = "PKSeasonInfo" # 跨服PK赛季信息
CrossServerMsg_PKSyncBillboard = "PKSyncBillboard" # 跨服PK同步排行榜
+CrossServerMsg_CrossBossInfo = "CrossBossInfo" # 跨服Boss信息
+CrossServerMsg_CrossBossState = "CrossBossState" # 跨服Boss状态
+CrossServerMsg_PutInItem = "PutInItem" # 获得物品
+CrossServerMsg_GiveMoney = "GiveMoney" # 获得货币
+CrossServerMsg_DropGoodItem = "DropGoodItem" # 掉落好物品
+CrossServerMsg_RebornRet = "RebornRet" # 复活结果
+CrossServerMsg_NPCInfoRet = "NPCInfoRet" # 跨服地图NPC信息
+CrossServerMsg_CollectNPCOK = "CollectNPCOK" # 采集NPC完成
# 子服发送跨服信息定义
ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
+ClientServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天
ClientServerMsg_GMCMD = "GMCMD" # GM命令
ClientServerMsg_ViewPlayerCache = "ViewPlayerCache" # 查看跨服玩家信息
ClientServerMsg_PKMatch = "PKMatch" # 跨服PK匹配
ClientServerMsg_PKCancel = "PKCancel" # 跨服PK取消匹配
ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕
ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜
+ClientServerMsg_Reborn = "Reborn" # 复活
+ClientServerMsg_QueryNPCInfo = "QueryNPCInfo" # 查询跨服地图NPC信息
+ClientServerMsg_SetPlayerAttrValue = "SetPlayerAttrValue" # 玩家属性数值更新
+ClientServerMsg_CollectNPC = "CollectNPC" # 采集NPC
-# 跨服活动类型
-(
-Def_CrossAction_PK, # 跨服匹配PK
-) = range(1)
+#跨服广播类型定义
+CrossNotify_World = "World"
+CrossNotify_Family = "Family"
#角色改名结果
(
@@ -1253,6 +1285,7 @@
Def_IudetWingProgressValue = 42 #羽翼精炼值
Def_IudetCreateTime = 44 # 时效物品的创建时间
Def_IudetGatherSoulLV = 46 # 聚魂等级
+Def_IudetExpireTime = 48 # 时效物品指定有效时间，时间单位由时效类型决定
# 200~300 宠物数据用
Def_IudetPet_NPCID = 200 # npcID
Def_IudetPet_ClassLV = 202 # 阶级
@@ -1314,7 +1347,7 @@
)=range(5)
# 战斗力模块类型
-Def_MFPType_Max = 27
+Def_MFPType_Max = 28
ModuleFightPowerTypeList = (
Def_MFPType_Role, # 角色 0
Def_MFPType_Equip, # 装备(基本装备位) 1
@@ -1340,6 +1373,7 @@
Def_MFPType_Dogz, # 神兽 21
Def_MFPType_GatherSoul, # 聚魂 22
Def_MFPType_MagicWeapon4, # 王者法宝 23
+Def_MFPType_Coat, # 时装 24
Def_MFPType_Other, # 其他
#以下暂时没用到，改时再处理
@@ -1492,7 +1526,8 @@
DailyActionID_IceLode, # 冰晶矿脉
DailyActionID_HelpBattleCheckIn, # 助战登记 20
DailyActionID_CrossReamPK, # 跨服PK 21
-) = range(1, 21 + 1)
+DailyActionID_ZhuXianBoss, # 诛仙BOSS 22
+) = range(1, 22 + 1)
@@ -1696,8 +1731,11 @@
retBaldric5, #17 佩饰
retBaldric6, #18 佩饰
retHorse, #19 坐骑
+ retWeaponSkin, #20 时装武器
+ retClothesSkin, #21 时装衣服
+ retWeapon2Skin, #22 时装副手
retMax,
-) = range(1, 21)
+) = range(1, 24)
# 神兽装备位定义
@@ -1708,6 +1746,22 @@
dogzetClaw, # 神兽兽爪
dogzetScute, # 神兽鳞甲
) = range(101, 101 + 5)
+
+# 诛仙装备位定义
+ZhuXianEquipPlace = (
+ zxetCloak, # 诛仙披风 121
+ zxetMask, # 诛仙面具 122
+ zxetGlove, # 诛仙手套 123
+ zxetGlove2, # 诛仙手套 124
+ zxetRuyi, # 诛仙如意 125
+ zxetPendant, # 诛仙吊坠 126
+ zxetRing, # 诛仙戒指 127
+ zxetRing2, # 诛仙戒指 128
+ zxetWeapon1, # 诛仙剑1 129
+ zxetWeapon2, # 诛仙剑2 130
+ zxetWeapon3, # 诛仙剑3 131
+ zxetWeapon4, # 诛仙剑4 132
+) = range(121, 121 + 12)
# 请求进入副本通用检查结果，优先提示的放前面(即索引越大，提示优先级越低)
@@ -1726,9 +1780,11 @@
EntFBAskRet_InFB, # 11 副本中
EntFBAskRet_TJG, # 12 脱机挂中
EntFBAskRet_Sit, # 13 打坐中
+ EntFBAskRet_CrossPKMatching,# 14 跨服匹配中
+ EntFBAskRet_InCrossMap, # 15 跨服地图中
EntFBAskRet_Other, # xx 其他限制
EntFBAskRet_Max,
-) = range(16)
+) = range(18)
#增加仙盟活跃的活动类型
--
Gitblit v1.8.0