From 03fdb924f00ceb435105d23f1ef4be488cc03b0a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 11 六月 2024 19:35:49 +0800
Subject: [PATCH] 8605 【主干】【港台】【越南】【砍树】【后端】集字活动boss掉字优化,支持单次掉落多种字;

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 1e462d0..183fad9 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -287,6 +287,9 @@
 OperationActionName_GodGift = "ActGodGift" # 天帝礼包活动
 OperationActionName_BuyOne = "ActBuyOne" # 买一送多活动
 OperationActionName_BossTrial = "ActBossTrial" # Boss历练
+OperationActionName_ActLoginNew = "ActLoginNew" # 登录活动-新
+OperationActionName_ActTask = "ActTask" # 活动任务
+OperationActionName_BuyCountGift = "ActBuyCountGift" # 购买次数礼包活动
 #节日活动类型列表 - 该类型无视开服天,日期到了就开启
 FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
                                 OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
@@ -307,6 +310,8 @@
                            OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
                            OperationActionName_XianXiaMJ, OperationActionName_GodGift,
                            OperationActionName_BuyOne, OperationActionName_BossTrial,
+                           OperationActionName_ActLoginNew, OperationActionName_ActTask,
+                           OperationActionName_BuyCountGift,
                            ] + FeastOperationActionNameList
 #需要记录开启活动时的世界等级的运营活动
 NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
@@ -331,6 +336,8 @@
                                    OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
                                    OperationActionName_XianXiaMJ, OperationActionName_GodGift,
                                    OperationActionName_BuyOne, OperationActionName_BossTrial,
+                                   OperationActionName_ActLoginNew, OperationActionName_ActTask,
+                                   OperationActionName_BuyCountGift,
                                    ]
 
 #跨服运营活动表名定义
@@ -796,9 +803,11 @@
     Def_BT_CharmWeek, #魅力周榜
     Def_BT_CharmDay, #魅力日榜
     Def_BT_BossTrialSubmit,                   #提交boss凭证榜 (boss历练活动)
+    Def_BT_AlineInvade,                       #异兽入侵
+    Def_BT_BossTrialSubmitBak,                #提交boss凭证榜 (boss历练活动 - 上一期) 35
     
     Def_BT_Max, #排行榜最大类型
-) = range(0, 33 + 2) 
+) = range(0, 35 + 2) 
 
 ''' 跨服排行榜类型, 从 150 开始
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
@@ -812,7 +821,9 @@
 Def_CBT_BattlefieldWScore, # 跨服战场每周积分榜  153
 Def_CBT_BattlefieldWScoreLastWeek, # 跨服战场上周积分榜  154
 Def_CBT_YaomoBossHurt, # 跨服妖魔boss最新一次伤血排名  155
-) = range(150, 155 + 1)
+Def_CBT_FamilyFlagwar, # 逐鹿万界 - 单场榜  156
+Def_CBT_FamilyFlagwarWeek, # 逐鹿万界 - 周总榜  157
+) = range(150, 157 + 1)
 
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -1060,7 +1071,8 @@
 CDBPlayerRefresh_JiYuan, # 机缘币  245
 CDBPlayerRefresh_BTGMYuE, # BTGM余额  246
 CDBPlayerRefresh_SuccessScore, # 成就积分  247
-) = range(146, 248)
+CDBPlayerRefresh_FamilyFlagWarPoint, # 成就积分  248
+) = range(146, 249)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -1088,13 +1100,16 @@
 TYPE_Price_JiYuan = 37    # 机缘币
 TYPE_Price_BTGMYuE = 38    # GM余额
 TYPE_Price_SuccessSocre = 39    # 成就积分
+TYPE_Price_FamilyFlagWarPoint = 40    # 万界积分
+TYPE_Price_Xiantao = 41    # 仙桃
+TYPE_Price_PayCoin = 99    # 代币
 
 #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:"成就积分"
+                 39:"成就积分", 40:"万界积分", 99:"代币"
                  }
 
 #以下是旧的金钱类型
@@ -1125,6 +1140,7 @@
                            TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
                            TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
                            TYPE_Price_SuccessSocre:CDBPlayerRefresh_SuccessScore,
+                           TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,
                            }
 
 # 支持负值的货币及对应0418刷新类型
@@ -1174,6 +1190,7 @@
 GameFuncID_FaQi = 199           # 法器
 GameFuncID_LianTi = 207         # 炼体
 GameFuncID_Championship = 210   # 排位
+GameFuncID_MineArea = 227   	# 福地
 # 以下为暂时无用的
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环
@@ -1486,6 +1503,7 @@
 CrossServerMsg_ActAllRechargeInfo = "ActAllRechargeInfo"# 跨服全民充值信息
 CrossServerMsg_CrossDailyActionState = "CrossDailyActionState" # 跨服日常任务状态信息
 CrossServerMsg_CrossYaomoBossHurtInfo = "CrossYaomoBossHurtInfo" # 跨服妖魔boss玩家伤害信息
+CrossServerMsg_FamilyFlagwarOver = "FamilyFlagwarOver"  # 逐鹿万界结算信息
 
 # 子服发送跨服信息定义
 ClientServerMsg_ServerInitOK = "ServerInitOK"           # 子服启动成功
@@ -1776,7 +1794,8 @@
 # 跨服每日活动编号定义, 从150开始
 CrossDailyActionIDList = (
 CrossDailyActionID_YaomoBoss, # 妖魔boss 150
-) = range(150, 150 + 1)
+CrossDailyActionID_FamilyWarFlag, # 跨服仙盟夺旗战/逐鹿万界 151
+) = range(150, 150 + 2)
 
 # 成就类型定义
 SuccessTypeList = (

--
Gitblit v1.8.0