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列表
			@@ -231,7 +236,8 @@
			Def_CalcAttr_HJG, # 幻境阁 5
			Def_CalcAttr_Horse, # 坐骑 6
			Def_CalcAttr_Beauty, # 红颜 7
			) = range(8)
			Def_CalcAttr_Dingjunge, # 定军阁 8
			) = range(9)

			CalcAttrName = {
			Def_CalcAttr_LV:"主公等级",
			@@ -242,6 +248,7 @@
			Def_CalcAttr_HJG:"幻境阁",
			Def_CalcAttr_Horse:"坐骑",
			Def_CalcAttr_Beauty:"红颜",
			Def_CalcAttr_Dingjunge:"定军阁",
			}

			##-----------------------------------------------------------------------------------------------
			@@ -460,42 +467,9 @@

			#---------------------------------------------------------------------------
			Def_ItemCount_Max = 2000000000 # 物品最大叠加上限
			#写死的物品ID都放这边
			Def_ItemID_PetSoul = -1 #宠物满魂
			Def_ItemID_PetDoubleExp = -1 #宠物双倍
			Def_ItemID_CompoundJiePo = -1 #合成材料附加物品: 结魄
			Def_ItemID_FineSoulGadget = -1 #精魄合成保护符ID
			Def_ItemID_LongSaleItem = -1 #远程贩售道具ID
			Def_ItemID_ArchangelWeapon = 4004 # 大天使的武器
			Def_ItemID_PetData = 4171 # 宠物数据物品ID
			Def_ItemID_RealmSit = 4504 #境界打坐消耗物品ID
			Def_ItemID_VIPExperience = 985 # VIP体验卡

			# 直接转换为对应数值的物品ID列表
			Def_ItemID_GoldMoney = 1 # 直接给仙玉/元宝
			Def_ItemID_SilverMoney = 22 # 直接给铜钱
			Def_ItemID_SP = 29 # 直接给sp
			Def_ItemID_GoldPaper = 30 # 直接给绑玉/灵石
			Def_ItemID_RealmPoint = 24 # 直接给修行点
			Def_ItemID_BossReborn = 21 # 直接给boss复活点
			Def_ItemID_Ysog = 4306 # 直接给符印融合石
			Def_ItemID_SoulDust = 700 # 直接给魂尘
			Def_ItemID_SoulSplinters = 701 # 直接给聚魂碎片
			Def_ItemID_SoulCore = 702 # 直接给核心环
			Def_ItemID_Honor = 2141 # 直接给荣誉
			Def_ItemID_FuncSysPrivilege = 894 # 直接给功能特权令
			Def_ItemID_FCPartyPoint = 718 # 直接给仙界盛典嗨点
			Def_ItemID_BTGMPoint = 450 # 直接给GM令
			Def_ItemID_GuShenMoney = 520 # 直接给古神币
			Def_ItemID_GongdePoint = 530 # 直接给功德点
			Def_ItemID_FamilyFlagWarPoint = 540 # 直接给万界积分
			Def_ItemID_TongTianPoint = 720 # 直接给通天令经验点
			Def_TransformItemIDList = [Def_ItemID_SP, Def_ItemID_GoldPaper,
			Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog,
			Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor, Def_ItemID_GoldMoney,
			Def_ItemID_FuncSysPrivilege, Def_ItemID_FCPartyPoint, Def_ItemID_BTGMPoint, Def_ItemID_GuShenMoney,
			Def_ItemID_GongdePoint, Def_ItemID_TongTianPoint,
			Def_ItemID_FamilyFlagWarPoint]
			Def_TransformItemIDList = []
			#---------------------------------------------------------------------
			#写死的物品类型都放这边
			Def_ItemType_All = -1 #所有类型
			@@ -630,41 +604,22 @@

			#---------------------------------------------------------------------
			#写死的物品效果ID都放这边------请按数值顺序存放
			Def_Effect_GivePlayerMoneySilver = 201 #给人物金钱铜钱道具效果ID
			Def_Effect_GivePlayerMoneyGift = 202 #给人物金钱绑定仙玉道具效果ID
			Def_Effect_GivePlayerMoneyGold = 203 #给人物金钱仙玉道具效果ID
			Def_Effect_AddDienstgrad = 204 #使用物品获得称号
			#205 #使用道具给予真气
			Def_Effect_ItemGiveFamilyContribution = 209 #使用道具给予仙盟贡献
			Def_Effect_ItemAddExp = 213 #给经验道具
			Def_Effect_ItemAddLV = 214 #直接升级道具
			Def_Effect_ItemAddExpByLV = 215 #给经验道具 XX级前，所加经验随等级增加而增加，XX级后按XX级算
			Def_Effect_AppointItem = 220 #定制物品
			Def_Effect_EquipStone = 225 #镶嵌宝石效果；A值-宝石镶嵌类型，B值-宝石等级，C值-下一级宝石ID
			Def_Effect_Reborn = 227 #复活物品(还阳咒)效果ID
			Def_Effect_PrizeCoin = 228 #奖励充值点券; A值点券；B值奖励点券
			#229 #增加VIP经验；A值经验点
			#230 #重置boss击杀疲劳；A值重置的boss疲劳类型
			Def_Effect_GivePlayerSilverPaper = 1915 #给人物金钱银票（恶魔精华）道具效果ID
			Def_Effect_ItemSpeak = 2700 #小喇叭效果ID
			#Def_Effect_CleanGuilt = 2812 # 洗红名
			Def_Effect_ResetAttrPoint = 231 # 洗点
			Def_Effect_AddFBCnt = 233 # 增加副本可进入次数，A值副本ID，B值是否自动使用
			#234 # 增加BOSS可击杀次数
			Def_Effect_DogzEquipPlusExp = 235 # 神兽强化材料经验效果，A值基础经验，B值双倍强化消耗仙玉
			#236 # 增加法宝升星经验 A值法宝ID B值X经验
			Def_Effect_ChatBubbleBox = 237 # 激活聊天气泡框，A值气泡框ID
			Def_Effect_ItemGiveRealmPoint = 238 #使用道具给予修行点
			Def_Effect_ItemGiveSoulDust = 239 # 使用道具给予魂尘
			Def_Effect_ItemGiveSoulSplinters = 240 # 使用道具给予聚魂碎片
			Def_Effect_ItemGiveSoulCore = 241 #使用道具给予核心环
			Def_Effect_ItemGiveHonor = 242 #使用道具给予荣誉
			Def_Effect_ItemGiveWeekPartyPoint = 245 #使用道具给予七日巡礼积分
			Def_Effect_ItemGiveWeekPartyPoint1 = 246 #使用道具给予节日巡礼积分
			#251 #增加聚灵效率
			#252 #触发任务
			#253 #骑宠觉醒值
			Def_Effect_ItemGiveTreasureScore = 254 #使用道具给予寻宝积分
			#256 #VIP等级直升卡直接升到VIPx级，只加经验，享受VIP特权效果值A： vip等级效果值B：领取是否默认直接使用
			#257 #增加竞技场挑战次数，A值为增加次数
			Def_Effect_ItemGiveMoney = 264 #通用给货币道具，A值数量，B值货币类型
			@@ -684,12 +639,7 @@
			#放入背包自动使用的物品效果ID
			AutoUseItemEffectIDList = [Def_Effect_ItemCount, Def_Effect_AddActivity]

			#----以下未使用或代码依然存在的---
			Def_Effect_ItemGiveRuneJH = 1925 #使用道具给予符印精华
			Def_Effect_ItemGiveRuneSplinters = 1926 #使用道具给予符印碎片
			#---------------------------------------------------------------------
			Def_Max_Update_Talent_Time = 3 #最大使用造化丹次数

			#写死的物品效果都放这边

			#立刻恢复%d的HP(单次恢复)
			@@ -934,7 +884,9 @@
			HurtAtkType_HarmSelf, # 自残 12
			HurtAtkType_CaorenProtect, # 本次伤害有受曹仁防护标记 13
			HurtAtkType_IgnoreShield, # 无视承伤盾 14
			) = range(15)
			HurtAtkType_Guanchuan, # 贯穿 15
			HurtAtkType_Zhaojia, # 招架 16
			) = range(17)

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

			# 技能目标 - 细分
			(
			@@ -1895,9 +1849,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 +1860,11 @@
			#固定玩家获胜的地图
			PlayerWinMapIDList = [Def_FBMapID_Tianzi]
			#需要汇报中心副本过关进度的地图
			ReportCenterMapIDList = [Def_FBMapID_Zhanchui]
			ReportCenterMapIDList = [Def_FBMapID_Zhanchui, Def_FBMapID_Dingjunge]
			#需要阵容战斗属性单独专用的地图 - 一般是有地图专有属性的，仅该功能战斗有效，用的是专项的主线阵容，战力独立计算，不影响通用主线阵容战力
			ExclusiveBatAttrMapIDList = [Def_FBMapID_Dingjunge]
			#地图专用阵容，注：这里只针对非主动进攻时使用的阵容，不一定是防守，如系统PK的双方阵容也可以
			MapLineIDDict = {Def_FBMapID_ArenaBattle:ShareDefine.Lineup_ArenaDef}

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

			#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
			@@ -2042,14 +2002,6 @@
			Map_FBDict_PrevFBTimeType = "Map_FBDict_PrevFBTimeType" # 上一个副本时间类型
			#因GetPropertyID值会受副本类型影响，如组队副本，故自定义副本自己的属性标识字典
			Map_FBDict_PropertyMark = "Map_FBDict_PropertyMark" # 副本属性标识

			#---战场区域福利---
			Map_FBDict_LastAreaRewardTick = "LastAreaRewardTick" # 副本上次战场区域福利刷新时间
			Map_Player_AreaReward_GetExp = "AreaAward_Exp%s" # 玩家战场区域福利-获得经验
			Map_Player_AreaReward_GetExpPoint = "AreaAward_ExpPoint%s" # 玩家战场区域福利-累计获得经验点
			Map_Player_AreaReward_GetZhenQiTotal = "AreaAward_SP%s" # 玩家战场区域福利-累计获得真气
			Map_Player_AreaReward_GetTechPoint = "AreaAward_TechPoint%s" # 玩家战场区域福利-累计获得科技点
			Map_Player_AreaReward_GetCnt = "AreaAward_GetCnt%s" # 玩家战场区域福利-累计获得次数

			#---地图NPC---
			Map_NPC_ActBossLastRebornSign = 'ActBossRebornSign_%s' # 活动boss上次复活标记，参数为刷新标识点
			@@ -3883,6 +3835,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 +4019,7 @@
			TriggerSrc_BuffSelf = 4 # 本buff有效

			# 被动效果ID，属性类的直接使用属性ID当做效果ID
			PassiveEff_EnergySkill = 5500 # 触发释放技能（按累计能量达到时释放）
			PassiveEff_AddBuffLayerByWeight = 6001 # 根据权重随机添加buff层数数值1-[[权重,层级], ...]
			PassiveEff_ChangeHurtType = 6002 # 变更本次伤害类型（可验证目标状态）
			PassiveEff_ChangeHurtMulti = 6003 # 变更伤害倍值（可增可减）
			@@ -4066,7 +4028,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 +4055,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,