From 67d6a2a2fadc1f98f8316cf7e3a0717bfc971a43 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 八月 2025 10:23:45 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(技能变更主线阵容战斗中更新技能;B428增加通知是否是添加buff的;buff叠加规则0 4 5;增加效果5002结算目标某种状态持续buff所有回合效果)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   49 ++++++++++---------------------------------------
 1 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 7c24f06..68741dd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -2109,43 +2109,8 @@
 #副本ID转换
 Def_FB_MapID = {
                 'MainLevel':[Def_FBMapID_Main, Def_FBMapID_MainBoss],  # 主线关卡
-                'FamilyWar':[Def_FBMapID_FamilyWar],  # 仙盟联赛
-                'FamilyInvade':[Def_FBMapID_FamilyInvade], # 守卫人皇
-                'FamilyBoss':[Def_FBMapID_FamilyBossMap], # 战盟boss
-                'TrialTower':[Def_FBMapID_TrialTower], # 试炼之塔
-                'ClearDevil':[Def_FBMapID_ClearDevil], # 除魔卫道
-                'MagicWeapon':[Def_FBMapID_MagicWeapon], # 法宝副本
-                'DuJie':[Def_FBMapID_DuJie], #渡劫
-                'KirinHome':[Def_FBMapID_KirinHome], #麒麟之府
-                'BZZD':[Def_FBMapID_BZZD], # 百战之地(仙界秘境)
-                'GodArea':[Def_FBMapID_GodArea],#古神禁地
-                'PersonalBoss':[Def_FBMapID_PersonalBoss],#个人BOSS
-                'FamilyParty':[Def_FBMapID_FamilyParty],#仙盟宴会
-                'MunekadoTrial':[Def_FBMapID_MunekadoTrial],#宗门试炼
-                'ChaosDemon':[Def_FBMapID_ChaosDemon], #混乱妖域
-                'KillDevil':[Def_FBMapID_KillDevil], #讨伐妖魔
-                'QueenRelics':[Def_FBMapID_QueenRelics], #娲皇遗迹
-                'ElderBattlefield':[Def_FBMapID_ElderBattlefield], #上古战场
-                'Guard':[Def_FBMapID_Guard], #守护副本
-                'SealDemon':[Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx], #封魔坛
-                'XMZZ':[Def_FBMapID_XMZZ], #仙魔之争
-                #'ArenaBattle':[Def_FBMapID_ArenaBattle],#竞技场战斗
-                #'CrossRealmPK':[Def_FBMapID_CrossRealmPK], #跨服竞技场
-                #'CrossChampionship':[Def_FBMapID_CrossChampionship], #跨服排位
-                'CrossDemonKing':[Def_FBMapID_DemonKing, Def_FBMapID_CrossDemonKing], #妖王
-                'CrossGrassland':[Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian], #草园
-                'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
-                'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
-                'SkyTower':[Def_FBMapID_SkyTower],#天星塔
-                'RealmTower':[Def_FBMapID_RealmTower],#境界塔
-                'AllFamilyBoss':[Def_FBMapID_AllFamilyBoss],#多仙盟BOSS
-                'HorsePetBoss':[Def_FBMapID_HorsePetBoss],#骑宠BOSS
-                'FairyTreasure':[Def_FBMapID_FairyTreasure],#缥缈宝藏
-                'Love':[Def_FBMapID_Love],#情缘副本
-                'CrossBattlefield':[Def_FBMapID_CrossBattlefield], #跨服战场
                 'CrossFamilyFlagwar':[Def_FBMapID_CrossFamilyFlagwar], #跨服仙盟夺旗战/逐鹿万界
                 'MineArea':[Def_TFMapID_MineArea], #福地
-                'MirrorBattle':MirrorBattleMapIDList, #镜像切磋
                 }
 
 #特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
@@ -4216,6 +4181,8 @@
 Def_PDict_TreeLVUPState = "TreeLVUPState" # 仙树升级状态;0-未升级;1-升级中
 Def_PDict_TreeLVUPRemainTime = "TreeLVUPRemainTime" # 仙树升级剩余时间,秒
 Def_PDict_TreeLVUPRefreshTime = "TreeLVUPRefreshTime" # 仙树升级上次刷新时间戳
+Def_PDict_TreeFreeTimeCnt = "TreeFreeTimeCnt" # 今日已领取免费减时次数,过天重置
+Def_PDict_TreeFreeTimeLast = "TreeFreeTimeLast" # 今日上次领取免费减时时间戳,过天重置
 
 #任务,每个任务组有且仅有一个进行中的任务
 Def_PDict_TaskIDLast = "TaskIDLast_%s" # 上一次完成的任务ID,参数(任务组)
@@ -4369,7 +4336,8 @@
 TriggerWay_AttackOverDirect, # 直接攻击后 (非buff攻击)10
 TriggerWay_BeAttackedDirect, # 受到直接攻击时 (非buff攻击)11
 TriggerWay_ShieldBroken, # 承伤盾被击破时 12
-) = range(1, 1 + 12)
+TriggerWay_CurSkillEff, # 本技能/buff释放后,一般用于本技能/buff释放后触发,仅该技能释放后有效 13
+) = range(1, 1 + 13)
 
 # 被动触发有效来源
 TriggerSrc_Skill = 1
@@ -5267,7 +5235,9 @@
 Def_RewardType_LunhuidianAward, # 轮回殿奖励 78
 Def_RewardType_RechargeDayAward, # 累充每日奖励 79
 Def_RewardType_FamilyGCZ, # 仙盟攻城战 80
-)= range(81)
+Def_RewardType_ADAward, # 广告奖励 81
+Def_RewardType_TreeFreeTime, # 仙树免费减时 82
+)= range(83)
 
 #boss复活相关活动定义
 BossRebornActIDList = (
@@ -5519,7 +5489,7 @@
 
 # 任务类型定义
 TaskTypeList = (
-TaskType_FBPass, # 副本过关到xxx 1
+TaskType_MainLevel, # 主线过关到xxx 1
 TaskType_TreeLV, # 仙树达到X级 2
 TaskType_EquipDecompose, # 分解装备x次 3
 TaskType_CutTree, # 消耗X个战锤  4
@@ -5527,7 +5497,8 @@
 TaskType_RealmLV, # 境界达到X级 6
 TaskType_KillNPC, # 击败X只怪物 7
 TaskType_GetMoney, # 累计获得xx货币 8
-) = range(1, 1 + 8)
+TaskType_EquipColor, # 穿戴x件x品质及以上装备 9
+) = range(1, 1 + 9)
 
 # 任务分组
 TaskGroupList = (

--
Gitblit v1.8.0