From ac36bdcfa7db1557790a5b912c3248b22625841f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十一月 2025 18:49:17 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_ServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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..368e745 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -1354,7 +1354,8 @@
 SkillTagAffect_AtkHighest, # 攻击力最高 5
 SkillTagAffect_Burn, # 灼烧/玄火目标优先 6
 SkillTagAffect_PoisonCure, # 仅焚血(毒奶)目标 7
-) = range(8)
+SkillTagAffect_DamShield, # 承伤盾目标优先 8
+) = range(9)
 
 #技能施法目标
 Def_UseSkillAim_Type = 3
@@ -3518,6 +3519,15 @@
 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值
 Def_PDict_WeekPartyID = "WeekPartyID"  # 玩家身上的活动ID,配置ID,用于补发上次活动用
@@ -4037,6 +4047,7 @@
 SkillEff_AngerSkillNoXP = 7007 # 无论多少怒气均可释放该怒气技能
 SkillEff_UseSkillHarmSelf = 7008 # 释放技能时自残(先扣血)
 SkillEff_SkillUseCntLimit = 7009 # 限制技能最多触发次数
+SkillEff_UseSkillStealBuff = 7010 # 释放技能前偷取buff
 
 (
 TriggerType_BeSuperHit, # 被暴击触发技能 1
@@ -5104,7 +5115,8 @@
 TaskType_GoldRushWorkers, # 拥有x名监工 17
 TaskType_ReqOrJoinFamily, # 创建或者申请加入公会 18
 TaskType_FBTianzi, # 挑战天子的考验x次 19
-) = range(1, 1 + 19)
+TaskType_Rename, # 改名 20
+) = range(1, 1 + 20)
 
 # 任务分组
 TaskGroupList = (

--
Gitblit v1.8.0