From 4e98d22cd12ed08cd1a2859141373afeca9e6bb2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 18 九月 2023 14:39:54 +0800
Subject: [PATCH] 9887 【主干】【骨折1、2】【小7】【1元】【BT10】本服与跨服竞技场PK公式优化（PVP木桩None防范）
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 71 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 9 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index a514288..abe82a2 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -285,6 +285,8 @@
OperationActionName_HorsePetFeast = "ActHorsePetFeast" # 骑宠盛宴活动
OperationActionName_GarbageSorting = "ActGarbageSorting" # 垃圾分类活动
OperationActionName_XianXiaMJ = "ActXianXiaMJ" # 仙匣秘境活动
+OperationActionName_GodGift = "ActGodGift" # 天帝礼包活动
+OperationActionName_BuyOne = "ActBuyOne" # 买一送多活动
#节日活动类型列表 - 该类型无视开服天，日期到了就开启
FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
@@ -303,7 +305,8 @@
OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
- OperationActionName_XianXiaMJ,
+ OperationActionName_XianXiaMJ, OperationActionName_GodGift,
+ OperationActionName_BuyOne,
] + FeastOperationActionNameList
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell,
@@ -317,6 +320,7 @@
OperationActionName_FeastLogin, OperationActionName_XianXiaMJ,
OperationActionName_FeastWish, OperationActionName_FeastTravel,
OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+ OperationActionName_GodGift,
]
#支持多活动分组编号的活动名
@@ -325,7 +329,8 @@
OperationActionName_SpringSale, OperationActionName_FlashSale,
OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
- OperationActionName_XianXiaMJ,
+ OperationActionName_XianXiaMJ, OperationActionName_GodGift,
+ OperationActionName_BuyOne,
]
#跨服运营活动表名定义
@@ -347,6 +352,7 @@
ActKey_TemplateID = "TemplateID" # 当前活动模板ID
ActKey_WorldLV = "WorldLV" # 活动开启时世界等级
ActKey_WorldLVList = "WorldLVList" # 活动每天的世界等级列表
+ActKey_StartDateSync = "StartDateSync" # 特殊指定同步前端的开始日期
ActKey_ServerIDRangeList = "ServerIDRangeList" # 活动服务器ID范围信息
ActKey_IpyDataInfo = "IpyDataInfo" # 活动对应 IpyData 信息
@@ -796,7 +802,9 @@
Def_CBT_BattlefieldWJoin, # 跨服战场每周参与榜 151
Def_CBT_BattlefieldWCall, # 跨服战场每周召集榜 152
Def_CBT_BattlefieldWScore, # 跨服战场每周积分榜 153
-) = range(150, 153 + 1)
+Def_CBT_BattlefieldWScoreLastWeek, # 跨服战场上周积分榜 154
+Def_CBT_YaomoBossHurt, # 跨服妖魔boss最新一次伤血排名 155
+) = range(150, 155 + 1)
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
@@ -1039,7 +1047,12 @@
CDBPlayerRefresh_BTGMPoint, # BT版GM令 240
CDBPlayerRefresh_GuShenMoney, # 古神币 241
CDBPlayerRefresh_GongdePoint, # 功德点 242
-) = range(146, 243)
+CDBPlayerRefresh_CashPoint, # 现金点 243
+CDBPlayerRefresh_ExAttr20, # ExAttr20 244
+CDBPlayerRefresh_JiYuan, # 机缘币 245
+CDBPlayerRefresh_BTGMYuE, # BTGM余额 246
+CDBPlayerRefresh_SuccessScore, # 成就积分 247
+) = range(146, 248)
TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
@@ -1063,6 +1076,18 @@
TYPE_Price_BTGMPoint = 33 # BT版GM令
TYPE_Price_GuShenMoney = 34 # 古神币
TYPE_Price_GongdePoint = 35 # 功德点
+TYPE_Price_CashPoint = 36 # 现金点
+TYPE_Price_JiYuan = 37 # 机缘币
+TYPE_Price_BTGMYuE = 38 # GM余额
+TYPE_Price_SuccessSocre = 39 # 成就积分
+
+#key可用于遍历所有货币，value仅GM相关会用到
+MoneyNameDict = {
+ 1:"仙玉", 2:"绑玉", 3:"铜钱", 6:"战盟贡献度", 10:"战盟仓库积分", 13:"境界修行点", 14:"符印融合石", 15:"仙盟活跃令",
+ 16:"助战积分", 18:"荣誉", 19:"Boss积分", 23:"符印精华", 24:"符印碎片", 25:"寻宝积分", 26:"集市额度", 27:"丹精", 28:"魂尘",
+ 29:"聚魂碎片", 30:"核心环", 31:"功能特权令", 32:"环保值", 33:"GM令", 34:"古神币", 35:"功德点",
+ 39:"成就积分"
+ }
#以下是旧的金钱类型
TYPE_Price_Magic_Integral = 101 # 魔方寻宝积分
@@ -1091,6 +1116,7 @@
TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,
TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
+ TYPE_Price_SuccessSocre:CDBPlayerRefresh_SuccessScore,
}
# 支持负值的货币及对应0418刷新类型
@@ -1252,8 +1278,8 @@
Def_UniversalGameRecType_CrossChampionshipOfficial, # 跨服排位争霸赛最终排名官职信息 35
Def_UniversalGameRecType_CrossChampionshipOffChallenge, # 跨服排位争霸赛官职挑战信息 36
Def_UniversalGameRecType_CrossActAllRecharge, # 跨服全服充值活动信息 37
- Def_UniversalGameRecType_38,
- Def_UniversalGameRecType_39,
+ Def_UniversalGameRecType_CrossBattleChampionGroup, # 跨服战场冠军赛分组信息 38
+ Def_UniversalGameRecType_CrossYaomoBossHurtInfo, # 跨服妖魔boss伤血信息 39
Def_UniversalGameRecType_40,
Def_UniversalGameRecType_RedPacketRecord, # 红包产出结果记录41
Def_UniversalGameRecType_42,
@@ -1450,6 +1476,8 @@
CrossServerMsg_ChampionshipOfficial = "ChampionshipOfficial" # 跨服排位争霸赛官职信息
CrossServerMsg_ChampionshipDailyOfficial = "ChampionshipDailyOfficial" # 跨服排位争霸赛每日官职信息
CrossServerMsg_ActAllRechargeInfo = "ActAllRechargeInfo"# 跨服全民充值信息
+CrossServerMsg_CrossDailyActionState = "CrossDailyActionState" # 跨服日常任务状态信息
+CrossServerMsg_CrossYaomoBossHurtInfo = "CrossYaomoBossHurtInfo" # 跨服妖魔boss玩家伤害信息
# 子服发送跨服信息定义
ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
@@ -1485,6 +1513,7 @@
ClientServerMsg_ChampionshipGuess = "ChampionshipGuess" # 跨服排位竞猜
ClientServerMsg_ChampionshipWorship = "ChampionshipWorship" # 跨服排位膜拜
ClientServerMsg_ActAllRechargeValue = "ActAllRechargeValue" # 跨服全民充值额度
+ClientServerMsg_CrossYaomoBossHurtAward = "CrossYaomoBossHurtAward" # 跨服妖魔boss玩家伤害领奖
#跨服广播类型定义
CrossNotify_CrossAct = "CrossAct"
@@ -1589,7 +1618,7 @@
)=range(5)
# 战斗力模块类型
-Def_MFPType_Max = 29
+Def_MFPType_Max = 32
ModuleFightPowerTypeList = (
Def_MFPType_Role, # 角色 0
Def_MFPType_Equip, # 装备(装备本身) 1
@@ -1619,6 +1648,9 @@
Def_MFPType_Love, # 情缘 25
Def_MFPType_Charm, # 魅力 26
Def_MFPType_LianTi, # 炼体 27
+Def_MFPType_Enchant, # 附魔 28
+Def_MFPType_Gubao, # 古宝 29
+Def_MFPType_Shentong, # 神通 30
Def_MFPType_Other, # 其他
) = range(Def_MFPType_Max)
@@ -1730,6 +1762,10 @@
DailyActionID_CrossBattlefield, # 跨服战场 35
) = range(1, 35 + 1)
+# 跨服每日活动编号定义， 从150开始
+CrossDailyActionIDList = (
+CrossDailyActionID_YaomoBoss, # 妖魔boss 150
+) = range(150, 150 + 1)
# 成就类型定义
SuccessTypeList = (
@@ -1896,7 +1932,20 @@
SuccType_Battlefield_Wall, # 古神战场 - 累计采集积分墙 x次 161
SuccType_Battlefield_BillFirst, # 古神战场 - 任意周榜榜首 x次 162
SuccType_Battlefield_BillIn, # 古神战场 - 结算时累计上榜 x次 163
-) = range(1, 164)
+SuccType_ActivityPlace, # 活跃放置x次 164
+SuccType_UseStoveByType, # 使用丹药X枚 165
+SuccType_Arena, # 参与竞技场x次 166
+SuccType_KillCrossPenglaiBoss, # 击杀蓬莱仙境bossx只 167
+SuccType_KillCrossDemonLandBoss, # 击杀魔化之地bossx只 168
+SuccType_EquipPlusClass, # X阶装备强化总等级X级 169
+SuccType_EquipStarClass, # X阶装备升星总等级X星 170
+SuccType_EquipStoneClass, # X阶装备宝石总等级X级 171
+SuccType_EquipWashClass, # X阶装备洗炼总等级X级 172
+SuccType_EquipPlusTotal, # 全身强化总等级X级 173
+SuccType_EquipStarTotal, # 全身升星总星数X星 174
+SuccType_EquipWashTotal, # 全身洗炼总等级X级 175
+SuccType_CrossPK, # 跨服PK x次 176
+) = range(1, 177)
# 节日红包成就类型
FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
@@ -1908,7 +1957,7 @@
UnDownCheckSuccessTypeList = [
SuccType_GodWeapon,
SuccType_MainTaskNode,SuccType_PassWagicWeapon,
- SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
+ SuccType_KillSpecificNPC, SuccType_UseStoveBylv, SuccType_UseStoveByType,
SuccType_Pray,SuccType_PetClassLV,
SuccType_QueenRelics,SuccType_XMZZConWin,
SuccType_Collect,SuccType_DogzBattle,
@@ -1926,6 +1975,10 @@
SuccType_EquipPlus:[0], # 阶不向下适配
SuccType_EquipWash:[0], # 阶不向下适配
SuccType_EquipStar:[0], # 阶不向下适配
+ SuccType_EquipPlusClass:[0], # 阶不向下适配
+ SuccType_EquipStarClass:[0], # 阶不向下适配
+ SuccType_EquipStoneClass:[0], # 阶不向下适配
+ SuccType_EquipWashClass:[0], # 阶不向下适配
}
#传进来的条件满足配置的条件列表中的一个就行的成就类型
--
Gitblit v1.8.0