From 97a175bb2d85221c1fd7ca94388493c87f920b7c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 14 二月 2019 11:28:07 +0800
Subject: [PATCH] 6211 【后端】【1.6】合服任务单（合服日常、限时副本定制支持）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 186 +++++++++++++++++++++++++++++++---------------
1 files changed, 125 insertions(+), 61 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index d561aec..ef34332 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -169,13 +169,11 @@
Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState" # 跨服服务器链接状态
Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen" # 跨服服务器是否开启中
+Def_Notify_WorldKey_CrossZoneName = "CrossZoneName" # 跨服分区名
Def_Notify_WorldKey_CrossPKZoneID = "CrossPKZoneID" # 本服跨服PK所属赛区
Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID" # 本服跨服PK当前赛季
Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState" # 本服跨服PK赛季状态 0-关闭，1-开启中
-
-Def_Notify_WorldKey_MixServerCampaignSaveData = "MixServerCampaignSaveData_%s" # 合服活动记录数据时机0-否 1-是
-Def_Notify_WorldKey_MixServerCampaignGetAward = "MixServerCampaignGetAward_%s" # 合服活动可领奖时机0-否 1-是
Def_Notify_WorldKey_GameWorldBossRebornCross = 'BossRebornCross_%s_%s' # 跨服世界boss重生, 参数为（zoneID, bossID）
Def_Notify_WorldKey_GameWorldBossReborn = 'BossReborn_%s' # 世界boss重生, 参数为（bossID）
@@ -214,8 +212,6 @@
Def_Notify_WorldKey_LoginAwardStartDate = 'LoginAwardStartDate_%s' # 登录领取奖励开始时间，参数为活动类型
Def_Notify_WorldKey_LoginAwardEndDate = 'LoginAwardEndDate_%s' # 登录领取奖励结束时间，参数为活动类型
-Def_Notify_WorldKey_ClearBillboardSign = 'ClearBillboardSign' # 清除排行榜标记
-
Def_Notify_WorldKey_RedPacketOutput = 'RedPacketOutput' # 红包产出信息
#运营活动表名定义
@@ -225,19 +221,34 @@
OperationActionName_BossReborn = "ActBossReborn" # BOSS复活活动
OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
OperationActionName_FairyCeremony = "ActFairyCeremony" # 仙界盛典活动
+OperationActionName_NewFairyCeremony = "ActNewFairyCeremony" # 仙界盛典活动
OperationActionName_RealmPoint = "ActRealmPoint" # 多倍修行点活动
OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
+OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
+OperationActionName_FeastWeekParty = "ActFeastWeekParty" # 节日巡礼狂欢活动
+OperationActionName_FeastRedPacket = "ActFeastRedPacket" # 节日红包活动
+OperationActionName_FeastCollectWords = "ActFeastCollectWords" # 节日集字活动
+OperationActionName_LuckyTreasure = "ActLuckyTreasure" # 幸运鉴宝活动
+#节日活动类型列表 - 该类型无视开服天，日期到了就开启
+FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket, OperationActionName_FeastCollectWords]
+#所有的运营活动列表，含节日活动
OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate,
OperationActionName_BossReborn,OperationActionName_SpringSale,
OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
OperationActionName_RealmPoint, OperationActionName_FlashSale,
OperationActionName_WishingWell, OperationActionName_TotalRecharge,
- OperationActionName_WeekParty, ]
+ OperationActionName_WeekParty, OperationActionName_LoginAward,
+ OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure] \
+ + FeastOperationActionNameList
#需要记录开启活动时的世界等级的运营活动
-NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]
+NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell,
+ OperationActionName_NewFairyCeremony, OperationActionName_FlashSale,
+ OperationActionName_BossReborn, OperationActionName_TotalRecharge,
+ OperationActionName_CostRebate, OperationActionName_FlashGiftbag,
+ OperationActionName_SpringSale, OperationActionName_LuckyTreasure]
#活动信息字典key定义
ActKey_ID = "ID" # 活动ID，唯一标识的ID，一般是活动开启的time值
@@ -477,6 +488,41 @@
Def_Effect_NPCHurtAddPer = 89 # 对怪物伤害加成
+Def_Effect_JobAHurtAddPer = 90 # 对目标战士伤害加成
+Def_Effect_JobBHurtAddPer = 91 # 对目标法师伤害加成
+Def_Effect_JobCHurtAddPer = 92 # 对目标弓箭伤害加成
+Def_Effect_JobAAtkReducePer = 93 # 战士攻击伤害减免
+Def_Effect_JobBAtkReducePer = 94 # 法师攻击伤害减免
+Def_Effect_JobCAtkReducePer = 95 # 弓箭攻击伤害减免
+
+Def_Effect_ZXCloakAttrPer = 96 # 诛仙披风属性加成百分比
+Def_Effect_ZXMaskAttrPer = 97 # 诛仙面具属性加成百分比
+Def_Effect_ZXGloveAttrPer = 98 # 诛仙手套属性加成百分比
+Def_Effect_ZXRuyiAttrPer = 99 # 诛仙如意属性加成百分比
+Def_Effect_ZXPendantAttrPer = 100 # 诛仙吊坠属性加成百分比
+Def_Effect_ZXRingAttrPer = 101 # 诛仙戒指属性加成百分比
+
+Def_Effect_SkillAddPer1 = 102 # 技能伤害增强1
+Def_Effect_SkillAddPer2 = 103 # 技能伤害增强2
+Def_Effect_SkillAddPer3 = 104 # 技能伤害增强3
+Def_Effect_SkillAddPer4 = 105 # 技能伤害增强4
+Def_Effect_SkillAddPer5 = 106 # 技能伤害增强5
+Def_Effect_SkillAddPer6 = 107 # 技能伤害增强6
+Def_Effect_SkillAddPer7 = 108 # 技能伤害增强7
+
+Def_Effect_SkillReducePer1 = 109 # 受到技能伤害减少1
+Def_Effect_SkillReducePer2 = 110 # 受到技能伤害减少2
+Def_Effect_SkillReducePer3 = 111 # 受到技能伤害减少3
+Def_Effect_SkillReducePer4 = 112 # 受到技能伤害减少4
+Def_Effect_SkillReducePer5 = 113 # 受到技能伤害减少5
+Def_Effect_SkillReducePer6 = 114 # 受到技能伤害减少6
+Def_Effect_SkillReducePer7 = 115 # 受到技能伤害减少7
+
+Def_Effect_ZXWeaponAttrPer = 116 # 诛仙剑1属性加成百分比
+Def_Effect_LXWeaponAttrPer = 117 # 诛仙剑2属性加成百分比
+Def_Effect_XXWeaponAttrPer = 118 # 诛仙剑3属性加成百分比
+Def_Effect_JXWeaponAttrPer = 119 # 诛仙剑4属性加成百分比
+
#增加%d物理伤害值,其中a值为伤害值
Def_Effect_AddAtk = 1005
#增加%d魔法伤害值,其中a值为伤害值
@@ -569,21 +615,19 @@
Def_BT_Campaign_Recharge, #累计充值(开服活动榜)
Def_BT_Campaign_PetLV, #灵宠等级(开服活动榜)
+ Def_BT_ZhuXianTower, #诛仙塔榜
+ Def_BT_NewFCCostGold, #消费排行榜(新仙界盛典)
+
Def_BT_HighLadder, #天梯竞技场排行
Def_BT_HighLadder_Yester, #天梯竞技场昨日排行
Def_BT_RechargeTeHuiLast, #充值特惠活动排行榜-上一期记录
Def_BT_RechargeTeHui, #充值特惠活动排行榜-当前期记录
- Def_BT_MixCampaign_PlayerBattle, #总战斗力(合服活动)
- Def_BT_MixCampaign_Recharge, #累计充值(合服活动)
- Def_BT_MixCampaign_WinFamilyMember, #获胜战盟成员,按职位排(合服活动)
- Def_BT_MixCampaign_FamilyKillBoss, #战盟击杀boss(合服活动)
-
Def_BT_CostTeHui, #消费特惠排行榜
Def_BT_CostTeHuiLast, #消费特惠排行榜上一期
Def_BT_Max, #排行榜最大类型
-) = range(0, 32 + 2)
+) = range(0, 30 + 2)
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
@@ -595,7 +639,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_FBHelpBattle,
+ Def_BT_FBHelpBattle, Def_BT_ZhuXianTower,
]
##---比率---
@@ -786,7 +830,9 @@
CDBPlayerRefresh_SoulSplinters, # 聚魂碎片 197
CDBPlayerRefresh_SoulCore, # 核心环 198
CDBPlayerRefresh_Honor, # 荣誉 199
-) = range(146, 200)
+CDBPlayerRefresh_ZhuxianRate, # 诛仙一击概率 200
+CDBPlayerRefresh_ZhuxianHurtPer, # 诛仙一击伤害百分比 201
+) = range(146, 202)
TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
@@ -877,6 +923,7 @@
GameFuncID_LittleHelper = 146 # 小助手
GameFuncID_TJG = 147 # 脱机挂
GameFuncID_SuperGift = 150 # 超值礼包
+GameFuncID_ZhuXianBoss = 163 # 诛仙BOSS
# 以下为暂时无用的
GameFuncID_Truck = 33 # 运镖
GameFuncID_RunDaily = 34 # 日常跑环
@@ -931,8 +978,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 = (
@@ -961,8 +1010,8 @@
Def_UniversalGameRecType_StoreServerCntRecord, #商店全服购买记录 8,
Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10
- Def_UniversalGameRecType_11,
- Def_UniversalGameRecType_12,
+ Def_UniversalGameRecType_ZhuXianBossRecord, #诛仙BOSS结算记录11
+ Def_UniversalGameRecType_LuckyTreasure, #幸运鉴宝大奖记录12
Def_UniversalGameRecType_13,
Def_UniversalGameRecType_Reward, # 通用奖励表(TopBar)14
Def_UniversalGameRecType_15,
@@ -1099,9 +1148,6 @@
Def_Enter_Truck, #进入骠车
) = range(1, 3)
-Def_OSC_ValidDay = 6 # 开服活动有效活动天
-Def_MSC_ValidDay = 5 # 合服活动有效活动天
-
# 开服活动类型标识, 不可超过32
Def_Campaign_Type_List = (
Def_Campaign_Type_PlusLV, # 强化等级排行 1
@@ -1142,40 +1188,6 @@
Def_CampaignAwardState_None, # 无
Def_CampaignAwardState_Allow, # 允许领奖
Def_CampaignAwardState_Over, # 领奖结束
-) = range(3)
-
-#合服活动类型标识
-Def_MixCampaign_Type_List = (
- Def_MixCampaign_Type_PlayerBattle, # 总战斗力0
- Def_MixCampaign_Type_RechargeFirst, # 首充奖励1
- Def_MixCampaign_Type_RechargeRank, # 累计充值排行奖励2
- Def_MixCampaign_Type_RechargeCnt, # 累计充值保底奖励3
- Def_MixCampaign_Type_FamilyWar, # 冰封王座家族战获胜家族成员奖励4
- Def_MixCampaign_Type_FamilyWarEnter, # 冰封王座参与奖5
- Def_MixCampaign_Type_FamilyKillBoss, # 战盟击杀boss排行
- Def_MixCampaign_Type_PlayerKillBoss, # 个人击杀boss
-) = range(8)
-
-#合服活动类型对应的奖励排行榜
-Def_MixCampaign_Billboard_Dict = {
- Def_MixCampaign_Type_PlayerBattle:Def_BT_MixCampaign_PlayerBattle, # 总战斗力
- Def_MixCampaign_Type_RechargeRank:Def_BT_MixCampaign_Recharge, # 累计充值排行
- Def_MixCampaign_Type_FamilyWar:Def_BT_MixCampaign_WinFamilyMember, # 获胜战盟成员
- Def_MixCampaign_Type_FamilyKillBoss:Def_BT_MixCampaign_FamilyKillBoss, # 战盟击杀boss排行
- }
-
-# 直接在MapServer中处理的合服活动类型
-DoOnMapServerMixCampaignTypeList = [
- Def_MixCampaign_Type_RechargeFirst,
- Def_MixCampaign_Type_RechargeCnt,
- Def_MixCampaign_Type_FamilyWarEnter,
- Def_MixCampaign_Type_PlayerKillBoss,
- ]
-# 合服活动请求GameServer操作类型定义
-(
-Def_MSCGameServerQuery_QueryAward, # 查询
-Def_MSCGameServerQuery_GetAward, # 领奖
-Def_MSCGameServerQuery_MailAward, # 邮件发送奖励
) = range(3)
#队伍最大人数
@@ -1226,6 +1238,10 @@
ClientServerMsg_QueryNPCInfo = "QueryNPCInfo" # 查询跨服地图NPC信息
ClientServerMsg_SetPlayerAttrValue = "SetPlayerAttrValue" # 玩家属性数值更新
ClientServerMsg_CollectNPC = "CollectNPC" # 采集NPC
+
+#跨服广播类型定义
+CrossNotify_World = "World"
+CrossNotify_Family = "Family"
#角色改名结果
(
@@ -1337,7 +1353,7 @@
)=range(5)
# 战斗力模块类型
-Def_MFPType_Max = 28
+Def_MFPType_Max = 29
ModuleFightPowerTypeList = (
Def_MFPType_Role, # 角色 0
Def_MFPType_Equip, # 装备(基本装备位) 1
@@ -1364,6 +1380,7 @@
Def_MFPType_GatherSoul, # 聚魂 22
Def_MFPType_MagicWeapon4, # 王者法宝 23
Def_MFPType_Coat, # 时装 24
+Def_MFPType_ZhuXian, # 诛仙 25
Def_MFPType_Other, # 其他
#以下暂时没用到，改时再处理
@@ -1516,7 +1533,8 @@
DailyActionID_IceLode, # 冰晶矿脉
DailyActionID_HelpBattleCheckIn, # 助战登记 20
DailyActionID_CrossReamPK, # 跨服PK 21
-) = range(1, 21 + 1)
+DailyActionID_ZhuXianBoss, # 诛仙BOSS 22
+) = range(1, 22 + 1)
@@ -1656,10 +1674,19 @@
SuccType_Collect, #采集X物品X次131
SuccType_InlayGatherSoul, #镶嵌X枚X品质聚魂（不包含核心）132
SuccType_GatherSoulLvUp, #累计聚魂总等级XX（不包含核心）133
-) = range(1, 134)
+SuccType_FeastRedPack_TalkWorld, #节日红包 - 世界频道发言 x次 134
+SuccType_FeastRedPack_Pray, # 节日红包 - 祈祷x次 135
+SuccType_FeastRedPack_KillSpecificNPC, # 节日红包 - 击杀特定NPC x次 136
+SuccType_FeastRedPack_KillBoss, # 节日红包 - 指定类型boss x次 137
+SuccType_FeastRedPack_EnterMap, # 节日红包 - 进入指定地图 x次 138
+SuccType_FeastRedPack_TaskCRun, # 节日红包 - 完成x次日常环任务成就 139
+SuccType_FeastRedPack_Dice, # 节日红包 - 天机摇骰子x次 140
+SuccType_FeastRedPack_CrossPK, # 节日红包 - 跨服PK x次 141
+SuccType_FeastRedPack_FBSweep, # 节日红包 - 副本扫荡 x次 142
+) = range(1, 143)
-
-
+# 节日红包成就类型
+FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
# 连续天规则的成就类型
ContinueSuccessTypeList = []
@@ -1674,6 +1701,8 @@
SuccType_EquipSuit,SuccType_Collect,SuccType_DogzBattle,
SuccType_UseItem,SuccType_FamilyTechLV,
SuccType_GetSpecialItem,SuccType_GetMagicWeapon,SuccType_FBEncourage,SuccType_XBXZ,
+ SuccType_FeastRedPack_KillSpecificNPC,SuccType_FeastRedPack_KillBoss,
+ SuccType_FeastRedPack_EnterMap, SuccType_FeastRedPack_FBSweep,
]
#传进来的条件满足配置的条件列表中的一个就行的成就类型
ContainSuccessTypeList = [SuccType_CompoundItemEx, SuccType_PickUpItem, SuccType_MWSkillUp]
@@ -1736,6 +1765,27 @@
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)
+
+# 共享通用装备位，可装备同一类型装备
+ShareEquipPlace = [
+ [zxetGlove, zxetGlove2],
+ [zxetRing, zxetRing2],
+ ]
# 请求进入副本通用检查结果，优先提示的放前面(即索引越大，提示优先级越低)
EnterFBAskResult = (
@@ -1754,9 +1804,10 @@
EntFBAskRet_TJG, # 12 脱机挂中
EntFBAskRet_Sit, # 13 打坐中
EntFBAskRet_CrossPKMatching,# 14 跨服匹配中
+ EntFBAskRet_InCrossMap, # 15 跨服地图中
EntFBAskRet_Other, # xx 其他限制
EntFBAskRet_Max,
-) = range(17)
+) = range(18)
#增加仙盟活跃的活动类型
@@ -1777,3 +1828,16 @@
Def_Boss_Func_Dogz, # 神兽功能BOSS
) = range(3)
+# 红包类型定义
+RedPackType_GoldPacket = 0 # 主动发钻石红包
+RedPackType_OpenServer = 5 # 开服红包
+RedPackType_FeastSysBig = 31 # 节日系统大红包
+RedPackType_FeastSysSmall = 32 # 节日系统小红包
+RedPackType_FeastSucc = 33 # 节日成就红包
+# 节日红包类型
+FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
+# 需要限制服务器最大红包数的红包类型 {统计个数编号:[红包类型, ...], ...}
+RedPackMaxCountDict = {1:[RedPackType_OpenServer],
+ 2:[RedPackType_FeastSucc],
+ }
+
--
Gitblit v1.8.0