From 07db0706b408f481ece11e14eaeb4d71018e7460 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 06 六月 2024 19:30:26 +0800
Subject: [PATCH] 10130 【后端】福地争夺资源功能(防范报错)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   67 +++++++++++++++++++++++++++++----
 1 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 90b0787..3b708aa 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -286,6 +286,10 @@
 OperationActionName_XianXiaMJ = "ActXianXiaMJ" # 仙匣秘境活动
 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,
@@ -305,7 +309,9 @@
                            OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
                            OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
                            OperationActionName_XianXiaMJ, OperationActionName_GodGift,
-                           OperationActionName_BuyOne,
+                           OperationActionName_BuyOne, OperationActionName_BossTrial,
+                           OperationActionName_ActLoginNew, OperationActionName_ActTask,
+                           OperationActionName_BuyCountGift,
                            ] + FeastOperationActionNameList
 #需要记录开启活动时的世界等级的运营活动
 NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
@@ -329,7 +335,9 @@
                                    OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
                                    OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
                                    OperationActionName_XianXiaMJ, OperationActionName_GodGift,
-                                   OperationActionName_BuyOne,
+                                   OperationActionName_BuyOne, OperationActionName_BossTrial,
+                                   OperationActionName_ActLoginNew, OperationActionName_ActTask,
+                                   OperationActionName_BuyCountGift,
                                    ]
 
 #跨服运营活动表名定义
@@ -426,7 +434,8 @@
     Def_mitRuneCompound,      # 符印合成
     Def_mitGatherSoulCompound,# 聚魂合成
     Def_mitGatherSoulDecompose,# 聚魂分解
-) = range(1, 25)
+    Def_mitCutTreeEquipOP,    # 砍树装备操作
+) = range(1, 26)
 
 #---写死的技能ID---
 Def_SkillID_AutoTruck = 62220   # 自动运镖buff
@@ -693,6 +702,18 @@
 Def_Effect_FamilyWarAtkPer = 164 # 仙盟联赛攻击加成
 Def_Effect_FamilySitExpPer = 165 # 仙盟打坐经验加成
 
+Def_Effect_ComboDefRate = 210 # 抗连击概率
+Def_Effect_AtkBackRate = 211 # 反击概率
+Def_Effect_AtkBackDefRate = 212 # 抗反击概率
+Def_Effect_SuckHPPer = 213 # 吸血比率
+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
 #增加%d魔法伤害值,其中a值为伤害值
@@ -794,9 +815,11 @@
     Def_BT_CharmTotal, #魅力总榜 30
     Def_BT_CharmWeek, #魅力周榜
     Def_BT_CharmDay, #魅力日榜
+    Def_BT_BossTrialSubmit,                   #提交boss凭证榜 (boss历练活动)
+    Def_BT_AlineInvade,                       #异兽入侵
     
     Def_BT_Max, #排行榜最大类型
-) = range(0, 32 + 2) 
+) = range(0, 34 + 2) 
 
 ''' 跨服排行榜类型, 从 150 开始
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
@@ -822,7 +845,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
                              ]
 
 ##---比率---
@@ -1058,7 +1081,21 @@
 CDBPlayerRefresh_JiYuan, # 机缘币  245
 CDBPlayerRefresh_BTGMYuE, # BTGM余额  246
 CDBPlayerRefresh_SuccessScore, # 成就积分  247
-) = range(146, 248)
+CDBPlayerRefresh_FamilyFlagWarPoint, # 成就积分  248
+CDBPlayerRefresh_ComboDefRate, # 抗连击概率 249
+CDBPlayerRefresh_AtkBackRate, # 反击概率 250
+CDBPlayerRefresh_AtkBackDefRate, # 抗反击概率 251
+CDBPlayerRefresh_SuckHPPer, # 吸血比率 252
+CDBPlayerRefresh_SuckHPDefPer, # 抗吸血比率 253
+CDBPlayerRefresh_Xiantao, # 仙桃  254
+CDBPlayerRefresh_CurePer, # 强化治疗 255
+CDBPlayerRefresh_CureDefPer, # 弱化治疗 256
+CDBPlayerRefresh_PetStrengthenPer, # 强化灵兽 257
+CDBPlayerRefresh_PetWeakenPer, # 弱化灵兽 258
+CDBPlayerRefresh_SuperHitHurtPer, # 强化暴伤 259
+CDBPlayerRefresh_SuperHitHurtDefPer, # 弱化暴伤 260
+CDBPlayerRefresh_Lingyu, # 灵玉 261
+) = range(146, 262)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -1086,13 +1123,17 @@
 TYPE_Price_JiYuan = 37    # 机缘币
 TYPE_Price_BTGMYuE = 38    # GM余额
 TYPE_Price_SuccessSocre = 39    # 成就积分
+TYPE_Price_FamilyFlagWarPoint = 40    # 万界积分
+TYPE_Price_Xiantao = 41    # 仙桃
+TYPE_Price_Lingyu = 42    # 灵玉
+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:"成就积分", 41:"仙桃", 42:"灵玉", 99:"代币"
                  }
 
 #以下是旧的金钱类型
@@ -1123,6 +1164,8 @@
                            TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
                            TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
                            TYPE_Price_SuccessSocre:CDBPlayerRefresh_SuccessScore,
+                           TYPE_Price_Xiantao:CDBPlayerRefresh_Xiantao,
+                           TYPE_Price_Lingyu:CDBPlayerRefresh_Lingyu,
                            }
 
 # 支持负值的货币及对应0418刷新类型
@@ -1172,6 +1215,7 @@
 GameFuncID_FaQi = 199           # 法器
 GameFuncID_LianTi = 207         # 炼体
 GameFuncID_Championship = 210   # 排位
+GameFuncID_MineArea = 227       # 福地
 # 以下为暂时无用的
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环
@@ -1554,6 +1598,8 @@
 Def_IudetMapLoaction = 15  # 物品记录地图坐标[mapid, posx, posy]
 Def_IudetLegendAttrID = 17  # 物品传奇属性ID列表
 Def_IudetLegendAttrValue = 19  # 物品传奇属性值列表
+Def_IudetBaseAttrID = 21  # 物品基础属性ID列表,适用于随机范围基础属性(非物品表配置的固定属性)
+Def_IudetBaseAttrValue = 23  # 物品基础属性值列表
 Def_IudetPartSuiteLV = 25  # 部位套装等级 [套装类型1等级, 套装类型2等级, ...]
 Def_IudetWingMaterialItemID = 27  # 翅膀精炼材料ID列表
 Def_IudetWingMaterialItemCount = 29  # 翅膀精炼材料个数列表
@@ -1571,6 +1617,7 @@
 Def_IudetItemColor = 16  # 物品颜色,如果该值没有就取物品
 Def_IudetItemCount = 18  # 物品个数,支持20亿,目前仅特殊转化物品会用到
 Def_IudetCancelUseLimit = 20  # 物品取消使用限制
+Def_IudetItemLV = 22  # 物品等级,适用于动态物品等级(非物品表配置的固定等级)
 Def_IudetSource = 24  # 物品来源
 Def_IudetSuiteLV = 30  # 套装等级
 Def_IudetHasOpenCnt = 32  # 物品累积开启次数
@@ -1594,6 +1641,9 @@
 Def_IudetPet_Skill = 201  # 技能列表
 
 Def_IudetHorsePetSkinIndex = 210  # 骑宠觉醒外观索引
+
+# 以下为自定义的设置物品属性key
+Def_CItemKey_AppointID = "AppointID"
 # ----------------------------------------------------
 
 # 宠物物品数据状态
@@ -1955,7 +2005,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