From 30773f0aaa711a3f00f9fba5a44b4366b27983f1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 27 十二月 2024 17:26:33 +0800
Subject: [PATCH] 10289 【越南】【英语】【砍树】【BT】运势-服务端(增加任务类型消耗培养丹34坐骑 35灵宠)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   85 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 8de9197..1328c7c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -296,6 +296,8 @@
 OperationActionName_FamilyCTGAssist = "ActFamilyCTGAssist" # 仙盟充值协助
 OperationActionName_Gubao = "ActGubao" # 古宝养成活动
 OperationActionName_HorsePetTrain = "ActHorsePetTrain" # 骑宠养成活动
+OperationActionName_Yunshi = "ActYunshi" # 运势活动
+OperationActionName_Lunhuidian = "ActLunhuidian" # 轮回殿活动
 #节日活动类型列表 - 该类型无视开服天,日期到了就开启
 FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
                                 OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
@@ -318,7 +320,8 @@
                            OperationActionName_BuyOne, OperationActionName_BossTrial,
                            OperationActionName_ActLoginNew, OperationActionName_ActTask,
                            OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
-                           OperationActionName_Gubao, OperationActionName_HorsePetTrain,
+                           OperationActionName_Gubao, OperationActionName_HorsePetTrain, OperationActionName_Yunshi,
+                           OperationActionName_Lunhuidian,
                            ] + FeastOperationActionNameList
 #需要记录开启活动时的世界等级的运营活动
 NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
@@ -345,7 +348,8 @@
                                    OperationActionName_BuyOne, OperationActionName_BossTrial,
                                    OperationActionName_ActLoginNew, OperationActionName_ActTask,
                                    OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
-                                   OperationActionName_Gubao, OperationActionName_HorsePetTrain,
+                                   OperationActionName_Gubao, OperationActionName_HorsePetTrain, OperationActionName_Yunshi,
+                                   OperationActionName_Lunhuidian,
                                    ]
 
 #跨服运营活动表名定义
@@ -733,6 +737,34 @@
 #法器防御百分比
 Def_Effect_FaQiDefPer = 169
 
+#坐骑幻化生命加成
+Def_Effect_HorseSkinMaxHPPer = 170 # 坐骑幻化生命加成
+#坐骑幻化攻击加成
+Def_Effect_HorseSkinAtkPer = 171 # 坐骑幻化攻击加成
+#坐骑幻化防御加成
+Def_Effect_HorseSkinDefPer = 172 # 坐骑幻化防御加成
+
+#称号生命加成
+Def_Effect_TitleMaxHPPer = 173 # 称号生命加成
+#称号攻击加成
+Def_Effect_TitleAtkPer = 174 # 称号攻击加成
+#称号防御加成
+Def_Effect_TitleDefPer = 175 # 称号防御加成
+
+#头像生命加成
+Def_Effect_FaceMaxHPPer = 176 # 头像生命加成
+#头像攻击加成
+Def_Effect_FaceAtkPer = 177 # 头像攻击加成
+#头像防御加成
+Def_Effect_FaceDefPer = 178 # 头像防御加成
+
+#头像框生命加成
+Def_Effect_FacePicMaxHPPer = 179 # 头像框生命加成
+#头像框攻击加成
+Def_Effect_FacePicAtkPer = 180 # 头像框攻击加成
+#头像框防御加成
+Def_Effect_FacePicDefPer = 181 # 头像框防御加成
+
 Def_Effect_ComboDefRate = 210 # 抗连击概率
 Def_Effect_AtkBackRate = 211 # 反击概率
 Def_Effect_AtkBackDefRate = 212 # 抗反击概率
@@ -906,6 +938,9 @@
                              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_AlineInvade
                              ]
+
+#仙盟榜单类型
+FamilyBillboardList = [Def_BT_BossTrialSubmitFamily, Def_BT_BossTrialSubmitFamilyBak]
 
 ##---比率---
 #百分率
@@ -1160,7 +1195,11 @@
 CDBPlayerRefresh_HorsePetTrainScore, # 骑宠养成积分 265
 CDBPlayerRefresh_GubaoTrainScore, # 古宝养成积分 266
 CDBPlayerRefresh_TiandaoFruit, # 天道果 267
-) = range(146, 268)
+CDBPlayerRefresh_Tuijinbi, # 推金币 268
+CDBPlayerRefresh_PayCoinDay, # 代币时效 269
+CDBPlayerRefresh_XianyuanScore, # 仙缘积分 270
+CDBPlayerRefresh_HuanjinggeScore, # 幻境阁积分 271
+) = range(146, 272)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -1196,6 +1235,9 @@
 TYPE_Price_HorsePetTrainScore = 45    # 骑宠养成积分
 TYPE_Price_GubaoTrainScore = 46    # 古宝养成积分
 TYPE_Price_TiandaoFruit = 47    # 天道果
+TYPE_Price_Tuijinbi = 48    # 推金币
+TYPE_Price_XianyuanScore = 49    # 仙缘积分
+TYPE_Price_HuanjinggeScore = 50    # 幻境阁积分
 TYPE_Price_PayCoin = 99    # 代币
 
 #key可用于遍历所有货币,value仅GM相关会用到
@@ -1203,7 +1245,9 @@
                  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:"仙桃", 42:"灵玉", 43:"凭证积分", 44:"聚魂精华", 45:"骑宠养成积分", 46:"古宝养成积分", 47:"天道果", 99:"代币"
+                 39:"成就积分", 41:"仙桃", 42:"灵玉", 43:"凭证积分", 44:"聚魂精华", 45:"骑宠养成积分", 46:"古宝养成积分", 47:"天道果", 
+                 49:"仙缘积分", 50:"幻境阁积分",
+                 99:"代币"
                  }
 
 #需要记录累计消耗的货币类型
@@ -1244,6 +1288,8 @@
                            TYPE_Price_HorsePetTrainScore:CDBPlayerRefresh_HorsePetTrainScore,
                            TYPE_Price_GubaoTrainScore:CDBPlayerRefresh_GubaoTrainScore,
                            TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit,
+                           TYPE_Price_XianyuanScore:CDBPlayerRefresh_XianyuanScore,
+                           TYPE_Price_HuanjinggeScore:CDBPlayerRefresh_HuanjinggeScore,
                            }
 
 # 支持负值的货币及对应0418刷新类型
@@ -1373,10 +1419,16 @@
 Def_WorshipTypeList = (
                        Def_WorshipType_ServerNaming, # 服务器冠名 1
                        Def_WorshipType_CrossChampionship, # 跨服排位冠军 2
-                       ) = range(1, 1 + 2)
+                       Def_WorshipType_CrossBossTrial, # 跨服boss凭证 3
+                       Def_WorshipType_CrossXianXiaMJ, # 跨服秘境寻宝 4
+                       Def_WorshipType_CrossHorsePetTrain, # 跨服骑宠养成 5
+                       Def_WorshipType_CrossGubaoTrain, # 跨服古宝养成 6
+                       ) = range(1, 1 + 6)
 
 #跨服膜拜类型
-Def_WorshipTypeCross = [Def_WorshipType_CrossChampionship]
+Def_WorshipTypeCross = [Def_WorshipType_CrossChampionship, Def_WorshipType_CrossBossTrial, Def_WorshipType_CrossXianXiaMJ, 
+                        Def_WorshipType_CrossHorsePetTrain, Def_WorshipType_CrossGubaoTrain,
+                        ]
 
 #玩家记录类型
 Def_PlayerRecTypeList = (
@@ -1497,7 +1549,9 @@
                       Def_ActionType_FamilyEvent,    #记录家族事件12
                       Def_ActionType_BossTrialSubmit,    #boss凭证提交 13
                       Def_ActionType_FamilyCTGAssist,    #仙盟充值协助活动 14
-                      ) = range(0, 15)
+                      Def_ActionType_FamilyEmblem,    #仙盟时效徽章信息 15
+                      Def_ActionType_Zhenbaoge,    #珍宝阁 16
+                      ) = range(0, 17)
 
 # 家族行为事件类型定义; Def_ActionType_FamilyEvent; 存与事件记录Value1
 # 通用:time-时间;name-玩家;value1-事件类型
@@ -1594,6 +1648,10 @@
 CrossServerMsg_Notify = "Notify"                        # 提示信息
 CrossServerMsg_ChatCrossWorld = "ChatCrossWorld"        # 跨服世界聊天
 CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果
+CrossServerMsg_PullPlayerViewCache = "PullPlayerViewCache"# 拉取玩家缓存数据
+CrossServerMsg_PlayerPackDataState = "PlayerPackDataState"# 玩家打包数据同步状态
+CrossServerMsg_PullPlayerPackData = "PullPlayerPackData"# 拉取玩家打包数据
+CrossServerMsg_PushPlayerPackData = "PushPlayerPackData"# 推送玩家打包数据
 CrossServerMsg_PKMatchReqRet = "PKMatchReqRet"          # 跨服PK匹配请求结果
 CrossServerMsg_PKMatchResult = "PKMatchResult"          # 跨服PK匹配结果
 CrossServerMsg_PKReadyOKRoomList = "PKReadyOKRoomList"  # 跨服PK已准备好的房间列表
@@ -1651,6 +1709,9 @@
 ClientServerMsg_ChatCrossWorld = "ChatCrossWorld"       # 跨服世界聊天
 ClientServerMsg_GMCMD = "GMCMD"                         # GM命令
 ClientServerMsg_ViewPlayerCache = "ViewPlayerCache"     # 查看跨服玩家信息
+ClientServerMsg_PushPlayerCache = "PushPlayerCache"     # 推送玩家缓存信息
+ClientServerMsg_PullOtherPlayerPackData = "PullOtherPlayerPackData"   # 拉其他服玩家打包数据
+ClientServerMsg_PlayerPackData = "PlayerPackData"       # 玩家打包数据同步
 ClientServerMsg_PKMatch = "PKMatch"                     # 跨服PK匹配
 ClientServerMsg_PKRobotOver = "PKRobotOver"             # 跨服PK机器人结算
 ClientServerMsg_PKCancel = "PKCancel"                   # 跨服PK取消匹配
@@ -1801,7 +1862,7 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 34
+Def_MFPType_Max = 37
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
 Def_MFPType_Equip, # 装备(装备本身) 1
@@ -1836,6 +1897,9 @@
 Def_MFPType_Shentong, # 神通 30
 Def_MFPType_FamilyZhenfa, # 阵法 31
 Def_MFPType_GatherTheSoul, # 聚魂新 32
+Def_MFPType_Face, # 头像 33
+Def_MFPType_FacePic, # 头像框 34
+Def_MFPType_ChatBox, # 气泡框 35
 Def_MFPType_Other, # 其他
 ) = range(Def_MFPType_Max)
 
@@ -2135,7 +2199,10 @@
 SuccType_PassAdventure, #通关冒险 178
 SuccType_GatherTheSoulColor, #聚魂激活x品质x个 179
 SuccType_GatherTheSoulLV, #聚魂总等级x 180
-) = range(1, 181)
+SuccType_MineAreaCnt, #采集福地x次数 181
+SuccType_MineAreaSelfCnt, #采集自己福地x次数 182
+SuccType_MineAreaRobCnt, #采集他人福地x次数 183
+) = range(1, 184)
 
 # 节日红包成就类型
 FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)

--
Gitblit v1.8.0