From 6daa53975a6cdd735a5941ddb935cfdb23841976 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 六月 2024 16:37:35 +0800
Subject: [PATCH] 10178 【越南】【香港】【主干】挂机奖励(屏蔽跨服上线通知:古宝、神通、战令、福地、挂机)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   70 ++++++++++++++++++++++++++++++-----
 1 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index faec856..2feeb94 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -287,6 +287,10 @@
 OperationActionName_GodGift = "ActGodGift" # 天帝礼包活动
 OperationActionName_BuyOne = "ActBuyOne" # 买一送多活动
 OperationActionName_BossTrial = "ActBossTrial" # Boss历练
+OperationActionName_ActLoginNew = "ActLoginNew" # 登录活动-新
+OperationActionName_ActTask = "ActTask" # 活动任务
+OperationActionName_BuyCountGift = "ActBuyCountGift" # 购买次数礼包活动
+OperationActionName_FamilyCTGAssist = "ActFamilyCTGAssist" # 仙盟充值协助
 #节日活动类型列表 - 该类型无视开服天,日期到了就开启
 FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
                                 OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
@@ -307,6 +311,8 @@
                            OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
                            OperationActionName_XianXiaMJ, OperationActionName_GodGift,
                            OperationActionName_BuyOne, OperationActionName_BossTrial,
+                           OperationActionName_ActLoginNew, OperationActionName_ActTask,
+                           OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
                            ] + FeastOperationActionNameList
 #需要记录开启活动时的世界等级的运营活动
 NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
@@ -331,21 +337,25 @@
                                    OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
                                    OperationActionName_XianXiaMJ, OperationActionName_GodGift,
                                    OperationActionName_BuyOne, OperationActionName_BossTrial,
+                                   OperationActionName_ActLoginNew, OperationActionName_ActTask,
+                                   OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
                                    ]
 
 #跨服运营活动表名定义
 CrossActName_CTGBillboard = "CrossActCTGBillboard" # 充值排行榜
 CrossActName_AllRecharge = "CrossActAllRecharge" # 全民充值
 CrossActName_LuckyCloudBuy = "CrossActLuckyCloudBuy" # 幸运云购
+CrossActName_BossTrial = "CrossActBossTrial" # Boss历练 - 跨服
 
 #跨服运营活动列表
-CrossActNameList = [CrossActName_CTGBillboard, CrossActName_AllRecharge, CrossActName_LuckyCloudBuy]
+CrossActNameList = [CrossActName_CTGBillboard, CrossActName_AllRecharge, CrossActName_LuckyCloudBuy, CrossActName_BossTrial]
 #需要锁定活动分区分配直到活动结束的跨服运营活动,即使热更分区配置,也不会改变正在活动中的分区设定,直到活动结束
 CrossActLockServerGroupIDList = [CrossActName_CTGBillboard, CrossActName_AllRecharge]
 
 #活动信息字典key定义
 ActKey_ID = "ID" # 活动ID,唯一标识的ID,一般是活动开启的time值
 ActKey_State = "State" # 活动状态 0-未开启, >0开启中,也代表当日的第几个时间段
+ActKey_StateJoin = "StateJoin" # 活动某些功能可参与状态 0-还不可参与, >0可参与,一般可参与时该状态等于state
 ActKey_CfgID = "CfgID" # 活动表配置ID
 ActKey_ActNum = "ActNum" # 活动分组编号
 ActKey_DayIndex = "DayIndex" # 当前活动天索引,0开始,代表第1天
@@ -398,7 +408,8 @@
     Def_ViewExpType_LYZS,                   #烈焰战神 特殊特效 8
     Def_ViewExpType_Activity,               #活跃吸纳 9
     Def_ViewExpType_Chuangong,              #传功经验10
-) = range(0, 11)
+    Def_ViewExpType_Guaji,                  #挂机收益11
+) = range(0, 12)
 
 
 #物品相关操作类型
@@ -427,7 +438,8 @@
     Def_mitRuneCompound,      # 符印合成
     Def_mitGatherSoulCompound,# 聚魂合成
     Def_mitGatherSoulDecompose,# 聚魂分解
-) = range(1, 25)
+    Def_mitCutTreeEquipOP,    # 砍树装备操作
+) = range(1, 26)
 
 #---写死的技能ID---
 Def_SkillID_AutoTruck = 62220   # 自动运镖buff
@@ -701,6 +713,10 @@
 Def_Effect_SuckHPDefPer = 214 # 抗吸血比率
 Def_Effect_CurePer = 215 # 强化治疗
 Def_Effect_CureDefPer = 216 # 弱化治疗
+Def_Effect_PetStrengthenPer = 217 # 强化灵兽
+Def_Effect_PetWeakenPer = 218 # 弱化灵兽
+Def_Effect_SuperHitHurtPer = 219 # 强化暴伤
+Def_Effect_SuperHitHurtDefPer = 220 # 弱化暴伤
 
 #增加%d物理伤害值,其中a值为伤害值
 Def_Effect_AddAtk = 1005
@@ -804,9 +820,13 @@
     Def_BT_CharmWeek, #魅力周榜
     Def_BT_CharmDay, #魅力日榜
     Def_BT_BossTrialSubmit,                   #提交boss凭证榜 (boss历练活动)
+    Def_BT_AlineInvade,                       #异兽入侵
+    Def_BT_BossTrialSubmitBak,                #提交boss凭证榜 (boss历练活动 - 上一期) 35
+    Def_BT_BossTrialSubmitFamily,             #提交boss凭证仙盟榜 (boss历练活动)
+    Def_BT_BossTrialSubmitFamilyBak,          #提交boss凭证仙盟榜 (boss历练活动 - 上一期)
     
     Def_BT_Max, #排行榜最大类型
-) = range(0, 33 + 2) 
+) = range(0, 37 + 2) 
 
 ''' 跨服排行榜类型, 从 150 开始
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
@@ -820,7 +840,19 @@
 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
+Def_CBT_BossTrialSubmit, # boss凭证 - 个人榜  158
+Def_CBT_BossTrialSubmitBak, # boss凭证 - 个人榜 上一期  159
+Def_CBT_BossTrialSubmitFamily, # boss凭证 - 仙盟榜  160
+Def_CBT_BossTrialSubmitFamilyBak, # boss凭证 - 仙盟榜 上一期  161
+) = range(150, 161 + 1)
+
+# 跨服榜单最大数据名次,没有设置的默认100
+CrossBillboard_MaxDataCount = {
+                               Def_CBT_BossTrialSubmit:1000,
+                               Def_CBT_BossTrialSubmitBak:1000,
+                               }
 
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -832,7 +864,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_SkyTower, Def_BT_CharmTotal, Def_BT_CharmWeek, Def_BT_CharmDay
+                             Def_BT_SkyTower, Def_BT_CharmTotal, Def_BT_CharmWeek, Def_BT_CharmDay, Def_BT_AlineInvade
                              ]
 
 ##---比率---
@@ -1077,7 +1109,13 @@
 CDBPlayerRefresh_Xiantao, # 仙桃  254
 CDBPlayerRefresh_CurePer, # 强化治疗 255
 CDBPlayerRefresh_CureDefPer, # 弱化治疗 256
-) = range(146, 257)
+CDBPlayerRefresh_PetStrengthenPer, # 强化灵兽 257
+CDBPlayerRefresh_PetWeakenPer, # 弱化灵兽 258
+CDBPlayerRefresh_SuperHitHurtPer, # 强化暴伤 259
+CDBPlayerRefresh_SuperHitHurtDefPer, # 弱化暴伤 260
+CDBPlayerRefresh_Lingyu, # 灵玉 261
+CDBPlayerRefresh_BossTrial, # 凭证积分 262
+) = range(146, 263)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -1107,6 +1145,8 @@
 TYPE_Price_SuccessSocre = 39    # 成就积分
 TYPE_Price_FamilyFlagWarPoint = 40    # 万界积分
 TYPE_Price_Xiantao = 41    # 仙桃
+TYPE_Price_Lingyu = 42    # 灵玉
+TYPE_Price_BossTrial = 43    # boss历练凭证积分
 TYPE_Price_PayCoin = 99    # 代币
 
 #key可用于遍历所有货币,value仅GM相关会用到
@@ -1114,7 +1154,7 @@
                  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:"成就积分", 41:"仙桃", 99:"代币"
+                 39:"成就积分", 41:"仙桃", 42:"灵玉", 43:"凭证积分", 99:"代币"
                  }
 
 #以下是旧的金钱类型
@@ -1146,6 +1186,8 @@
                            TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
                            TYPE_Price_SuccessSocre:CDBPlayerRefresh_SuccessScore,
                            TYPE_Price_Xiantao:CDBPlayerRefresh_Xiantao,
+                           TYPE_Price_Lingyu:CDBPlayerRefresh_Lingyu,
+                           TYPE_Price_BossTrial:CDBPlayerRefresh_BossTrial,
                            }
 
 # 支持负值的货币及对应0418刷新类型
@@ -1195,6 +1237,8 @@
 GameFuncID_FaQi = 199           # 法器
 GameFuncID_LianTi = 207         # 炼体
 GameFuncID_Championship = 210   # 排位
+GameFuncID_MineArea = 227       # 福地
+GameFuncID_Guaji = 228          # 挂机
 # 以下为暂时无用的
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环
@@ -1368,7 +1412,9 @@
                       Def_ActionType_XXX10,    #10
                       Def_ActionType_OfficerModelEquip,    #记录家族有职位的成员模型装备信息11
                       Def_ActionType_FamilyEvent,    #记录家族事件12
-                      ) = range(0, 13)
+                      Def_ActionType_BossTrialSubmit,    #boss凭证提交 13
+                      Def_ActionType_FamilyCTGAssist,    #仙盟充值协助活动 14
+                      ) = range(0, 15)
 
 # 家族行为事件类型定义; Def_ActionType_FamilyEvent; 存与事件记录Value1
 # 通用:time-时间;name-玩家;value1-事件类型
@@ -1507,6 +1553,8 @@
 CrossServerMsg_ActAllRechargeInfo = "ActAllRechargeInfo"# 跨服全民充值信息
 CrossServerMsg_CrossDailyActionState = "CrossDailyActionState" # 跨服日常任务状态信息
 CrossServerMsg_CrossYaomoBossHurtInfo = "CrossYaomoBossHurtInfo" # 跨服妖魔boss玩家伤害信息
+CrossServerMsg_FamilyFlagwarOver = "FamilyFlagwarOver"  # 逐鹿万界结算信息
+CrossServerMsg_CrossBossTrialFamilyAward = "CrossBossTrialFamilyAward"  # 跨服boss历练仙盟奖励结算
 
 # 子服发送跨服信息定义
 ClientServerMsg_ServerInitOK = "ServerInitOK"           # 子服启动成功
@@ -1543,6 +1591,7 @@
 ClientServerMsg_ChampionshipWorship = "ChampionshipWorship" # 跨服排位膜拜
 ClientServerMsg_ActAllRechargeValue = "ActAllRechargeValue" # 跨服全民充值额度
 ClientServerMsg_CrossYaomoBossHurtAward = "CrossYaomoBossHurtAward" # 跨服妖魔boss玩家伤害领奖
+ClientServerMsg_BossTrialSubmit = "BossTrialSubmit" # boss凭证提交
 
 #跨服广播类型定义
 CrossNotify_CrossAct = "CrossAct"
@@ -1984,7 +2033,8 @@
 SuccType_EquipWashTotal, # 全身洗炼总等级X级 175
 SuccType_CrossPK, # 跨服PK x次  176
 SuccType_FamilyZhenfaExp, # 仙盟阵法捐献累计经验 177
-) = range(1, 178)
+SuccType_PassAdventure, #通关冒险 178
+) = range(1, 179)
 
 # 节日红包成就类型
 FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)

--
Gitblit v1.8.0