From f15a181fbf2b61631b51e5e3a431c7cff6b15029 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 17 九月 2020 11:27:48 +0800
Subject: [PATCH] 8483 【后端】【主干】【changwei】【bt】协助方和被协助方任何模式不会互相造成伤害
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 97 ++++++++++++++++++++++++++++++------------------
1 files changed, 60 insertions(+), 37 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 4d97373..9ca39b5 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -146,6 +146,7 @@
Def_Notify_WorldKey_MapServerScriptReloadVersion = 'MapServerScriptReloadVersion' # MapServer 脚本重读版本标记
Def_Notify_WorldKey_InitGameWorldTime = "InitGameWorldTime" #启动服务器时间
Def_Notify_WorldKey_OperationActionInfo = "OperationActionInfo_%s" # 运营活动信息，参数为运营活动名
+Def_Notify_WorldKey_ActionBossRebornSign = "ActBossSign_%s" # 活动boss重生标记，参数为日常活动ID 或 运营活动名
Def_Notify_WorldKey_DailyActionState = "DailyActionState_%s" # 日常活动状态，参数为日常活动ID
Def_Notify_WorldKey_CrossDailyActionState = "CrossDailyActionState_%s" # 跨服日常活动状态，参数为日常活动ID
Def_Notify_WorldKey_FBEnterTimeLimiitMapID = "FBEnterTimeLimiitMapID" # 进入副本有时间限制的地图ID列表
@@ -195,12 +196,16 @@
Def_Notify_WorldKey_RedPacketOutput = 'RedPacketOutput' # 红包产出信息
Def_Notify_WorldKey_HurtLog = 'HurtLog' # 战斗伤害日志
Def_Notify_WorldKey_FairyDomainLimit = "FairyDomainLimit" # 缥缈仙域限制事件
+
+Def_Notify_WorldKey_AssistBoss = "AssistBoss" # 协助boss
+
#运营活动表名定义
OperationActionName_ExpRate = "ActExpRate" # 多倍经验活动
OperationActionName_CostRebate = "ActCostRebate" # 消费返利活动
OperationActionName_SpringSale = "ActSpringSale" # 限时特惠活动
OperationActionName_BossReborn = "ActBossReborn" # BOSS复活活动
OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
+OperationActionName_DailyGiftbag = "ActDailyGiftbag" # 每日礼包活动
OperationActionName_FairyCeremony = "ActFairyCeremony" # 仙界盛典活动
OperationActionName_NewFairyCeremony = "ActNewFairyCeremony" # 仙界盛典活动
OperationActionName_RealmPoint = "ActRealmPoint" # 多倍修行点活动
@@ -222,7 +227,8 @@
OperationActionName_RealmPoint, OperationActionName_FlashSale,
OperationActionName_WishingWell, OperationActionName_TotalRecharge,
OperationActionName_WeekParty, OperationActionName_LoginAward,
- OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure] \
+ OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure,
+ OperationActionName_DailyGiftbag] \
+ FeastOperationActionNameList
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell,
@@ -276,8 +282,9 @@
Def_ViewExpType_Sys , #系统给经验-需要展示倍率，实际不享受 5
Def_ViewExpType_RealmBuff, #境界全服福利经验(玄女天花) 6
Def_ViewExpType_SysEx, #系统给经验-不需要展示倍率 用来区别于类型0 7
- Def_ViewExpType_LYZS, #烈焰战神 特殊特效
-) = range(0, 9)
+ Def_ViewExpType_LYZS, #烈焰战神 特殊特效 8
+ Def_ViewExpType_Activity, #活跃吸纳 9
+) = range(0, 10)
#物品相关操作类型
@@ -630,8 +637,8 @@
Def_BT_Realm, #境界榜
Def_BT_TotalRecharge, #充值排行榜 10
- Def_BT_Campaign_PlusLV, #强化等级(开服活动榜)
- Def_BT_Campaign_HorseLV, #坐骑等级(开服活动榜)
+ Def_BT_Campaign_Plus, #强化战力(开服活动榜)
+ Def_BT_Campaign_Horse, #坐骑战力(开服活动榜)
Def_BT_Campaign_StoneLV, #宝石等级(开服活动榜)
Def_BT_Campaign_LV, #冲级排行(开服活动榜)
Def_BT_Campaign_RealmLV, #境界等级(开服活动榜) 15
@@ -639,7 +646,7 @@
Def_BT_FCCostGold, #消费排行榜(仙界盛典)
Def_BT_Campaign_RuneLV, #符印等级(开服活动榜)
- Def_BT_FBHelpBattle, #助战次数排行榜
+ Def_BT_19,
Def_BT_Campaign_GodWeaponLV, #神兵等级(开服活动榜) 20
Def_BT_Campaign_Recharge, #累计充值(开服活动榜)
Def_BT_Campaign_PetLV, #灵宠等级(开服活动榜)
@@ -647,9 +654,12 @@
Def_BT_NewFCCostGold, #消费排行榜(新仙界盛典)
Def_BT_Campaign_LingGen, #灵根总点(开服活动榜)
Def_BT_Campaign_StarLV, #升星等级(开服活动榜) 25
+ Def_BT_Campaign_Wash, #洗练战力(开服活动榜)
+
+ Def_BT_SkyTower, #天星塔榜
Def_BT_Max, #排行榜最大类型
-) = range(0, 25 + 2)
+) = range(0, 27 + 2)
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
@@ -661,7 +671,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_SkyTower,
]
##---比率---
@@ -823,7 +833,7 @@
CDBPlayerRefresh_RealmPoint, # 境界修炼点
CDBPlayerRefresh_Ysog, # 魔精
CDBPlayerRefresh_FamilyActivity, # 仙盟活跃令
-CDBPlayerRefresh_Xianyuancoin, # 仙缘币
+CDBPlayerRefresh_174,
CDBPlayerRefresh_PKState, # 战斗状态 175
CDBPlayerRefresh_BossState, # boss状态
CDBPlayerRefresh_BaseAtkMin, # 基础最小攻击
@@ -888,7 +898,6 @@
TYPE_Price_Ysog = 14 # 魔精
TYPE_Price_FamilyActivity = 15 # 仙盟活跃令
TYPE_Price_FBHelpPoint = 16 # 副本助战积分, 废弃
-TYPE_Price_XianyuanCoin = 17 # 仙缘币
TYPE_Price_Honor = 18 # 荣誉
TYPE_Price_Rune = 23 # 符印精华点
TYPE_Price_RuneSplinters = 24 # 符印碎片
@@ -916,7 +925,6 @@
TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
TYPE_Price_FamilyActivity:CDBPlayerRefresh_FamilyActivity,
- TYPE_Price_XianyuanCoin:CDBPlayerRefresh_Xianyuancoin,
TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
@@ -947,6 +955,7 @@
GameFuncID_Friend = 73 # 好友
GameFuncID_SignDay = 81 # 签到
GameFuncID_RefineStove = 87 # 炼丹炉
+GameFuncID_EquipWash = 91 # 洗练
GameFuncID_Treasure = 99 # 寻宝
GameFuncID_FirstGoldTip = 128 # 首充优势提示
GameFuncID_EquipDecompose = 123 # 装备分解
@@ -1042,7 +1051,7 @@
Def_UniversalGameRecType_YesterdayPlayerLVInfo,#昨日活跃玩家等级信息7
Def_UniversalGameRecType_StoreServerCntRecord, #商店全服购买记录 8,
Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
- Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10
+ Def_UniversalGameRecType_SkyTowerPassPlayer, #天星塔过关玩家记录10
Def_UniversalGameRecType_ZhuXianBossRecord, #诛仙BOSS结算记录11
Def_UniversalGameRecType_LuckyTreasure, #幸运鉴宝大奖记录12
Def_UniversalGameRecType_FairyDomain, #缥缈仙域事件次数记录13
@@ -1176,8 +1185,8 @@
# 开服活动类型标识, 不可超过32
Def_Campaign_Type_List = (
-Def_Campaign_Type_PlusLV, # 强化等级排行 1
-Def_Campaign_Type_HorseLV, # 坐骑等级排行 2
+Def_Campaign_Type_Plus, # 强化战力排行 1
+Def_Campaign_Type_Horse, # 坐骑战力排行 2
Def_Campaign_Type_StoneLV, # 宝石等级排行 3
Def_Campaign_Type_LV, # 冲级等级排行 4
Def_Campaign_Type_RealmLV, # 境界等级排行 5
@@ -1188,12 +1197,13 @@
Def_Campaign_Type_PetLV, # 灵宠等级排行 10
Def_Campaign_Type_LingGen, # 灵根点数排行 11
Def_Campaign_Type_StarLV, # 升星等级排行 12
-) = range(1, 1 + 12)
+Def_Campaign_Type_Wash, # 洗练战力排行 13
+) = range(1, 1 + 13)
# 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
Def_Campaign_Billboard_Dict = {
- Def_Campaign_Type_PlusLV:Def_BT_Campaign_PlusLV,
- Def_Campaign_Type_HorseLV:Def_BT_Campaign_HorseLV,
+ Def_Campaign_Type_Plus:Def_BT_Campaign_Plus,
+ Def_Campaign_Type_Horse:Def_BT_Campaign_Horse,
Def_Campaign_Type_StoneLV:Def_BT_Campaign_StoneLV,
Def_Campaign_Type_LV:Def_BT_Campaign_LV,
Def_Campaign_Type_RealmLV:Def_BT_Campaign_RealmLV,
@@ -1204,6 +1214,7 @@
Def_Campaign_Type_PetLV:Def_BT_Campaign_PetLV,
Def_Campaign_Type_LingGen:Def_BT_Campaign_LingGen,
Def_Campaign_Type_StarLV:Def_BT_Campaign_StarLV,
+ Def_Campaign_Type_Wash:Def_BT_Campaign_Wash,
}
#队伍最大人数
@@ -1512,7 +1523,7 @@
SuccType_KirinHomeEx, #通关麒麟之府X次成就7
SuccType_GodWeapon, # x神器达到X级成就8
SuccType_XXX9, # 废弃9
-SuccType_HorseAllLV, # X坐骑等级达到XX级 10
+SuccType_HorseAllLV, # 坐骑等级达到X级 10
SuccType_XXX11, # 废弃11
SuccType_KillBossHomeBoss, # BOSS之家BOSS击杀成就12
SuccType_XXX13, # 废弃13
@@ -1528,8 +1539,8 @@
SuccType_XXX23 , # 废弃23
SuccType_XXX24 , # 废弃24
SuccType_XXX25, # 废弃25
-SuccType_EquipPlus, # 强化x次成就26
-SuccType_EquipPlusLV, # x件装备强化等级达到x级27 (已废弃)
+SuccType_EquipPlus, # x件x阶x强化等级 26
+SuccType_XXX27, # 废弃27
SuccType_KillWorldBoss, # 击杀世界bossx次成就(有伤害就算)28
SuccType_XXX29, # 废弃29
SuccType_PassWagicWeapon, # 通关法宝副本30
@@ -1540,8 +1551,8 @@
SuccType_Pray, # 祈祷x次35
SuccType_KillSpecificNPC, # 击杀特定NPC36
SuccType_XXX37, # 废弃37
-SuccType_XXX38, # 废弃38
-SuccType_EquipColorItem, #穿戴某阶某品质的装备成就39
+SuccType_EquipPlace, # x件x阶x部位 38
+SuccType_EquipColorItem, # x件x阶x品质 39
SuccType_XXX40, #废弃40
SuccType_XXX41, #废弃41
SuccType_PassRuneTower, #通关符印塔成就42
@@ -1572,9 +1583,9 @@
SuccType_ChaosDemon, #混乱妖域X人以上队伍X评级通关67
SuccType_XXX68, #废弃68
SuccType_CompoundItemEx, #物品X的合成成功X次69
-SuccType_EquipWashLV1, #武器洗练X级（主手+副手）70
-SuccType_EquipWashLV2, #防具洗练X级（防具5件）71
-SuccType_EquipWashLV3, #仙器洗练X级（仙器3件）72
+SuccType_EquipWash, #x件x阶x洗练等级 70
+SuccType_XXX71, #废弃71
+SuccType_XXX72, #废弃72
SuccType_XXX73, #废弃73
SuccType_XXX74, #废弃74
SuccType_XXX75, #废弃75
@@ -1584,17 +1595,17 @@
SuccType_DujieFBHelpPass, #渡劫助战成功X次 79
SuccType_XXX80, #废弃 80
SuccType_FBEncourage, #x副本累计鼓舞X次 81
-SuccType_EquipArmor, #穿戴X颜色X星级X阶防具一套（5件防具） 82
-SuccType_EquipWeapon, #穿戴X颜色X星级X阶武器一套（主手+副手） 83
+SuccType_EquipStar, #x件x阶x星 82
+SuccType_XXX83, #废弃 83
SuccType_XXX84, #废弃 84
SuccType_XXX85, #废弃85
SuccType_XXX86, #废弃 86
SuccType_XXX87, #废弃 87
SuccType_XXX88, #废弃 88
-SuccType_XXX89, #仙盟宴会答题X题 89
-SuccType_EquipWing, #穿戴X阶X品质羽翼 90
+SuccType_XXX89, #废弃 89
+SuccType_XXX90, #废弃 90
SuccType_MWSkillUp, #X法宝潜力技能提升X级 91
-SuccType_EquipSuit, #套装 X件X阶普通（强化）防具套装 92
+SuccType_EquipSuit, # X件X阶套装 92
SuccType_TalkFamily, # 仙盟频道发言93
SuccType_UseItem, # 使用X物品X次94
SuccType_XXX95, # 废弃95
@@ -1645,7 +1656,8 @@
SuccType_FeastRedPack_Dice, # 节日红包 - 天机摇骰子x次 140
SuccType_FeastRedPack_CrossPK, # 节日红包 - 跨服PK x次 141
SuccType_FeastRedPack_FBSweep, # 节日红包 - 副本扫荡 x次 142
-) = range(1, 143)
+SuccType_PassSkyTower, #通关天星塔 143
+) = range(1, 144)
# 节日红包成就类型
FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
@@ -1655,17 +1667,28 @@
# 不向下适配检查的成就类型(指相对较高成就条件不会增加较低成就条件的进度)
UnDownCheckSuccessTypeList = [
- SuccType_EquipPlusLV, SuccType_GodWeapon,
+ SuccType_GodWeapon,
SuccType_MainTaskNode,SuccType_PassWagicWeapon,
SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
SuccType_Pray,SuccType_PetClassLV,
- SuccType_HorseAllLV, SuccType_QueenRelics,SuccType_XMZZConWin,
- SuccType_EquipSuit,SuccType_Collect,SuccType_DogzBattle,
+ SuccType_QueenRelics,SuccType_XMZZConWin,
+ 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,
]
+
+# 部分参数不向下适配检查的成就类型，此配置的类型不能在 UnDownCheckSuccessTypeList 里 {类型:[不向下适配的参数索引, ...], ...}
+PartUnDownCheckSuccessTypeInfo = {
+ SuccType_EquipSuit:[0], # 阶不向下适配
+ SuccType_EquipPlace:[0,1], # 阶、部位不向下适配
+ SuccType_EquipColorItem:[0], # 阶不向下适配
+ SuccType_EquipPlus:[0], # 阶不向下适配
+ SuccType_EquipWash:[0], # 阶不向下适配
+ SuccType_EquipStar:[0], # 阶不向下适配
+ }
+
#传进来的条件满足配置的条件列表中的一个就行的成就类型
ContainSuccessTypeList = [SuccType_CompoundItemEx, SuccType_PickUpItem, SuccType_MWSkillUp]
@@ -1674,9 +1697,9 @@
#增加进度前需要重置的成就类型
NeedResetSuccessTypeList = [
- SuccType_InlayStone1,SuccType_InlayStone2,SuccType_EquipSuit,SuccType_InlayRune,
- SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,SuccType_DogzEquipPlus,
- SuccType_HorseAllLV, SuccType_EquipPlusLV,SuccType_PetClassLV,SuccType_InlayGatherSoul,
+ SuccType_InlayStone1,SuccType_InlayStone2,SuccType_InlayRune,
+ SuccType_DogzEquipPlus,
+ SuccType_PetClassLV,SuccType_InlayGatherSoul,
]
# 聊天类型, 从100开始, 前100个给c++用
--
Gitblit v1.8.0