SnxxServerCode.git

			@@ -43,7 +43,12 @@

			GameWorld.ImportAll("Script\\Skill\\", "PassiveBuff")


			# 被动关联的技能模块
			# 获得关联技能,0 全部 1是主动型技能（法宝，普攻） 2 为人族法宝技能 3为普攻其他技能ID
			Def_ConnSkill_Template = {
			ChConfig.Def_SkillFuncType_FbSkill:[1,2],
			ChConfig.Def_SkillFuncType_NormalAttack:[1,3],
			}

			# --------被动功法设置--------------------------------------------------------------------

			@@ -284,6 +289,8 @@

			4000:ChConfig.TriggerType_BuffState, # 进入4012的某个状态触发技能 2
			4001:ChConfig.TriggerType_TagBuffState, # 目标进入4012的某个状态触发技能 2
			4002:ChConfig.TriggerType_SkillValue, # 增加技能伤害固定值 82
			4003:ChConfig.TriggerType_AttackOver, # 攻击（对敌技能）后被动技能被触发 4
			4004:ChConfig.TriggerType_AttackOver, # 攻击（对敌技能）后被动技能被触发 4
			4005:ChConfig.TriggerType_AttackAddSkillPer, # 所有攻击伤害(SkillPer)增加，含普攻，计算时 5
			4006:ChConfig.TriggerType_SuperHit, # 暴击时触发技能6,
			@@ -352,6 +359,8 @@
			4071:ChConfig.TriggerType_Buff_SuckBloodPer, # 攻击百分比吸血
			4072:ChConfig.TriggerType_SuperHitSkipCD, # 暴击无冷却 68
			4073:ChConfig.TriggerType_BuffHurtCnt, # 当持续buff伤害第X次时触发技能 69
			4074:ChConfig.TriggerType_AttackAddSkillPer, # 所有攻击伤害(SkillPer)增加，含普攻，计算时 5
			4075:ChConfig.TriggerType_AddThumpHitPer, # 增加重击伤害百分比
			4076:ChConfig.TriggerType_dFinalHurtReducePer, # 防守方的最终伤害减少百分比 71
			4077:ChConfig.TriggerType_AttackAddFinalPer, # 增加最终伤害百分比 59
			4078:ChConfig.TriggerType_AttackOver, # 攻击（对敌技能）后被动技能被触发 4
			@@ -362,10 +371,10 @@
			4083:ChConfig.TriggerType_AddThumpHitPer, # 增加重击伤害百分比
			4084:ChConfig.TriggerType_ThumpHit, # 对第一目标重击触发技能
			4085:ChConfig.TriggerType_SkillSuccess, # 任何技能释放成功都可触发 76 加印记
			4086:ChConfig.TriggerType_AttackAddSkillPer, # 所有攻击伤害(SkillPer)增加，含普攻，计算时 5
			4087:ChConfig.TriggerType_AttackAddSkillPer, # 所有攻击伤害(SkillPer)增加，含普攻，计算时 5
			4088:ChConfig.TriggerType_AttackAddSkillPer, # 所有攻击伤害(SkillPer)增加，含普攻，计算时 5
			4089:ChConfig.TriggerType_AttackAddSkillPer, # 所有攻击伤害(SkillPer)增加，含普攻，计算时 5
			4086:ChConfig.TriggerType_AttackAddSkillPerYinji, # 所有攻击伤害(SkillPer)增加，含普攻，计算时为了飘字使用
			4087:ChConfig.TriggerType_AttackAddSkillPerYinji, # 所有攻击伤害(SkillPer)增加，含普攻，计算时为了飘字使用
			4088:ChConfig.TriggerType_AttackAddSkillPerYinji, # 所有攻击伤害(SkillPer)增加，含普攻，计算时为了飘字使用
			4089:ChConfig.TriggerType_AttackAddSkillPerYinji, # 所有攻击伤害(SkillPer)增加，含普攻，计算时为了飘字使用
			4090:ChConfig.TriggerType_AttackOver, # 攻击（对敌技能）后被动技能被触发 4
			4091:ChConfig.TriggerType_SkillOverNoAttack, # 技能释放后与TriggerType_AttackOver相反19,
			4092:ChConfig.TriggerType_SkillSuccess, # 任何技能释放成功都可触发 76 减印记
			@@ -378,6 +387,10 @@
			4099:ChConfig.TriggerType_WillDead, # 进入濒死状态时触发技能 25
			4100:ChConfig.TriggerType_AttackOver, # 攻击（对敌技能）后被动技能被触发 4
			4101:ChConfig.TriggerType_AttackAddSkillPer, # 所有攻击伤害(SkillPer)增加，含普攻，计算时 5
			4102:ChConfig.TriggerType_SkillValue, # 增加技能伤害固定值 82
			4103:ChConfig.TriggerType_Buff_SuckBloodPer, # 攻击百分比吸血
			4104:ChConfig.TriggerType_HitSuccess, # 命中成功率 83
			4106:ChConfig.TriggerType_AddHP, # 回血 84
			}
			return tdict.get(effectID, -1)
			#===========================================================================
			@@ -400,6 +413,7 @@
			4502:ChConfig.TriggerType_BeAttackOver, # BUFF类：被攻击触发技能
			4503:ChConfig.TriggerType_AttackOver, # BUFF类：攻击触发新技能
			4504:ChConfig.TriggerType_BounceHP, # BUFF类：反弹伤害固定值
			4505:ChConfig.TriggerType_AttackAddSkillPer, # BUFF类：提高主动技能的技能伤害
			4506:ChConfig.TriggerType_BeAttackOver, # BUFF类：被攻击触发技能只刷新属性不触发技能
			4507:ChConfig.TriggerType_Buff_AddSuperHitRate, # BUFF类:增加暴击率
			4508:ChConfig.TriggerType_Buff_AttackSubLayer, # BUFF类：攻击减buff层，0消失
			@@ -430,6 +444,10 @@
			4533:ChConfig.TriggerType_BurnDisappear, # 灼烧消失触发 81
			4534:ChConfig.TriggerType_DebuffOff, # BUFF类：抵消debuff
			4535:ChConfig.TriggerType_BeAttackAddSkillPer, # buff中，被攻击提高技能伤害
			4536:ChConfig.TriggerType_AddBuffOver,
			4537:ChConfig.TriggerType_BurnPer, # 灼烧伤害百分比 80
			4538:ChConfig.TriggerType_SkillValue, # 增加技能伤害固定值 82
			4539:ChConfig.TriggerType_SkillValue, # 增加技能伤害固定值 82

			803:ChConfig.TriggerType_BloodShield, # 血盾
			806:ChConfig.TriggerType_BloodShield, # 血盾
			@@ -694,12 +712,14 @@
			skillList.extend(self.AffectSuperEquipSkillDict.get((triggerType, connSkillID), []))

			# 指定特殊类型可触发
			# 获得关联技能,0 全部 1是主动型技能（法宝，普攻） 2 为人族法宝技能 3为普攻其他技能ID
			if connSkill and connSkill.GetFuncType() in [ChConfig.Def_SkillFuncType_FbSkill, ChConfig.Def_SkillFuncType_NormalAttack]:
			funcType = 1
			skillList.extend(self.AffectSkillDict.get((triggerType, funcType), []))
			skillList.extend(self.AffectPassiveSkillSetDict.get((triggerType, funcType), []))
			skillList.extend(self.AffectDogzSkillDict.get((triggerType, funcType), []))
			skillList.extend(self.AffectSuperEquipSkillDict.get((triggerType, funcType), []))
			funcTypeList = Def_ConnSkill_Template.get(connSkill.GetFuncType(), [])
			for funcType in funcTypeList:
			skillList.extend(self.AffectSkillDict.get((triggerType, funcType), []))
			skillList.extend(self.AffectPassiveSkillSetDict.get((triggerType, funcType), []))
			skillList.extend(self.AffectDogzSkillDict.get((triggerType, funcType), []))
			skillList.extend(self.AffectSuperEquipSkillDict.get((triggerType, funcType), []))

			# 被动再触发被动限制为指定
			if connSkill and SkillCommon.isPassiveSkill(connSkill):