From ace5dadbba4a16357d0aca93ee5734ab8adf7a94 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 28 十月 2025 17:57:08 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(韩遂技能;增加效果6016-对护盾造成伤害加成)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |  160 +++++++++++++++++------------------------------------
 1 files changed, 52 insertions(+), 108 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index fbfad28..1c277ee 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -347,8 +347,8 @@
 TYPE_Calc_BaseDefAddPer,                # 基础防御百分比
 TYPE_Calc_BaseHitAddPer,                # 基础命中百分比
 TYPE_Calc_BaseMissAddPer,               # 基础闪避百分比
-TYPE_Calc_GodWeaponMaxHPPer,            # 神兵生命百分比 
-TYPE_Calc_GodWeaponAtkPer,              # 神兵攻击百分比 105
+TYPE_Calc_104,                          # 神兵生命百分比 
+TYPE_Calc_105,                          # 神兵攻击百分比 105
 TYPE_Calc_StoneMaxHPPer,                # 宝石生命百分比
 TYPE_Calc_StoneAtkPer,                  # 宝石攻击百分比
 TYPE_Calc_HPCureEnhance,                # 血瓶恢复效果增加
@@ -474,12 +474,11 @@
 Def_ItemID_GongdePoint = 530               # 直接给功德点
 Def_ItemID_FamilyFlagWarPoint = 540       # 直接给万界积分
 Def_ItemID_TongTianPoint = 720               # 直接给通天令经验点
-Def_ItemID_SuccessScore = 590               # 直接给成就积分
 Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_SP, Def_ItemID_GoldPaper, 
                            Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog,
                            Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor, Def_ItemID_GoldMoney,
                            Def_ItemID_FuncSysPrivilege, Def_ItemID_FCPartyPoint, Def_ItemID_BTGMPoint, Def_ItemID_GuShenMoney,
-                           Def_ItemID_GongdePoint, Def_ItemID_TongTianPoint, Def_ItemID_SuccessScore,
+                           Def_ItemID_GongdePoint, Def_ItemID_TongTianPoint,
                            Def_ItemID_FamilyFlagWarPoint]
 # 货币类型对应直接给货币物品ID
 MoneyItemIDDict = {IPY_GameWorld.TYPE_Price_Gold_Money:Def_ItemID_GoldMoney,
@@ -509,7 +508,6 @@
 Def_ItemType_MissionItem = 17      #任务物品
 Def_ItemType_TransMissionItem = 18      #转职任务物品
 Def_ItemType_RealmStuff = 19      #头衔(境界)升级道具
-Def_ItemType_GodWeaponStuff = 20      #头衔(境界)升级道具
 Def_ItemType_HorseStuff = 21      #坐骑丹
 Def_ItemType_HorseSoul = 22      #坐骑兽魂
 Def_ItemType_HorseBook = 23      #坐骑技能书
@@ -677,6 +675,7 @@
 Def_Effect_RecycleItemMoney = 277   #回收物品转化为货币; A值-直接给货币物品ID;B值-货币数量
 Def_Effect_FamilyEmblem = 278   #激活仙盟徽章; A值-徽章ID;
 Def_Effect_HeroSkin = 279   #激活武将皮肤; A值-武将ID;B值-皮肤索引
+Def_Effect_FamilyTaofaCnt = 280   #增加公会讨伐次数; A值-讨伐次数
 #----以下未使用或代码依然存在的---
 Def_Effect_ItemGiveGongXun = 1920        #使用道具给予功勋
 Def_Effect_ItemGiveRuneJH = 1925       #使用道具给予符印精华
@@ -772,8 +771,6 @@
 Def_Item_Eff_UseClassLV = 2821
 #祝福值波动范围 随机用
 Def_Item_Eff_BlessRange = 2818
-#神兵经验值
-Def_Item_Eff_GodWeaponExp = 206
 #---------------------------------------------------------------------
 #写死的任务ID
 #新手任务
@@ -1485,7 +1482,6 @@
 ) = range( 0, Def_AutoAtkSkillType )
 
 #技能类型
-Def_SkillType_Count = 25
 (
    Def_SkillType_Special      ,  #特殊技能   0        
    Def_SkillType_Atk          ,  #攻击类   1
@@ -1502,6 +1498,11 @@
    Def_SkillType_Area         ,  #场景技能(buff)  12
    Def_SkillType_Summon       ,  #召唤  13
    Def_SkillType_Action       ,  #影响行为BUFF 14
+   Def_SkillType_CleanBuff    ,  #清除buff类(如净化等) 15
+) = range(0, 1 + 15)
+
+# 以下废弃
+(
    Def_SkillType_LstPlsBuffAtk,  #持续攻击类BUFF 15
    Def_SkillType_PassivePlsBuff,  #被动触发增益类buff 16
    Def_SkillType_PassiveDepBuff,  #被动触发减益类buff 17
@@ -1513,7 +1514,7 @@
    Def_SkillType_AttrSkillNoLearn,   # 可叠加的同类型ID属性类技能 不可学习 算属性直接取表 目前用于神兽技能 23
    Def_SkillType_PassiveLstPlsBuffAtk,  #被动持续攻击类BUFF 24
    
-) = range( 0, Def_SkillType_Count )
+) = range(115, 125)
 
 #数据库中的Buff类型对应返回C++中的Buff类型对象
 Def_SkillBuffList = {
@@ -2884,10 +2885,6 @@
 Def_PetRoleGapLVMax = 5                    # 宠物可出战的等级最多大于玩家等级数
 Def_Pet_ProcessHP_Tick = 3000              # 宠物回血间隔
 
-#---自动防外挂验证---
-#玩家字典用于连续自动检测不回复次数
-Def_Player_AutoCheck_Count = 'playerCheckCount0704'
-
 #角色记录是否使用外挂
 (
 Def_AutoCheck_State_Safe,
@@ -2917,12 +2914,6 @@
     Def_GameWallow_LV_Third,    # 5小时
     Def_GameWallow_LV_Max,
 )= range(0, 10)
-
-#---物品卖给商店商店类型记录---
-(
-    Def_ShopType_NpcShop,     #NPC商店
-    Def_ShopType_LongSale,    #远程贩售
-) = range(1, 2+1)
 
 # 回合攻击战斗类型
 (
@@ -3085,7 +3076,6 @@
 Def_PlayerKey_BuffHurtCnt = "BuffHurtCnt" # 持续buff掉血次数
 Def_PlayerKey_Zhansha = "zhansha"   # 斩杀标志
 Def_PlayerKey_LockHPSkillID = "LockHPSkillID"   # 锁血功能的技能
-Def_PlayerKey_GodWeaponBeforeProDef = "GWBPD"   # 神兵护盾被攻击前的值
 Def_PlayerKey_curHurtValue = "curHurtValue"     # 计算中的临时伤害值,技能特殊用
 Def_PlayerKey_curHurtValueEx = "curHurtValueEx"     # 计算中的临时伤害值,技能特殊用
 Def_PlayerKey_SomersaultTime = "Somersault"     # 翻滚一定时间内无敌,表现为MISS
@@ -3130,7 +3120,6 @@
 Def_PlayerKey_BuyItemCnt = "BuyItemCnt"  # 购买物品数量
 Def_PlayerKey_SpeedHorse = "SpeedHorse"  # 骑乘时附加移动速度值
 Def_PlayerKey_QueryOpenServerAwardState = "QueryOpenServerAwardState"  # 查询开服奖励状态
-Def_PlayerKey_QueryFamilyStoreTick = "QueryFamilyStoreTick"  # 战盟仓库操作tick
 
 Def_PlayerKey_QueryMarkIdCardIndex = 'QueryMarkIdCardIndex'  # 指定账号生成卡类型
 Def_PlayerKey_QueryNewGuyCardType = 'QueryNewGuyCardType'  # 查询的新手卡类型
@@ -3139,7 +3128,6 @@
 Def_PlayerKey_ComboBuffProcessState = "ComboBuffProcessState"    #持续性buff连击处理状态
 Def_PlayerKey_LvAwardQueryState = 'LvAwardQueryState'  # 等级奖励领奖查询状态
 Def_PlayerKey_StoreQueryState = 'StoreQueryState'  # 商店全服购买次数查询状态
-Def_PlayerKey_MysticalShopLastTime = 'MysticalShopLastTime'  # 神秘商店刷新时间
 #===============================================================================
 # # 持续性buff伤害处理连击技能ID列表
 # # 因为释放一次技能后一段时间内是持续性的, 故连接判断效果仅处理一次, 持续时间内均受此效果影响, 不重复处理连击
@@ -3194,7 +3182,7 @@
 Def_PDictType_FlashSale, #限时抢购
 Def_PDictType_TJGNotify,  # 脱机挂结果通知
 Def_PDictType_LVAward,  # 等级奖励领取信息记录
-Def_PDictType_OpenServerCampaign,  # 开服活动
+Def_PDictType_4,  # 开服活动
 Def_PDictType_WeekParty, #周狂欢
 Def_PDictType_FeastWeekParty,    # 节日巡礼
 Def_PDictType_LoginAward,    # 登录奖励运营活动
@@ -3229,21 +3217,6 @@
 Def_Player_Dict_FirstLogin = "FirstLogin"    # 首登标记 0-未首登; 1-首登过
 Def_GuideStateKeyCount = 8 # 引导状态key最大个数
 Def_Player_Dict_GuideState = "GuideState_%s" # 引导状态记录,参数为key个数编号
-Def_Player_Dict_VersionFix = "VersionFix_%s" # 版本修正标记,参数为key个数编号, 支持n个版本修正标记,每个key支持31个 
-Def_Player_Dict_PrestigeAwardMark = "PrestigeAwardMark_7"   # 领取威望物品奖励情况
-Def_Player_Dict_AutoCheckHack_Wait = "AutoCheckHackWait_10"    #自动检测外挂验证中标识
-Def_Player_Dict_AutoCheckHack_Source = "AutoCheckHackSource_11"    #自动检测外挂随机源
-Def_Player_Dict_AutoCheckHack_Type = "AutoCheckHackType_12"    #自动检测外挂类型
-Def_Player_Dict_AutoCheckHack_State = "AutoCheckHackState_13"    #自动检测外挂账号状态识别
-Def_Player_Dict_Captcha_WaitTick = "CaptchaWaitTick_14"    #图形验证回复等待时间
-Def_Player_Dict_Captcha_WaitSign = "CaptchaWaitSign_15"    #图形验证回复等待标识
-Def_Player_Dict_Captcha_ErrCount = 'CaptchaErrCount_16'    #玩家回答错误次数
-Def_Player_Dict_Captcha_Answer = 'CaptchaAnswer_17'    #图形验证码答案
-Def_Player_Dict_AutoCheckHack_ErrCnt = "AutoCheckHackErrCnt_19"    #自动检测外挂随机源
-Max_StoryMissionNum = 99
-Def_Player_Dict_StoryMissionState = "StoryMissionState_%s"  # 剧情任务编号完成状态, 参数(key编号), 按编号位记录
-Def_Player_Dict_TaskLastKillNPCID = "TaskLastKillNPCID"    #任务上次随机击杀NPCID
-Def_Player_Dict_TaskLastVisitNPCID = "TaskLastVisitNPCID"    #任务上次随机访问NPCID
 LittleHelperSetNumCount = 20 # 小助手设置编号个数
 LittleHelperValueCount = 6 # 小助手设置值个数
 Def_Player_Dict_LittleHelperValue = "LittleHelperValue%s_%s" # 小助手设置值存储, 参数(设置编号, value编号)
@@ -3331,6 +3304,7 @@
 
 Def_PDict_TreasureFreeCount = "TreasureFreeCount_%s"  # 寻宝今日已使用免费次数, 参数(寻宝类型)
 Def_PDict_TreasureCount = "TreasureCount_%s"  # 寻宝次数, 参数(寻宝类型)
+Def_PDict_TreasureCountEx = "TreasureCountEx_%s"  # 第x次x抽必出,按第x次单抽、10连抽记录, 参数(寻宝类型)
 Def_PDict_TreasureCountToday = "TreasureCountToday_%s"  # 今日寻宝次数, 参数(寻宝类型)
 Def_PDict_TreasureLuck = "TreasureLuck_%s"  # 寻宝当前幸运值, 参数(寻宝类型)
 Def_PDict_TreasureCntAward = "TreasureCntAward_%s"  # 累计寻宝次数对应物品奖励领奖状态, 参数(寻宝类型)
@@ -3373,11 +3347,6 @@
 Def_PDict_LoginDayAward = "PLoginDayAward"  # 累计登陆领取情况
 Def_PDict_CollNpcIDCollTime = "NPCIDCollTime_%s"   # 采集NPCID对应每日对应采集次数,%sNPCID
 Def_PDict_CollNpcIDCollTimeTotal = "NPCIDCollTimeTotal_%s"   # 采集NPCID对应对应采集总次数,%sNPCID
-Def_PDict_ShopItemDayBuyCnt = "ShopItemDayBuyCnt_%s"   # 商店NPC商品已购买次数,itemIndex
-Def_PDict_ShopItemStartTime = "ShopItemStartTime_%s"   # 神秘限购商品开卖时间,itemIndex
-Def_PDict_MysticalShopGoods = "MysticalShopGoods_%s"   # 神秘商店商品ID,索引
-Def_PDict_MysticalShopRefreshCnt = "MysticalShopRefreshCnt"   # 神秘商店已手动刷新次数
-Def_PDict_MysticalShopLVRefreshCnt = "MysticalShopLVRefreshCnt"   # 神秘商店等级段刷新次数
 Def_PDict_MoneyMinus = "MoneyMinus_%s"  # 货币对应负值, 参数[货币类型]
 Def_PDict_Currency = "PlayerCurrency_%s"  # 自定义货币类型, 参数[自定义货币类型]
 Def_PDict_UseMoneyTotal = "UseMoneyTotal_%s"  # 累计消耗货币, 参数[货币类型]
@@ -3402,10 +3371,6 @@
 
 Def_PDict_ItemUseCntToday = "ItemUseCntToday_%s" # 物品今日使用次数, 参数为物品ID
 
-Def_PDict_GodWeaponLV = "GodWeaponLV_%s" # 神器等级, 参数神器索引
-Def_PDict_GodWeaponExp = "GodWeaponExp_%s" # 神器等级对应祝福值经验, 参数神器索引
-Def_PDict_GodWeaponState = "GodWeaponState" # 神器是否已经激活, 按索引位存储神器是否激活
-
 Def_PDict_ClothesSkinLV = "ClothesSkinLV_%s"  # 时装皮肤等级,参数时装索引
 Def_PDict_ClothesChestLV = "ClothesChestLV"  # 时装柜等级
 Def_PDict_ClothesChestEXP = "ClothesChestEXP"  # 时装柜经验
@@ -3414,13 +3379,15 @@
 
 Def_PDict_IsAddReviveTired = "IsAddReviveTired"  # 死亡是否增加复活疲劳
 
-Def_PDict_DownloadAwardState = "DownloadAwardState"  # 分包包下载奖励状态 0-未领 >0-已领奖励编号
-Def_PDict_DownloadPatchAward = "DownloadPatchAward"  # 更新包下载奖励状态 0-未领 >0-已领奖励编号
-
 Def_PDict_ChestsOpenCount = "ChestsOpenCount_%s"  # 宝箱已开启次数, 参数(宝箱ID), 只有有开启次数额外奖励的才会记录
 
 Def_PDict_DropCountToday = "DropCountToday_%s" # 今日物品已掉落次数,参数(物品ID)
 Def_PDict_DropColorToday = "DropColorToday_%s" # 今日装备品质已掉落次数,参数(装备品质)
+
+#商城
+Def_PDict_ShopBuyCnt = "ShopBuyCnt_%s"  # 商店商品已购买次数,参数(商品ID)
+Def_PDict_ShopRandUnlock = "ShopRandUnlock_%s"  # 商店随机刷新解锁的商品ID解锁状态,参数(key编号)
+Def_PDict_ShopRefreshCnt = "ShopRefreshCnt_%s"  # 今日已刷新次数,参数(商店类型)
 
 # 签到
 Def_PDict_SignInState = "SignInState_%s" # 按位记录每日签到状态,参数(key编号),状态:0-不可签到;1-已签到;2-可补签;3-已领取
@@ -3462,29 +3429,25 @@
 Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV"  # 试炼之塔通关层数
 Def_Player_Dict_TrialTower_LastDayPassLV = "Tower_LastDayPassLV"  # 试炼之塔昨日通关层数
 
-#仙盟打坐
-Def_Player_Dict_FamilySitExpRound = "FamilySitExpRound"  # 已给经验轮次
-Def_Player_Dict_FamilySitTotalExp = "FamilySitTotalExp"  # 获得的总经验
-Def_Player_Dict_FamilySitTotalExpPoint = "FamilySitTotalExpPoint"  # 获得的总经验点
+#公会讨伐
+Def_Player_Dict_FamilyTaofaCnt = "FamilyTaofaCnt" # 已讨伐次数
+Def_Player_Dict_FamilyTaofaItemAddCnt = "FamilyTaofaItemAddCnt" # 道具增加讨伐次数
+Def_Player_Dict_FamilyTaofaBuZhenState = "FamilyTaofaBuZhenState" # 是否已布阵
+Def_Player_Dict_FamilyTaofaAnger = "FamilyTaofaAnger" # 当前怒气
+Def_Player_Dict_FamilyTaofaBoxTotalGetCnt = "FamilyTaofaBoxTotalGetCnt" # 累计已领取宝箱奖励数
+Def_Player_Dict_FamilyTaofaBoxUnGetCnt = "FamilyTaofaBoxUnGetCnt" # 当前未领取的宝箱奖励数
+Def_Player_Dict_FamilyTaofaBoxLastTime = "FamilyTaofaBoxLastTime" # 上一次统计未领取宝箱时间戳,超过该时间戳的宝箱才可以再增加未领取
+Def_Player_Dict_FamilyTaofaBoxContribCnt = "FamilyTaofaBoxContribCnt" # 累计贡献的宝箱奖励数
+Def_Player_Dict_FamilyTaofaBoxHurt = "FamilyTaofaBoxHurt" # 宝箱奖励计算累计伤害,求余亿部分
+Def_Player_Dict_FamilyTaofaBoxHurtEx = "FamilyTaofaBoxHurtEx" # 宝箱奖励计算累计伤害,整除亿部分
+Def_Player_Dict_FamilyTaofaBoxHurtHis = "FamilyTaofaBoxHurtHis" # 历史最高累计伤害,求余亿部分
+Def_Player_Dict_FamilyTaofaBoxHurtHisEx = "FamilyTaofaBoxHurtHisEx" # 历史最高累计伤害,整除亿部分
 
 #虚拟背包物品数据
 Def_PDict_VPackItem = "VPackItem_%s_%s" # 虚拟背包物品数据, 参数(背包类型, 位置索引)
 
 #物品个数
 Def_PDict_ItemCount = "ItemCount_%s" # 存储不放在背包的物品个数, 参数(物品ID)
-
-#一次性最大充值
-Def_Player_RechargeOnce_Coin = "RechargeOnce_Coin"
-
-#悬赏任务
-Def_Player_Dict_ArrestTaskStar = "ArrestTaskStar"  # 悬赏任务星级
-Def_Player_Dict_ArrestTaskData = "ArrestTaskData_%s"  # 悬赏任务数据,参数索引
-Def_Player_Dict_ArrestTaskAwardRecord = "ArrestTaskAwardRecord"  # 悬赏任务积分奖励领取记录
-Def_Player_Dict_ArrestTaskFinishCnt = "ArrestTaskFinishCnt"  # 悬赏任务今日完成个数
-
-#封魔坛
-Def_Player_Dict_FMTDouble = "FMTDouble" # 封魔坛是否双倍
-Def_Player_Dict_FMTOldDouble = "FMTOldDouble" # 封魔坛是否曾经可以双倍
 
 #极品白拿
 Def_PDict_FreeGoodsOpenTime = "FreeGoodsOpenTime" #极品白拿开启时间
@@ -3747,14 +3710,6 @@
 Def_PDict_FamilyGCZSQGridItemCnt = "FamilyGCZSQItemCnt_%s"  # 圣泉当前层格子抽中物品个数,参数(格子编号)
 #-------------------------------------------------------------------------------
 
-#开服活动,Def_PDictType_OpenServerCampaign
-#奖励记录 - 从低位到高位,每位表示:0-不可领;1-可领取;2-已领
-Def_PDict_OSC_BillAwardRecord = "OSCBillAwardRecord"  # 开服活动排行奖励记录, 按活动类型位存储是否领取/处理过
-Def_PDict_OSC_TagAwardRecord = "OSCTagAwardRecord_%s"  # 开服活动目标奖励记录, 参数(活动类型), 按奖励位存储是否领取
-Def_PDict_OSC_RecordData = "OSCRecordData_%s"  # 开服活动记录数值, 求余亿部分,参数(活动类型)
-Def_PDict_OSC_RecordDataEx = "OSCRecordDataEx_%s"  # 开服活动记录数值, 整除亿部分,参数(活动类型)
-Def_PDict_OSC_EndMailState = "EndMailState"  # 开服活动结束发放邮件处理状态, 记录该状态的目的是防止开服活动版本变更导致旧号重复补发奖励;
-
 # 法器
 Def_PDict_FaQiLV = "FaQiLV"  # 法器等级
 Def_PDict_FaQiEatItemCount = "FaQiEatItemCount"  # 当前阶已吃丹个数
@@ -3800,13 +3755,8 @@
 Def_PDict_InvestKeyCount = 3 # key编号数
 
 # 成就 Def_PDictType_Success
-Def_PDict_Success_AwardRecord = "Succ_AwardRecord_%s" # 成就领奖记录,参数(key编号),按索引位存储0-未领,1-已领
-Def_PDict_Success_LastDay = "Succ_LastDay_%s" # 连续类型上一次更新进度时的开服天数,参数(成就编号)
-Def_PDict_Success_CntValue = "Su_%s_%s" # 当前次数值,参数(成就类型、条件)
-Def_PDict_Success_FinishTime = "Succ_FinishTime_%s" # 成就是否已完成,参数(索引)
-Def_PDict_Success_CheckVersion = "Succ_CheckVersion" #老玩家某些功能成就检查版本
-Def_PDict_Success_PassportAward = "Succ_PassportAward_%s" #成就通行证领奖状态,参数(key编号),按索引位存储0-未领,1-已领
-Def_PDict_Success_ScoreAward = "Succ_ScoreAward" # 成就积分奖励记录,按索引位存储0-未领,1-已领
+Def_PDict_SuccessValue = "Succ_%s_%s" # 当前次数值,参数(成就类型、条件)
+Def_PDict_SuccessAward = "Succ_Award_%s" # 成就领奖记录,按成就ID位存储0-未领,1-已领,参数(key编号)
 
 # 通天令
 Def_PDict_TTL_StartTime = "TTL_StartTime" # 本轮通天令开始时间戳
@@ -3915,6 +3865,11 @@
 Def_PDict_TreeFreeTimeCnt = "TreeFreeTimeCnt" # 今日已领取免费减时次数,过天重置
 Def_PDict_TreeFreeTimeLast = "TreeFreeTimeLast" # 今日上次领取免费减时时间戳,过天重置
 
+#历练秘笈
+Def_PDict_LLMJLVInfo = "LLMJLVInfo" # 秘笈等级,消耗战锤*100 + 秘笈等级
+Def_PDict_LLMJExp = "LLMJExp" # 秘笈今日已额外获得经验
+Def_PDict_LLMJDecompose = "LLMJDecompose" # 秘笈今日已额外获得分解货币
+
 #任务,每个任务组有且仅有一个进行中的任务
 Def_PDict_TaskIDLast = "TaskIDLast_%s" # 上一次完成的任务ID,参数(任务组)
 Def_PDict_TaskID = "TaskID_%s" # 当前进行中的任务ID,参数(任务组)
@@ -4004,7 +3959,7 @@
 Def_CalcAttrFunc_Pet, # 灵宠 9
 Def_CalcAttrFunc_Horse, # 坐骑 10
 Def_CalcAttrFunc_Prestige, # 境界 11
-Def_CalcAttrFunc_GodWeapon, # 神兵 12
+Def_CalcAttrFunc_12, # 神兵 12
 Def_CalcAttrFunc_Dienstgrad, # 称号 13
 Def_CalcAttrFunc_Rune, # 符印 14
 Def_CalcAttrFunc_15,
@@ -4112,6 +4067,8 @@
 PassiveEff_AddBuffLayerMax = 6012 # 添加buff层级上限:  数值1-增加层级上限
 PassiveEff_AddFinalDamPer = 6013 # 增加最终增伤(根据属性转化)
 PassiveEff_AddSkillRate = 6014 # 增加技能概率
+PassiveEff_AddRicochetCnt = 6015 # 增加弹射次数
+PassiveEff_AddShieldHurtPer = 6016 # 对护盾造成伤害加成
 
 # 被动效果ID有触发值时就返回的
 PassiveEffHappenValueList = [PassiveEff_ChangeHurtType, PassiveEff_ImmuneControlBuff, PassiveEff_MustSuperHit]
@@ -4124,6 +4081,7 @@
 SkillEff_CureWayEx = 7001 # 额外治疗值计算(对CalcType、SkillPer治疗计算方式扩展): 值1-计算方式;值2-万分比
 SkillEff_HurtShare = 7002 # 均摊伤害
 SkillEff_ChangeTag = 7003 # 修改技能目标
+SkillEff_RandRicochetCnt = 7004 # 随机弹射次数(A~B随机,包含AB)
 
 (
 TriggerType_BeSuperHit, # 被暴击触发技能 1
@@ -4268,11 +4226,6 @@
 ShareDefine.PlayerJob_Max : TYPE_CHAPLAIN,         #魔剑对应魔剑系
 }
 
-#版本修正标记, 使用key格式 Def_Player_Dict_VersionFix
-(
-Def_VerFix_LingGenShow, #灵根特效外观
-) = range(1)
-
 ##==================================================================================================
 #游戏消费点类型定义
 Def_CostType_List = (
@@ -4314,12 +4267,12 @@
 Def_Cost_ResetGreatMasterSkill, # 重置天赋技能 35
 Def_Cost_BindJadeWheel, # 绑玉转盘
 Def_Cost_WishingWell, # 许愿池刷新
-Def_Cost_GodWeapon, # 神兵
+Def_Cost_38, # 神兵
 Def_Cost_FBHelpBattle, # 副本助战
 Def_Cost_FBGatherSoulBoss, # 聚魂副本BOSS召唤 40
 Def_Cost_CrossRealmPK, # 跨服PK
 Def_Cost_LuckyTreasure, #幸运鉴宝
-Def_Cost_MysteryShopRefresh, # 神秘商店刷新
+Def_Cost_43, # 神秘商店刷新
 Def_Cost_AuctionBid, # 拍卖行竞价
 Def_Cost_45, # 购买活动次数 45
 Def_Cost_46, # 副本买buff
@@ -4410,12 +4363,10 @@
 Def_Cost_AlchemyPray:"AlchemyPray",
 Def_Cost_BindJadeWheel:"BindJadeWheel",
 Def_Cost_WishingWell:"WishingWell",
-Def_Cost_GodWeapon:"GodWeapon",
 Def_Cost_FBHelpBattle:"FBHelpBattle",
 Def_Cost_FBGatherSoulBoss:"FBGatherSoulBoss",
 Def_Cost_CrossRealmPK:"CrossRealmPK",
 Def_Cost_LuckyTreasure:"LuckyTreasure",
-Def_Cost_MysteryShopRefresh:"MysteryShopRefresh",
 Def_Cost_AuctionBid:"AuctionBid",
 Def_Cost_CreatFamily:"CreatFamily",
 Def_Cost_BuyKillBossCnt:"BuyKillBossCnt",
@@ -4518,10 +4469,10 @@
 ItemGive_StonePickoff, # 摘除宝石 10
 ItemGive_EquipSuit, # 套装
 ItemGive_NPCDrop, # NPC掉落
-ItemGive_OpenServerCampaign, # 开服活动
+ItemGive_13, # 开服活动
 ItemGive_CTG, # CTG
 ItemGive_DiceEx, # 我要天机 15
-ItemGive_FamilyStore, # 仙盟宝库
+ItemGive_16, # 仙盟宝库
 ItemGive_Refine, # 炼丹
 ItemGive_Chests, # 宝箱
 ItemGive_TrialExchange, # 宗门兑换
@@ -4544,10 +4495,8 @@
                     ItemGive_StonePickoff:"StonePickoff",
                     ItemGive_EquipSuit:"EquipSuit",
                     ItemGive_NPCDrop:"NPCDrop",
-                    ItemGive_OpenServerCampaign:"OpenServerCampaign",
                     ItemGive_CTG:"CTG",
                     ItemGive_DiceEx:"DiceEx",
-                    ItemGive_FamilyStore:"FamilyStore",
                     ItemGive_Refine:"Refine",
                     ItemGive_Chests:"Chests",
                     ItemGive_TrialExchange:"TrialExchange",
@@ -4559,7 +4508,7 @@
 ItemDelTypeList = (
 ItemDel_Unknown, #未知 0
 ItemDel_SellPackItem, # 出售物品
-ItemDel_GodWeapon, # 神兵
+ItemDel_2, # 神兵
 ItemDel_EquipEnchase, # 宝石镶嵌
 ItemDel_Add_LimitingBuff, # 增加buff时间
 ItemDel_AddDienstgrad, # 增加称号 5
@@ -4577,7 +4526,7 @@
 ItemDel_AttrFruit, # 属性道具
 ItemDel_AddBourseItem, # 上架交易所
 ItemDel_EquipDecompose, # 装备分解
-ItemDel_FamilyStore, # 捐献装备 20
+ItemDel_20, # 捐献装备 20
 ItemDel_Treasure, # 寻宝
 ItemDel_WingExp, # 翅膀精炼经验
 ItemDel_StoneUpgrade, # 宝石升级
@@ -4610,7 +4559,6 @@
 ItemDelTypeDict = {
                    ItemDel_Unknown:"Unknown",
                    ItemDel_SellPackItem:"SellPackItem",
-                   ItemDel_GodWeapon:"GodWeapon",
                    ItemDel_EquipEnchase:"EquipEnchase",
                    ItemDel_Add_LimitingBuff:"Add_LimitingBuff",
                    ItemDel_AddDienstgrad:"AddDienstgrad",
@@ -4628,7 +4576,6 @@
                    ItemDel_AttrFruit:"AttrFruit",
                    ItemDel_AddBourseItem:"AddBourseItem",
                    ItemDel_EquipDecompose:"EquipDecompose",
-                   ItemDel_FamilyStore:"FamilyStore",
                    ItemDel_Treasure:"Treasure",
                    ItemDel_WingExp:"WingExp",
                    ItemDel_StoneUpgrade:"StoneUpgrade",
@@ -4930,8 +4877,8 @@
 (
 Def_RewardType_Activity,  # 活跃度奖励 0
 Def_RewardType_DailyTask,  # 每日任务奖励 1
-Def_RewardType_ChampionFamilyDailyReward,  # 仙盟联赛冠军仙盟每日俸禄奖励 2
-Def_RewardType_XMZZWinCnt,  # 仙魔之争胜利场数奖励 3
+Def_RewardType_LLMJLVUp,  # 历练秘笈升级 2
+Def_RewardType_FamilyTaofaBox,  # 公会讨伐领取宝箱奖励 3
 Def_RewardType_FamilyDayAward,  # 仙盟每日福利奖励 4
 Def_RewardType_LVAward,  # 玩家等级奖励5
 Def_RewardType_XBXZ, # 仙宝寻主奖励6
@@ -4943,7 +4890,7 @@
 Def_RewardType_BossReborn, # BOSS复活12
 Def_RewardType_FCRecharge, # 仙界盛典充值大礼13
 Def_RewardType_FCParty, # 仙界盛典全民来嗨14
-Def_RewardType_DownLoad, # 分包下载奖励15
+Def_RewardType_15, # 分包下载奖励15
 Def_RewardType_WishingWell, # 许愿池奖励16
 Def_RewardType_OpenFunc, # 功能开启奖励17
 Def_RewardType_TotalRecharge, # 累计充值奖励18
@@ -4987,7 +4934,7 @@
 Def_RewardType_SponsorDaily, #赞助星级每日奖励 56
 Def_RewardType_SponsorStar, #赞助星级礼包奖励 57
 Def_RewardType_GubaoItemEff, #古宝特殊效果物品奖励 58
-Def_RewardType_SuccessScore, #成就积分奖励 59
+Def_RewardType_Success, #成就奖励 59
 Def_RewardType_BuyOne, #买一送多活动免费奖励 60
 Def_RewardType_CustomAward, #自定义奖励 61
 Def_RewardType_RealmXXZL, #境界修仙之路奖励 62
@@ -5105,7 +5052,7 @@
 Def_WPAct_Pet,  #激活某只灵宠 22
 Def_WPAct_Dogz,  #出战某只神兽 23
 Def_WPAct_Stone,  #宝石总等级 24
-Def_WPAct_GodWeapon,  #神兵总等级 25
+Def_WPAct_25,  #神兵总等级 25
 Def_WPAct_Rune,  #穿戴某品质符印 26
 Def_WPAct_Pray,  #祈愿 27
 Def_WPAct_FamilyBoss,  #仙盟Boss 28
@@ -5235,9 +5182,6 @@
     PowerDownType_ResetTalent:'ResetTalent',
     PowerDownType_GatherSoul:'GatherSoul',
     }
-
-# CTG ID 定义
-Def_CTGID_SuccessPassport = 117 # 成就通行证
 
 # 通天令任务类型定义
 TTLTaskTypeList = (

--
Gitblit v1.8.0