From 929aebd1119d3b28d6640460cbbe0c656f5b9528 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 28 十一月 2025 14:20:18 +0800
Subject: [PATCH] 16 卡牌服务端(去除砍价人次限制,由砍价表配置的人次上限决定;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   57 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 6084922..39a115b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -913,22 +913,22 @@
 AfterLogic_AddBuff = "AddBuff"
 AfterLogic_SyncBuff = "SyncBuff"
 
-#伤害类型
+#伤害飘血类型
 (
-HurtType_Fail,              # 失败 - 如概率没有触发 0
-HurtType_Normal,            # 伤害 1
-HurtTYpe_Cure,              # 治疗 2
-HurtType_3,
-HurtType_Immune,            # 免疫 4
-HurtType_Parry,             # 格挡 5
-HurtType_IgnoreDef,         # 无视防御/真实伤害 6
-HurtType_SuperHit,          # 暴击 7
-HurtType_Stun,              # 击晕 8 仅算概率触发的击晕,技能额外击晕效果的不算
-HurtType_Miss,              # 闪避 9
-HurtType_PoisonCureHurt,    # 伤害毒奶 10
-HurtType_PoisonCureSuck,    # 吸血毒奶 11
-HurtType_HarmSelf,          # 自残 12
-HurtType_CaorenProtect,     # 本次伤害有受曹仁防护标记 13
+HurtAtkType_Fail,              # 失败 - 如概率没有触发 0
+HurtAtkType_Hurt,              # 伤害 1
+HurtAtkType_Cure,              # 治疗 2
+HurtAtkType_Revive,            # 复活 3
+HurtAtkType_Immune,            # 免疫 4
+HurtAtkType_Parry,             # 格挡 5
+HurtAtkType_IgnoreDef,         # 无视防御/真实伤害 6
+HurtAtkType_SuperHit,          # 暴击 7
+HurtAtkType_Stun,              # 击晕 8 仅算概率触发的击晕,技能额外击晕效果的不算
+HurtAtkType_Miss,              # 闪避 9
+HurtAtkType_PoisonCureHurt,    # 伤害毒奶 10
+HurtAtkType_PoisonCureSuck,    # 吸血毒奶 11
+HurtAtkType_HarmSelf,          # 自残 12
+HurtAtkType_CaorenProtect,     # 本次伤害有受曹仁防护标记 13
 ) = range(14)
 
 #伤害类型
@@ -1354,7 +1354,8 @@
 SkillTagAffect_AtkHighest, # 攻击力最高 5
 SkillTagAffect_Burn, # 灼烧/玄火目标优先 6
 SkillTagAffect_PoisonCure, # 仅焚血(毒奶)目标 7
-) = range(8)
+SkillTagAffect_DamShield, # 承伤盾目标优先 8
+) = range(9)
 
 #技能施法目标
 Def_UseSkillAim_Type = 3
@@ -3285,8 +3286,6 @@
 Def_PDict_MonthCTGCount = "MonthCTGCount_%s"  # 本月充值次数,参数(CTG对应的商品记录ID)
 Def_PDict_CTGGoodsBuyCount = "CTGGoodsBuyCount_%s"  # 对应充值商品已购买次数,参数(CTG对应的商品记录ID)
 Def_PDict_CTGSelectItemValue = "CTGSelectItemValue_%s"  # 充值自选选择记录,参数(CTG对应的商品记录ID) 每两位存储每个自选索引对应选择的物品索引+1,存储位值为0代表未选择,最多支持选择4种物品
-Def_PDict_OnlineRechargeTHAward = "OnlineRechargeTHAward"  # 在线特惠充值额外奖励 - 是否已领取奖励
-Def_PDict_DayFreeGoldGiftState = "DayFreeGoldGiftState"  # 每日免费直购礼包领取记录
 Def_PDict_FirstChargeRecord = "FirstChargeRecord_%s"  # 首充领取记录,按位记录首充第x天是否已领取,参数(首充ID)
 Def_PDict_FirstChargeTime = "FirstChargeTime_%s"  # 首充充值时间戳,参数(首充ID)
 Def_PDict_IsReBorn = "Def_PDict_IsReBorn"  # 是否回城复活
@@ -3517,6 +3516,15 @@
 Def_PDict_BeautyLVInfo = "BeautyLVInfo_%s"  # 红颜等级信息,参数(红颜ID) 经验*10000+等级*10+是否已激活
 Def_PDict_BeautyAwardLV = "BeautyAwardLV_%s"  # 红颜已领取到的奖励等级,参数(红颜ID)
 Def_PDict_BeautySkinInfo = "BeautySkinInfo_%s"  # 红颜时装信息,参数(时装ID) 星级*100+是否使用+是否已激活
+
+#游历
+Def_PDict_TravelEnergy = "TravelEnergy"  # 剩余体力
+Def_PDict_TravelEnergyTime = "TravelEnergyTime"  # 上次恢复体力时间戳
+Def_PDict_TravelCnt = "TravelCnt"  # 累计游历次数
+Def_PDict_TravelScenery = "TravelScenery"  # 景观信息,景观左上角所在格子索引 * 10 + 景观类型
+Def_PDict_TravelSceneryLVInfo = "TravelSceneryLVInfo"  # 景观等级信息,个位数-第1次升级成功与否,1-成功,2-失败;十位-第2次 ...
+Def_PDict_TravelGridInfo = "TravelGridInfo_%s_%s"  # 格子信息,参数(行, 列) 事件ID*100+是否双倍*10+开启状态
+Def_PDict_TravelState = "TravelState"  # 本盘游历记录,1-已领取景观奖励
 
 #周狂欢
 Def_PDict_WeekPartyActID = "WeekPartyActID"  # 玩家身上的活动ID,唯一标识,取活动开始日期time值
@@ -3987,7 +3995,9 @@
 TriggerWay_BeParry, # 被格挡时 37
 TriggerWay_BeMiss, # 被闪避时 38
 TriggerWay_BeAtkBack, # 被反击时 39
-) = range(1, 1 + 39)
+TriggerWay_InBattlefield, # 在场时 40
+TriggerWay_Revive, # 复活时 41
+) = range(1, 1 + 41)
 
 # 不加载的被动触发方式,一般用于本技能固定触发逻辑用的
 TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]
@@ -4019,6 +4029,7 @@
 PassiveEff_AddAngerSkillPerByXP = 6018 # 增加怒气技能伤害(按消耗怒气值)
 PassiveEff_AddBatDamPerByTagLostHP = 6019 # 战斗增伤(按目标已损失生命)
 PassiveEff_AddSkillPerByBuffState = 6020 # 增加技能系数(验证由buff状态触发的)
+PassiveEff_AddBuffLayer = 6021 # 添加buff层级时额外增加x层
 
 # 被动效果ID有触发值时就返回的
 PassiveEffHappenValueList = [PassiveEff_ChangeHurtType, PassiveEff_ImmuneControlBuff, PassiveEff_MustSuperHit, PassiveEff_SkillInvalid]
@@ -4037,6 +4048,8 @@
 SkillEff_AngerSkillNoXP = 7007 # 无论多少怒气均可释放该怒气技能
 SkillEff_UseSkillHarmSelf = 7008 # 释放技能时自残(先扣血)
 SkillEff_SkillUseCntLimit = 7009 # 限制技能最多触发次数
+SkillEff_UseSkillStealBuff = 7010 # 释放技能前偷取buff
+SkillEff_ReviveNoUse = 7011 # 没有复活目标时释放其他技能
 
 (
 TriggerType_BeSuperHit, # 被暴击触发技能 1
@@ -4807,7 +4820,7 @@
 Def_RewardType_ManyDayRecharge, #多日连充41
 Def_RewardType_InfiniteMoney, #无限货币42
 Def_RewardType_SingleRecharge, #单笔累充 43
-Def_RewardType_OnlineRechargeTH, #创角在线特惠充值额外奖励 44
+Def_RewardType_44, #创角在线特惠充值额外奖励 44
 Def_RewardType_SWC, #送万充奖励 45
 Def_RewardType_FairyCardSponsor, #仙卡赞助奖励 46
 Def_RewardType_CritGodBoxCTG, #暴击神兵奖励 47
@@ -5104,7 +5117,9 @@
 TaskType_GoldRushWorkers, # 拥有x名监工 17
 TaskType_ReqOrJoinFamily, # 创建或者申请加入公会 18
 TaskType_FBTianzi, # 挑战天子的考验x次 19
-) = range(1, 1 + 19)
+TaskType_Rename, # 改名 20
+TaskType_HeroBook, # 武将图鉴激活x个  21
+) = range(1, 1 + 21)
 
 # 任务分组
 TaskGroupList = (

--
Gitblit v1.8.0