From 0323f1602690cba6522523d968b5ed2032dccba2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 九月 2025 14:37:45 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(李典技能;被动触发支持增加击晕概率;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   64 +++++++++++++++----------------
 1 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 3a5998d..98578b9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -160,7 +160,9 @@
 AttrID_WuFinalDamPerDef,                    # 对吴减伤 62
 AttrID_QunFinalDamPer,                      # 对群增伤 63
 AttrID_QunFinalDamPerDef,                   # 对群减伤 64
-) = range(1, 1 + 64)
+AttrID_SkillPer,                            # 技能增伤 65
+AttrID_SkillPerDef,                         # 技能减伤 66
+) = range(1, 1 + 66)
 
 # 需要计算的武将战斗属性ID列表
 CalcBattleAttrIDList = [AttrID_Atk, AttrID_Def, AttrID_MaxHP, AttrID_StunRate, AttrID_StunRateDef, 
@@ -960,9 +962,9 @@
 HurtType_3,
 HurtType_4,
 HurtType_Parry,             # 格挡 5
-HurtType_IgnoreDef,         # 无视防御 6
+HurtType_IgnoreDef,         # 无视防御/真实伤害 6
 HurtType_SuperHit,          # 暴击 7
-HurtType_8,
+HurtType_Stun,              # 击晕 8 仅算概率触发的击晕,技能额外击晕效果的不算
 HurtType_Miss,              # 闪避 9
 ) = range(10)
 
@@ -1894,6 +1896,7 @@
 
 Def_FBMapID_Main = 1 # 主线小怪
 Def_FBMapID_MainBoss = 2 # 主线Boss
+Def_FBMapID_ArenaBattle = 3 # 演武场
 
 #创角新手村地图ID列表
 Def_CreatRoleMapIDList = [10000]
@@ -2001,18 +2004,16 @@
 Def_FBMapID_CrossBattlefield = 32060
 #跨服仙盟夺旗战/逐鹿万界
 Def_FBMapID_CrossFamilyFlagwar = 32090
-#竞技场战斗
-Def_FBMapID_ArenaBattle = 31290
 #情缘副本
 Def_FBMapID_Love = 31300
 #镜像切磋
 Def_FBMapID_MirrorBattle = 100
 
 #前端自定义场景地图
-ClientCustomSceneList = [Def_FBMapID_PersonalBoss, Def_FBMapID_ArenaBattle, Def_FBMapID_MirrorBattle]
+ClientCustomSceneList = []
 
 #镜像PK的地图ID列表
-MirrorBattleMapIDList = [Def_FBMapID_MirrorBattle, Def_FBMapID_ArenaBattle, Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossChampionship]
+MirrorBattleMapIDList = []
 
 #注册上传跨服服务器数据后直接进入跨服服务器的地图
 RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonLand, Def_FBMapID_CrossDemonKing, 
@@ -2108,6 +2109,7 @@
 Def_FB_MapID = {
                 'MainLevel':[Def_FBMapID_Main],  # 主线关卡
                 'MainLevelBoss':[Def_FBMapID_MainBoss],  # 主线关卡boss
+                'Arena':[Def_FBMapID_ArenaBattle],
                 }
 
 #特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
@@ -3140,7 +3142,9 @@
     BatObjState_LimitSkill, # 沉默 10
     BatObjState_LimitAddHP, # 禁疗 11
     BatObjState_Stone, # 石化 12
-) = range(13)
+    BatObjState_Disarm, # 缴械 13
+    BatObjState_ParryYJ, # 格挡印记 14
+) = range(15)
 
 # 被控制的状态列表,无法行动,处于某些控制类buff影响状态下,如晕眩,冰冻,石化
 InControlledStateList = [BatObjState_Frozen, BatObjState_Stun, BatObjState_Stone]
@@ -3622,12 +3626,6 @@
 Def_PDict_PetTrainLV = "PetTrainLV_%s"  # 灵宠培养等阶,参数(培养类型)
 Def_PDict_PetTrainItemCount = "PetTrainItemCount_%s"  # 灵宠培养当前阶已吃培养丹个数,参数(培养类型)
 
-#装备分解
-Def_PDict_EquipDecomposeLV = "EquipDecomposeLV" #等级
-Def_PDict_EquipDecomposeExp = "EquipDecomposeExp" #经验
-Def_PDict_EquipDecomposeSeting = "EquipDecomposeSeting" #设置数据
-Def_PDict_EquipDecomposeCnt = "EquipDecomposeCnt" #已分解件数
-
 #试炼之塔
 Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV"  # 试炼之塔通关层数
 Def_Player_Dict_TrialTower_LastDayPassLV = "Tower_LastDayPassLV"  # 试炼之塔昨日通关层数
@@ -4091,13 +4089,7 @@
 Def_PDict_SkillElementLV = "SkillElementLV%s" #专精技能技能等级  参数技能ID
 
 #竞技场
-Def_PDict_ArenaOSSeasonState = "ArenaOSSeasonState" # 开服前定制X天赛季状态  0-未比赛过,1-进行中,>1结算时的开服天
 Def_PDict_ArenaScore = "ArenaScore" # 当前积分
-Def_PDict_ArenaHighestScore = "ArenaHighestScore" # 历史最高积分
-Def_PDict_ArenaBattleCountDay = "ArenaBattleCountDay" # 今日已战斗次数
-Def_PDict_ArenaMatchRefreshCount = "ArenaMatchRefreshCount" # 匹配刷新列表次数
-Def_PDict_ArenaItemAddCount = "ArenaItemAddCount" # 今日已使用物品增加次数
-Def_PDict_ArenaBattleTagID = "ArenaBattleTagID" # 当前对战的对手ID
 
 #功能系统特权
 Def_PDict_FuncSysPrivilegeActTime = "FuncSysPrivilegeActTime_%s" # 系统功能特权激活时间戳,参数(系统功能ID)
@@ -4156,11 +4148,12 @@
 #武将
 Def_PDict_HeroSkin = "HeroSkin_%s" # 武将皮肤解锁状态,按皮肤索引二进制存储,参数(武将ID)
 Def_PDict_HeroBook = "HeroBook_%s" # 武将图鉴激活等级,参数(武将ID) cccbbba a-初始激活状态1-英雄激活,2-初始图鉴激活; bbb-存星级图鉴激活等级;ccc-存突破图鉴激活等级
+Def_PDict_HeroBookH = "HeroBookH_%s" # 武将图鉴历史最高等级,参数(武将ID) cccbbba: bbb-存星级图鉴最高等级;ccc-存突破图鉴最高等级
 Def_PDict_HeroAwakeRebirthCnt = "HeroAwakeRebirthCnt" # 已觉醒过的武将今日已重生次数,共享次数
 
 #主线
 Def_PDict_UnXiantaoCntExp = "UnXiantaoCntExp" # 累计未结算经验的战锤数
-Def_PDict_UnXiantaoCntEquip = "UnXiantaoCntEquip" # 累计未结算装备掉落的战锤数
+Def_PDict_UnXiantaoCntEquip = "UnXiantaoCntEquip" # 累计未结算装备掉落的战锤数,有3位小数,即 1234 实际为 1.234
 Def_PDict_UnXiantaoCntBooty = "UnXiantaoCntBooty_%s" # 累计未结算战利品掉落的战锤数,参数(itemID)
 Def_PDict_BootyDropToday = "BootyDropToday_%s" # 今日已累计掉落战利品数量,参数(itemID)
 
@@ -4279,8 +4272,8 @@
 TriggerWay_HeroTurnEnd, # 武将回合开始时    5
 TriggerWay_HeroActionStart, # 武将行动前    6
 TriggerWay_HeroActionEnd, # 武将行动后    7
-TriggerWay_CalcTagInState, # 攻击计算时对方处于xx状态时(参数:状态1|2|...)一般用于攻击时属性计算  8
-TriggerWay_AttackOverTagInState, # 攻击计算后对方处于xx状态时(参数:状态1|2|...)一般用于攻击后触发效果  9
+TriggerWay_CalcEffValue, # 统计计算效果值时  8
+TriggerWay_9, # 9
 TriggerWay_AttackOverDirect, # 直接攻击后 (非buff攻击)10
 TriggerWay_BeAttackedDirect, # 受到直接攻击时 (非buff攻击)11
 TriggerWay_ShieldBroken, # 承伤盾被击破时 12
@@ -4288,8 +4281,10 @@
 ) = range(1, 1 + 13)
 
 # 被动触发有效来源
-TriggerSrc_Skill = 1
-TriggerSrc_Buff = 2
+TriggerSrc_Skill = 1    # 身上技能有效
+TriggerSrc_Buff = 2     # 身上buff有效
+TriggerSrc_SkillSelf = 3    # 本技能有效
+TriggerSrc_BuffSelf = 4     # 本buff有效
 
 (
 TriggerType_BeSuperHit, # 被暴击触发技能 1
@@ -4888,12 +4883,6 @@
 CME_FB_RunFamily:"战盟跑环",
 }
 
-# 功能对应的事件记录类型
-FuncCMEDict = {
-               ShareDefine.GameFuncID_RunDaily:CME_FB_RunDaily,
-               ShareDefine.GameFuncID_RunFamily:CME_FB_RunFamily,
-               }
-
 # 需要发送到任务事件扩展记录的类型 ShareDefine.Def_UserAction_ExMissionLog
 CME_Ex_Log_List = [CME_Class_Horse, CME_Class_Wing, CME_Class_Official]
 
@@ -4996,8 +4985,7 @@
 Def_SkillFuncType_TurnNormaSkill,  #1 普攻技能
 Def_SkillFuncType_AngerSkill,  #2 怒气技能
 Def_SkillFuncType_PotentialSkill,  #3 潜能技能
-Def_SkillFuncType_AtkbackSkill,  #4 反击技能
-) = range(5)
+) = range(4)
 
 # MMO项目 - 先保留,重新定义从1000开始,后续可陆续删除
 (Def_SkillFuncType_Common, #0为通用技能
@@ -5045,6 +5033,16 @@
 AtkDistType_Long, # 远程
 ) = range(1, 1 + 2)
 
+# 武将特长
+HeroSpecialtyList = (
+HeroSpecialty_Stun,         # 击晕 1
+HeroSpecialty_SuperHit,     # 暴击 2
+HeroSpecialty_Combo,        # 连击 3
+HeroSpecialty_Miss,         # 闪避 4
+HeroSpecialty_Parry,        # 格挡 5
+HeroSpecialty_SuckHP,       # 吸血 6
+) = range(1, 1 + 6)
+
 # 经验倍率限制类型
 (
 ExpRateLimitType_Recover, # 资源找回

--
Gitblit v1.8.0