From b1bb52bb7c6e5c36471140bf383be02d35fe92d4 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 11 一月 2019 22:34:21 +0800
Subject: [PATCH] 2857 【BUG】【1.5】采集被打断问题
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 3c04664..861350f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -177,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分流玩家信息
@@ -228,11 +229,13 @@
OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
+OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
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, ]
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]
@@ -973,7 +976,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
@@ -1196,6 +1199,13 @@
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信息
# 子服发送跨服信息定义
ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
@@ -1205,12 +1215,8 @@
ClientServerMsg_PKCancel = "PKCancel" # 跨服PK取消匹配
ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕
ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜
-
-# 跨服活动类型
-(
-Def_CrossAction_PK, # 跨服匹配PK
-Def_CrossAction_Penglai, # 跨服蓬莱仙境
-) = range(2)
+ClientServerMsg_Reborn = "Reborn" # 复活
+ClientServerMsg_QueryNPCInfo = "QueryNPCInfo" # 查询跨服地图NPC信息
#角色改名结果
(
@@ -1260,6 +1266,7 @@
Def_IudetWingProgressValue = 42 #羽翼精炼值
Def_IudetCreateTime = 44 # 时效物品的创建时间
Def_IudetGatherSoulLV = 46 # 聚魂等级
+Def_IudetExpireTime = 48 # 时效物品指定有效时间，时间单位由时效类型决定
# 200~300 宠物数据用
Def_IudetPet_NPCID = 200 # npcID
Def_IudetPet_ClassLV = 202 # 阶级
@@ -1321,7 +1328,7 @@
)=range(5)
# 战斗力模块类型
-Def_MFPType_Max = 27
+Def_MFPType_Max = 28
ModuleFightPowerTypeList = (
Def_MFPType_Role, # 角色 0
Def_MFPType_Equip, # 装备(基本装备位) 1
@@ -1347,6 +1354,7 @@
Def_MFPType_Dogz, # 神兽 21
Def_MFPType_GatherSoul, # 聚魂 22
Def_MFPType_MagicWeapon4, # 王者法宝 23
+Def_MFPType_Coat, # 时装 24
Def_MFPType_Other, # 其他
#以下暂时没用到，改时再处理
@@ -1703,8 +1711,11 @@
retBaldric5, #17 佩饰
retBaldric6, #18 佩饰
retHorse, #19 坐骑
+ retWeaponSkin, #20 时装武器
+ retClothesSkin, #21 时装衣服
+ retWeapon2Skin, #22 时装副手
retMax,
-) = range(1, 21)
+) = range(1, 24)
# 神兽装备位定义
--
Gitblit v1.8.0