From bbab19065276532a54eb8905079ebf1d81915bdf Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 15 十一月 2021 11:19:08 +0800
Subject: [PATCH] 9351 【BT3】【BT4】【BT5】【主干】副本扫荡后不能完成任务（Boss复活、仙界盛典、周狂欢、节日游历、任务等）
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 38b4c10..2ba5892 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
@@ -234,6 +236,10 @@
OperationActionName_FeastTravel = "ActFeastTravel" # 节日游历活动
OperationActionName_ManyDayRecharge = "ActManyDayRecharge" # 多日连充活动
OperationActionName_SingleRecharge = "ActSingleRecharge" # 单笔累充活动
+OperationActionName_Turntable = "ActTurntable" # 转盘活动
+OperationActionName_HorsePetFeast = "ActHorsePetFeast" # 骑宠盛宴活动
+OperationActionName_GarbageSorting = "ActGarbageSorting" # 垃圾分类活动
+OperationActionName_XianXiaMJ = "ActXianXiaMJ" # 仙匣秘境活动
#节日活动类型列表 - 该类型无视开服天，日期到了就开启
FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
@@ -251,6 +257,8 @@
OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure,
OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
+ OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
+ OperationActionName_XianXiaMJ,
] + FeastOperationActionNameList
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell,
@@ -259,9 +267,9 @@
OperationActionName_CostRebate, OperationActionName_FlashGiftbag,
OperationActionName_SpringSale, OperationActionName_LuckyTreasure,
OperationActionName_DailyGiftbag, OperationActionName_GrowupBuy,
- OperationActionName_WeekParty,
- OperationActionName_CollectWords,
- OperationActionName_FeastLogin,
+ OperationActionName_WeekParty, OperationActionName_Turntable,
+ OperationActionName_CollectWords, OperationActionName_GarbageSorting,
+ OperationActionName_FeastLogin, OperationActionName_XianXiaMJ,
OperationActionName_FeastWish, OperationActionName_FeastTravel,
OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
]
@@ -271,6 +279,8 @@
OperationActionName_FlashGiftbag, OperationActionName_CostRebate,
OperationActionName_SpringSale, OperationActionName_FlashSale,
OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+ OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
+ OperationActionName_XianXiaMJ,
]
#跨服运营活动表名定义
@@ -609,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值为伤害值
@@ -706,9 +728,12 @@
Def_BT_SkyTower, #天星塔榜
Def_BT_Arena, #竞技场榜
+ Def_BT_Environment, #环保榜 (垃圾分类活动)
+ Def_BT_Charm, #魅力总榜 30
+ Def_BT_CharmDay, #魅力日榜
Def_BT_Max, #排行榜最大类型
-) = range(0, 28 + 2)
+) = range(0, 31 + 2)
''' 跨服排行榜类型, 从 150 开始
与本服榜单存储的是不一样的数据库表格，理论上类型可以和本服榜单类型重复，为了做下区分防误导，跨服榜单从 150 开始
@@ -949,7 +974,10 @@
CDBPlayerRefresh_ExAttr17, # ExAttr17
CDBPlayerRefresh_BossActScore, # boss 活动积分 230
CDBPlayerRefresh_FuncSysPrivilege, # 功能特权令 231
-) = range(146, 232)
+CDBPlayerRefresh_Environment, # 环保值 232
+CDBPlayerRefresh_MoneyMinusGold, # 仙玉 - 负值 233
+CDBPlayerRefresh_MoneyMinusGoldPaper, # 绑玉 - 负值 234
+) = range(146, 235)
TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
@@ -969,6 +997,7 @@
TYPE_Price_SoulSplinters = 29 # 聚魂碎片
TYPE_Price_SoulCore = 30 # 核心环
TYPE_Price_FuncSysPrivilege = 31 # 功能系统特权令
+TYPE_Price_Environment = 32 # 环保值
#以下是旧的金钱类型
TYPE_Price_Magic_Integral = 101 # 魔方寻宝积分
@@ -993,7 +1022,14 @@
TYPE_Price_Honor:CDBPlayerRefresh_Honor,
TYPE_Price_BossActScore:CDBPlayerRefresh_BossActScore,
TYPE_Price_FuncSysPrivilege:CDBPlayerRefresh_FuncSysPrivilege,
+ TYPE_Price_Environment:CDBPlayerRefresh_Environment,
}
+
+# 支持负值的货币及对应0418刷新类型
+MoneyMinusRefreshDict = {
+ 1:CDBPlayerRefresh_MoneyMinusGold,
+ 2:CDBPlayerRefresh_MoneyMinusGoldPaper,
+ }
# 高效战斗状态
Def_Battle_Status = (
@@ -1031,7 +1067,8 @@
GameFuncID_TJG = 147 # 脱机挂
GameFuncID_SuperGift = 150 # 超值礼包
GameFuncID_ZhuXianBoss = 163 # 诛仙BOSS
-GameFuncID_Arena = 189 # 竞技场
+GameFuncID_Arena = 195 # 竞技场
+GameFuncID_FaQi = 199 # 法器
# 以下为暂时无用的
GameFuncID_Truck = 33 # 运镖
GameFuncID_RunDaily = 34 # 日常跑环
@@ -1086,8 +1123,9 @@
rptPet, # 宠物背包(用物品存储宠物的数据) 31
rptDogzItem, # 神兽物品背包 32
rptDogzEquip, # 神兽装备背包 33
+rptGarbage, # 垃圾分类背包 34
rptMax, # 最大背包类型数量，放在最后一个
-) = range(28, 28 + 7) #C++定义的枚举到２７
+) = range(28, 28 + 8) #C++定义的枚举到２７
#虚拟背包类型, 从255递减
Def_VPack_TypeList = (
@@ -1344,6 +1382,7 @@
ClientServerMsg_CollectNPC = "CollectNPC" # 采集NPC
ClientServerMsg_EnterFB = "EnterFB" # 请求进入跨服副本
ClientServerMsg_AddBuff = "AddBuff" # 添加BUFF
+ClientServerMsg_LuckyCloudBuy = "LuckyCloudBuy" # 幸运云购
#跨服广播类型定义
CrossNotify_CrossAct = "CrossAct"
@@ -1448,7 +1487,7 @@
)=range(5)
# 战斗力模块类型
-Def_MFPType_Max = 26
+Def_MFPType_Max = 27
ModuleFightPowerTypeList = (
Def_MFPType_Role, # 角色 0
Def_MFPType_Equip, # 装备(装备本身) 1
@@ -1470,11 +1509,12 @@
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_Other, # 其他
) = range(Def_MFPType_Max)
@@ -1871,10 +1911,7 @@
RedPackType_FeastSysBig = 31 # 节日系统大红包
RedPackType_FeastSysSmall = 32 # 节日系统小红包
RedPackType_FeastSucc = 33 # 节日成就红包
+RedPackType_Server = 36 # 全服红包
+
# 节日红包类型
FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
-# 需要限制服务器最大红包数的红包类型 {统计个数编号:[红包类型, ...], ...}
-RedPackMaxCountDict = {1:[RedPackType_OpenServer],
- 2:[RedPackType_FeastSucc],
- }
-
--
Gitblit v1.8.0