SnxxServerCode.git

			@@ -770,7 +770,8 @@
			Def_HurtType_Miss, # 闪避 9
			Def_HurtType_Immune, # 免疫 10
			Def_HurtType_RealmSupress, # 境界压制 11
			) = range(1, 12)
			Def_HurtType_Zhansha, # նɱ 12
			) = range(1, 13)
			#Def_HurtType_SuckBlood, # 吸血

			(
			@@ -1789,6 +1790,12 @@
			Def_FBMapID_GatherSoul = 31340
			#跨服竞技场
			Def_FBMapID_CrossRealmPK = 32010
			#跨服蓬莱仙境
			Def_FBMapID_CrossPenglai = 32020

			#注册上传跨服服务器数据后直接进入跨服服务器的地图
			RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai]

			#副本关闭时未拾取的物品邮件发放给玩家
			#这里只有需要的副本才配置，不做默认逻辑，防止某些副本实际不能给导致刷物品，如麒麟之府
			Def_SendUnPickItemMailMapIDList = [Def_FBMapID_IceLode, Def_FBMapID_PersonalBoss, Def_FBMapID_MunekadoTrial,
			@@ -1877,6 +1884,7 @@
			'XMZZ':[Def_FBMapID_XMZZ], #仙魔之争
			'Dogz':[Def_FBMapID_Dogz], #神兽副本
			'CrossRealmPK':[Def_FBMapID_CrossRealmPK], #跨服竞技场
			'CrossPenglai':[Def_FBMapID_CrossPenglai], #跨服蓬莱仙境
			'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
			}

			@@ -2382,7 +2390,13 @@
			Type_Equip_CanTake = ShareDefine.RoleEquipType

			#装备物品位置,不需要重刷属性
			EquipItemNoRefreshState = []
			EquipItemNoRefreshState = [
			ShareDefine.retHorse, #19 坐骑
			ShareDefine.retWing, #11 翅膀
			ShareDefine.retWeaponSkin, #20 时装武器
			ShareDefine.retClothesSkin, #21 时装衣服
			ShareDefine.retWeapon2Skin, #22 时装副手
			]

			# 需要广播外观的装备部位
			Def_SyncEquipStateByIndex = [
			@@ -3209,6 +3223,7 @@
			Def_PlayerKey_CalcAddAttrType = "CalcAType_%s_%s_%s" # 刷属性类型, 参数[funcIndex, attrIndex, 缓存编号]
			Def_PlayerKey_CalcAddAttrValue = "CalcAValue_%s_%s_%s" # 刷属性值, 参数[funcIndex, attrIndex, 缓存编号]

			Def_PlayerKey_CrossRegisterType = "CrossRegisterType" #跨服注册活动类型
			Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching" #是否跨服匹配中

			Def_PDict_QueryTechLVUPState = "QueryTechLVUPState" # 查询科技等级提升状态
			@@ -3390,8 +3405,6 @@
			Def_Player_Dict_HasVIPClubNote = 'HasVIPClubNote_186' # 是否提示过vip升级可加入贵宾俱乐部信息
			Def_Player_Dict_PyPlayerAction = 'PyPlayerAction_187' # py自定义玩家状态
			Def_Player_Dict_FamilyLV = 'FamilyLV_189' # 玩家帮会等级
			Def_Player_Dict_MergeWarRegisterTime = 'MergeWarRegisterTime_190' # 上传数据至万国服务器cd
			Def_Player_Dict_MergeRegisterTime = 'MergeRegisterTime%s_194' # 活动的上传数据时间
			Def_Player_UpdatePlayerNameCnt = "UpdatePlayerNameCnt_196" # 角色改名次数
			Def_Player_Dict_UpdatePlayerNameItemIndex = "UpdatePlayerNameItemIndex_198" # 改名物品在背包的位置
			Def_Player_Dict_UpdatePlayerName = "UpdatePlayerName_199" # 改名锁
			@@ -3539,9 +3552,9 @@
			Def_PDict_GodWeaponExp = "GodWeaponExp_%s" # 神器等级对应祝福值经验, 参数神器索引
			Def_PDict_GodWeaponState = "GodWeaponState" # 神器是否已经激活, 按索引位存储神器是否激活

			Def_PDict_ClothesSkinOpenState = "ClothesSkinOpenState" # 时装皮肤激活状态
			Def_PDict_ClothesSkinLV = "ClothesSkinLV_%s" # 时装皮肤等级,参数时装索引
			Def_PDict_ClothesSkinCurBless = "ClothesSkinCurBless_%s" # 时装皮肤祝福值,参数时装索引
			Def_PDict_ClothesChestLV = "ClothesChestLV" # 时装柜等级
			Def_PDict_ClothesChestEXP = "ClothesChestEXP" # 时装柜经验

			Def_PDict_CostVIPExp = "CostVIPExp" # 消费VIP经验
			Def_PDict_CostVIPLVReward = "CostVIPLVReward" # 消费VIP等级奖励
			@@ -4320,8 +4333,9 @@
			Def_CalcAttrFunc_DogzEquip, # 神兽装备37
			Def_CalcAttrFunc_DogzEquipPlus, # 神兽装备强化38
			Def_CalcAttrFunc_GatherSoul, # 聚魂39
			Def_CalcAttrFunc_MagicWeapon4 # 王者法宝40
			) = range(41)
			Def_CalcAttrFunc_MagicWeapon4, # 王者法宝40
			Def_CalcAttrFunc_Coat, # ʱװ41
			) = range(42)


			# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
			@@ -4362,6 +4376,7 @@
			ShareDefine.Def_MFPType_StoveYao:[Def_CalcAttrFunc_StoveYao],
			ShareDefine.Def_MFPType_MagicWeaponSoul:[Def_CalcAttrFunc_MagicWeaponSoul],
			ShareDefine.Def_MFPType_GatherSoul:[Def_CalcAttrFunc_GatherSoul],
			ShareDefine.Def_MFPType_Coat:[Def_CalcAttrFunc_Coat],
			# 神兽战力同装备模块战力一致，受评分影响，装备评分相关的战力另外算
			ShareDefine.Def_MFPType_Dogz:[Def_CalcAttrFunc_Dogz, Def_CalcAttrFunc_DogzEquipPlus],
			ShareDefine.Def_MFPType_Other:[Def_CalcAttrFunc_Success, Def_CalcAttrFunc_FamilyTech, Def_CalcAttrFunc_EquipDecompose],
			@@ -4677,9 +4692,9 @@
			Def_GiveMoney_StallItem, # 摆摊
			Def_GiveMoney_Trade, # 交易
			Def_GiveMoney_Truck, # 运镖
			Def_GiveMoney_FreeGoods, # 极品白拿 25
			Def_GiveMoney_BindJadeWheel, # 绑玉转盘
			Def_GiveMoney_GatherSoulDecompose, #聚魂分解
			Def_GiveMoney_FreeGoods, # 极品白拿
			Def_GiveMoney_BindJadeWheel, # 绑玉转盘 25
			Def_GiveMoney_GatherSoulDecompose, #聚魂分解 26
			) = range(1000, 1000 + 27)

			Def_Give_Reason_SonKey = "reason_name_son" # 原因子类说明key
			@@ -4803,7 +4818,8 @@
			ItemDel_DogzEquipPlus, # 神兽装备强化
			ItemDel_ChatBubbleBox, # 激活聊天气泡框
			ItemDel_GatherSoul, # 聚魂分解
			) = range(2000, 2000 + 36)
			ItemDel_CoatDecompose, # 时装分解
			) = range(2000, 2000 + 37)

			# 物品扣除类型对应信息 {类型:eventName, ...}
			ItemDelTypeDict = {
			@@ -4841,6 +4857,9 @@
			ItemDel_AddFBCnt:"AddFBCnt",
			ItemDel_AddKillBossCnt:"AddKillBossCnt",
			ItemDel_DogzEquipPlus:"DogzEquipPlus",
			ItemDel_ChatBubbleBox:"ChatBubbleBox",
			ItemDel_GatherSoul:"GatherSoul",
			ItemDel_CoatDecompose:"CoatDecompose",
			}

			##==================================================================================================