Project_SG_ServerCode.git

			@@ -178,7 +178,11 @@
			AttrID_ReviveXPPer, # 复活怒气加成 74
			AttrID_DOTBurnPer, # 灼烧增伤 75
			AttrID_DOTBurnPerDef, # 灼烧减伤 76
			) = range(1, 1 + 76)
			AttrID_Guanchuan, # 贯穿 77
			AttrID_GuanchuanDef, # 抗贯穿 78
			AttrID_Zhaojia, # 招架 79
			AttrID_ZhaojiaDef, # 抗招架 80
			) = range(1, 1 + 80)

			# 需要计算的武将战斗属性ID列表
			CalcBattleAttrIDList = [AttrID_Atk, AttrID_Def, AttrID_MaxHP, AttrID_StunRate, AttrID_StunRateDef,
			@@ -194,6 +198,7 @@
			AttrID_BatDamPer, AttrID_BatDamPerDef, AttrID_PursueDamPer, AttrID_PursueDamPerDef,
			AttrID_ComboDamPer, AttrID_ComboDamPerDef, AttrID_XPRecoverPer, AttrID_PVPDamPer, AttrID_PVPDamPerDef,
			AttrID_ReviveHPPer, AttrID_ReviveXPPer, AttrID_DOTBurnPer, AttrID_DOTBurnPerDef,
			AttrID_Guanchuan, AttrID_GuanchuanDef, AttrID_Zhaojia, AttrID_ZhaojiaDef,
			]

			# 基础三维属性ID列表
			@@ -934,7 +939,9 @@
			HurtAtkType_HarmSelf, # 自残 12
			HurtAtkType_CaorenProtect, # 本次伤害有受曹仁防护标记 13
			HurtAtkType_IgnoreShield, # 无视承伤盾 14
			) = range(15)
			HurtAtkType_Guanchuan, # 贯穿 15
			HurtAtkType_Zhaojia, # 招架 16
			) = range(17)

			#伤害类型
			(
			@@ -1355,7 +1362,9 @@
			SkillTagAim_MainSkillFriend, # 继承主技能友军 8
			SkillTagAim_Male, # 男性 9
			SkillTagAim_Female, # 女性 10
			) = range(11)
			SkillTagAim_MainSkillRow, # 继承主技能目标同横排 11
			SkillTagAim_MainSkillCol, # 继承主技能目标同纵排 12
			) = range(13)

			# 技能目标 - 细分
			(
			@@ -1895,9 +1904,10 @@

			Def_FBMapID_Zhanchui = 30010 # 白骨盈野/战锤秘境
			Def_FBMapID_Tianzi = 30020 # 天子考验
			Def_FBMapID_Dingjunge = 30030 # 定军阁

			#线路未过关时免费的地图
			UnPassFreeMapIDList = [Def_FBMapID_Zhanchui]
			UnPassFreeMapIDList = [Def_FBMapID_Zhanchui, Def_FBMapID_Dingjunge]
			#按星级记录过关的地图
			PassByStarMapIDList = []
			#扫荡不需要检查是否已过关的地图
			@@ -1905,7 +1915,7 @@
			#固定玩家获胜的地图
			PlayerWinMapIDList = [Def_FBMapID_Tianzi]
			#需要汇报中心副本过关进度的地图
			ReportCenterMapIDList = [Def_FBMapID_Zhanchui]
			ReportCenterMapIDList = [Def_FBMapID_Zhanchui, Def_FBMapID_Dingjunge]

			#注册上传跨服服务器数据后直接进入跨服服务器的地图
			RegisterEnter_CrossServerMapIDList = []
			@@ -1979,6 +1989,7 @@
			'Arena':[Def_FBMapID_ArenaBattle],
			'Zhanchui':[Def_FBMapID_Zhanchui],
			'Tianzi':[Def_FBMapID_Tianzi],
			'Dingjunge':[Def_FBMapID_Dingjunge],
			}

			#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
			@@ -3883,6 +3894,15 @@
			Def_PDict_TianziHisHurtEx = "TianziHisHurtEx_%s" # 历史最高伤害，整除亿部分，参数（bossID）
			Def_PDict_TianziTodayHurt = "TianziTodayHurt" # 今日最高伤害，求余亿部分
			Def_PDict_TianziTodayHurtEx = "TianziTodayHurtEx" # 今日最高伤害，整除亿部分

			#定军阁
			Def_PDict_DJGLineID = "DJGLineID" # 今日已过关的线路ID 层 * 100 + 关卡编号
			Def_PDict_DJGEffect = "DJGEff_%s" # 已生效的加成效果，参数(index) effID * 100 + 效果等级
			Def_PDict_DJGSelectEffect = "DJGSelectEff_%s" # 当前待选择的加成效果，参数(index) effID
			Def_PDict_DJGUnSelectCnt = "DJGUnSelectCnt" # 还有几个未选择的效果
			Def_PDict_DJGEffAuto = "DJGEffAuto" # 是否自动选择效果
			Def_PDict_DJGEffSet = "DJGEffSet_%s" # 预设优先选择属性ID，参数（优先index）

			#-------------------------------------------------------------------------------

			#物品效果(ID或指定类型)对应的属性计算信息 {效果（ID/指定类型）:[[属性索引, ...], 是否基础属性，(非)线性]}
			@@ -4058,6 +4078,7 @@
			TriggerSrc_BuffSelf = 4 # 本buff有效

			# 被动效果ID，属性类的直接使用属性ID当做效果ID
			PassiveEff_EnergySkill = 5500 # 触发释放技能（按累计能量达到时释放）
			PassiveEff_AddBuffLayerByWeight = 6001 # 根据权重随机添加buff层数数值1-[[权重,层级], ...]
			PassiveEff_ChangeHurtType = 6002 # 变更本次伤害类型（可验证目标状态）
			PassiveEff_ChangeHurtMulti = 6003 # 变更伤害倍值（可增可减）
			@@ -4066,7 +4087,7 @@
			PassiveEff_AddSkillPerByJob = 6006 # 增加本次技能万分比（验证目标职业）
			PassiveEff_AddSkillTagCnt = 6007 # 增加技能目标数
			PassiveEff_ImmuneControlBuff = 6008 # 生命值低于x%时免疫控制效果
			PassiveEff_MustSuperHit = 6009 # 生命值低于x%时必定暴击
			PassiveEff_MustSuperHit = 6009 # 必定暴击
			PassiveEff_AddSkillPerByHP = 6010 # 增加本次技能万分比（验证当前生命）
			PassiveEff_AddSkillPerByBuffLayer = 6011 # 增加本次技能万分比（根据buff层级）
			PassiveEff_AddBuffLayerMax = 6012 # 添加buff层级上限: 数值1-增加层级上限
			@@ -4093,6 +4114,8 @@
			PassiveEff_ImmuneBadBuff = 6033 # 概率免疫buff类型（免疫添加，针对减益、控制、dot类）
			PassiveEff_IgnoreSex = 6034 # 去除性别验证
			PassiveEff_AddBuffTime = 6035 # 增加buff持续时间
			PassiveEff_AddSkillUseCntLimit = 6036 # 增加7009回合数
			PassiveEff_AddDamBackPerByBuffLayer = 6037 # 增加反弹伤害万分比（根据buff层级）

			# 被动效果ID有触发值时就返回的
			PassiveEffHappenValueList = [PassiveEff_ChangeHurtType, PassiveEff_ImmuneControlBuff, PassiveEff_MustSuperHit, PassiveEff_SkillInvalid,