SnxxServerCode.git

			@@ -359,6 +359,20 @@
			Def_ItemType_DogzEquipScute = 123 # 神兽鳞甲
			Def_ItemType_AddCrossRealmPKCnt = 127 #增加跨服PK次数

			Def_ItemType_ZXCloak = 128 # 诛仙披风
			Def_ItemType_ZXMask = 129 # 诛仙面具
			Def_ItemType_ZXGlove = 130 # 诛仙手套
			Def_ItemType_ZXRuyi = 131 # 诛仙如意
			Def_ItemType_ZXPendant = 132 # 诛仙吊坠
			Def_ItemType_ZXRing = 133 # 诛仙戒指
			Def_ItemType_ZXWeapon1 = 134 # 诛仙剑1
			Def_ItemType_ZXWeapon2 = 135 # 诛仙剑2
			Def_ItemType_ZXWeapon3 = 136 # 诛仙剑3
			Def_ItemType_ZXWeapon4 = 137 # 诛仙剑4
			Def_ItemType_ZhuXianStuff = 138 # 诛仙材料

			Def_ItemType_DogzStuff = 139 # 神兽材料

			#以下定义物品类型下次删除
			Def_Item_Type_Horse = 1000036 #坐骑

			@@ -368,22 +382,16 @@
			ShareDefine.rptGatherSoul:'GatherSoulPackCount',
			}

			#虚拟背包可以放入的物品字典
			Def_PackItemTypeList_Dict = {
			ShareDefine.rptRune:[Def_ItemType_Rune, Def_ItemType_RuneExp],
			ShareDefine.rptDogzItem:[Def_ItemType_DogzEquipExp, Def_ItemType_DogzEquipHorn, Def_ItemType_DogzEquipEye,
			Def_ItemType_DogzEquipTooth, Def_ItemType_DogzEquipClaw, Def_ItemType_DogzEquipScute],
			ShareDefine.rptGatherSoul:[Def_ItemType_GatherSoulExp, Def_ItemType_GatherSoul, Def_ItemType_GatherSoulCore],
			}

			def GetItemPackType(itemType, defaultPack=IPY_GameWorld.rptItem):
			## 获取物品类型对应存放的默认背包类型
			if defaultPack in [ShareDefine.rptTreasure, ShareDefine.rptTempItem]:
			#寻宝背包、临时背包不做处理
			return defaultPack
			import IpyGameDataPY
			Def_PackItemTypeList_Dict = IpyGameDataPY.GetFuncEvalCfg("PutInItemPack", 1, {})
			for pack, itemTypeList in Def_PackItemTypeList_Dict.items():
			if itemType in itemTypeList:
			return pack
			return int(pack)
			return defaultPack

			# 部位对应装备类型列表
			@@ -788,13 +796,16 @@

			Def_EquipItemType_TJGAutoEat = xrange(Def_ItemType_retWeapon, Def_ItemType_retShoes + 1)
			#装备类型
			Def_EquipItemType = xrange(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1)
			Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1) + range(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)

			#武器类型
			Def_WeaponItemType = [Def_ItemType_retWeapon, Def_ItemType_retWeapon2]

			#神兽装备类型
			Def_DogzEquiipType = xrange(Def_ItemType_DogzEquipHorn, Def_ItemType_DogzEquipScute + 1)

			#诛仙装备类型
			Def_ZhuXianEquiipType = xrange(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)

			# 技能造成实质性伤害的类型
			Def_RealAttack_Type = [Def_HurtType_Normal, # 普通伤害 1
			@@ -854,6 +865,10 @@
			Def_PackCnt_DogzItem = 100
			#初始化神兽装备格子数
			Def_PackCnt_DogzEquip = 100
			#初始化诛仙背包格子数
			Def_PackCnt_ZhuXianItem = 100
			#初始化诛仙装备格子数
			Def_PackCnt_ZhuXianEquip = 12
			#初始化装备栏2
			Def_PackCnt_Equip2 = 0
			#初始化回收站
			@@ -1097,6 +1112,8 @@
			ShareDefine.rptPet,
			ShareDefine.rptDogzItem,
			ShareDefine.rptDogzEquip,
			ShareDefine.rptZhuXianItem,
			ShareDefine.rptZhuXianEquip,
			]

			#装备可强化背包列表
			@@ -1462,7 +1479,7 @@
			#自动恢复计算间隔
			Def_HPRestoreInterval = 5000
			#允许重置的背包索引
			Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure]
			Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure, ShareDefine.rptZhuXianItem]
			#仓库分页个数
			Def_ItemReset_WarehousePageCnt = 56
			#玩家捡起物品的距离 8
			@@ -1788,6 +1805,8 @@
			Def_FBMapID_SealDemonEx = 52020
			#诛仙BOSS
			Def_FBMapID_ZhuXianBoss = 31380
			#诛仙塔
			Def_FBMapID_ZhuXianTower = 31370
			#仙魔之争
			Def_FBMapID_XMZZ = 31010
			#神兽副本
			@@ -1897,6 +1916,7 @@
			'CrossRealmPK':[Def_FBMapID_CrossRealmPK], #跨服竞技场
			'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
			'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
			'ZhuXianTower':[Def_FBMapID_ZhuXianTower],#诛仙塔
			}

			#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
			@@ -3298,6 +3318,8 @@

			# 玩家字典key定义规则, key的长度不能超过29个字节, 注意尽量避免命名重复
			# 新增参数TYPE 用于字典分类，默认0
			Def_QuDao_DoubleBillGold = "qddbGold" # 渠道返利的仙玉
			Def_QuDao_DoubleBillCount = "qddbCount" # 渠道返利的仙玉领取次数日期+次数组合数字
			Def_PDict_GeTuiSet = "GetuiSet" # 推送提醒的设置
			Def_PDict_NoGeTuiTime = "NoGetuiTime" # 推送提醒免打扰时间，将字符串组合数字
			Def_PlayerKey_TJGNPC = "TJGNPC" # 脱机挂机NPC点
			@@ -3623,7 +3645,8 @@
			#试炼之塔
			Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV" # 试炼之塔通关层数
			Def_Player_Dict_TrialTower_LastDayPassLV = "Tower_LastDayPassLV" # 试炼之塔昨日通关层数

			#诛仙塔
			Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV" # 诛仙塔通关层数
			#古神禁地
			Def_Player_Dict_GodArea_Anger = "GodArea_Anger" # 古神禁地怒气值
			Def_Player_Dict_GodArea_LastAddAngerTime = "GodArea_LastAddAngerTime" # 古神禁地上一次增加怒气值的时间
			@@ -3690,6 +3713,15 @@
			Def_PDict_FCPartyCurPoint = "FCPartyCurPoint" #全民来嗨活动当前总点数
			Def_PDict_FCPartyAwardRecord = "FCPartyAwardRecord" #全民来嗨活动领奖记录
			Def_PDict_FCCostGold = "FCCostGold" # 绝版降临总累计消费仙玉

			#新仙界盛典
			Def_PDict_NewFairyCeremonyID = "NewFairyCeremonyID" # 玩家身上的仙界盛典活动ID，唯一标识，取活动开始日期time值
			Def_PDict_NewFCActionWorldLV = "NewFCActionWorldLV" #玩家身上的仙界盛典时的世界等级
			Def_PDict_NewFCRechargeState = "NewFCRechargeState" # 充值大礼状态 0-不可领 1-可领 2-已领取
			Def_PDict_NewFCPartyCurCnt = "NewFCPartyCurCnt_%s" #全民来嗨活动当前完成次数参数活动ID
			Def_PDict_NewFCPartyCurPoint = "NewFCPartyCurPoint" #全民来嗨活动当前总点数
			Def_PDict_NewFCPartyAwardRecord = "NewFCPartyAwardRecord" #全民来嗨活动领奖记录
			Def_PDict_NewFCCostGold = "NewFCCostGold" # 绝版降临总累计消费仙玉

			#绑玉转盘
			Def_PDict_BindJadeWheelCurCnt = "BindJadeWheelCurCnt" # 今日已转次数
			@@ -4180,6 +4212,12 @@
			AttrName_SuperHit:[[TYPE_Calc_SuperHit], False, TYPE_Linear],
			AttrName_NPCHurtAddPer:[[TYPE_Calc_NPCHurtAddPer], False, TYPE_Linear],
			ShareDefine.Def_Effect_NPCHurtAddPer:[[TYPE_Calc_NPCHurtAddPer], False, TYPE_Linear],
			ShareDefine.Def_Effect_JobAHurtAddPer:[[TYPE_Calc_JobAHurtAddPer], False, TYPE_Linear],
			ShareDefine.Def_Effect_JobBHurtAddPer:[[TYPE_Calc_JobBHurtAddPer], False, TYPE_Linear],
			ShareDefine.Def_Effect_JobCHurtAddPer:[[TYPE_Calc_JobCHurtAddPer], False, TYPE_Linear],
			ShareDefine.Def_Effect_JobAAtkReducePer:[[TYPE_Calc_JobAAtkReducePer], False, TYPE_Linear],
			ShareDefine.Def_Effect_JobBAtkReducePer:[[TYPE_Calc_JobBAtkReducePer], False, TYPE_Linear],
			ShareDefine.Def_Effect_JobCAtkReducePer:[[TYPE_Calc_JobCAtkReducePer], False, TYPE_Linear],
			AttrName_JobAHurtAddPer:[[TYPE_Calc_JobAHurtAddPer], False, TYPE_Linear],
			AttrName_JobBHurtAddPer:[[TYPE_Calc_JobBHurtAddPer], False, TYPE_Linear],
			AttrName_JobCHurtAddPer:[[TYPE_Calc_JobCHurtAddPer], False, TYPE_Linear],
			@@ -4361,7 +4399,9 @@
			Def_CalcAttrFunc_GatherSoul, # 聚魂39
			Def_CalcAttrFunc_MagicWeapon4, # 王者法宝40
			Def_CalcAttrFunc_Coat, # ʱװ41
			) = range(42)
			Def_CalcAttrFunc_ZXEquip, # 诛仙装备42
			Def_CalcAttrFunc_ZXEquipSuit, # 诛仙装备套装43
			) = range(44)


			# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
			@@ -4403,8 +4443,9 @@
			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_ZhuXian:[Def_CalcAttrFunc_ZXEquipSuit],
			ShareDefine.Def_MFPType_Other:[Def_CalcAttrFunc_Success, Def_CalcAttrFunc_FamilyTech, Def_CalcAttrFunc_EquipDecompose],
			}

			@@ -4847,7 +4888,8 @@
			ItemDel_ChatBubbleBox, # 激活聊天气泡框
			ItemDel_GatherSoul, # 聚魂分解
			ItemDel_CoatDecompose, # 时装分解
			) = range(2000, 2000 + 37)
			ItemDel_ZhuXianDecompose, # 诛仙装备分解
			) = range(2000, 2000 + 38)

			# 物品扣除类型对应信息 {类型:eventName, ...}
			ItemDelTypeDict = {
			@@ -4888,6 +4930,7 @@
			ItemDel_ChatBubbleBox:"ChatBubbleBox",
			ItemDel_GatherSoul:"GatherSoul",
			ItemDel_CoatDecompose:"CoatDecompose",
			ItemDel_ZhuXianDecompose:"ZhuXianDecompose",
			}

			##==================================================================================================
			@@ -5043,7 +5086,8 @@
			Def_SkillFuncType_SkillRoll, #10为翻滚服务端未用到
			Def_SkillFuncType_RealmSuppress, #11为境界压制目前是NPC在用
			Def_SkillFuncType_Dogz, #12 神兽技能
			) = range(13)
			Def_SkillFuncType_ZhuXian, #13 诛仙技能
			) = range(14)

			# 受技能效果完全影响的怪，对应 Def_BattleRelationType_CommNoBoss
			Def_SkillAttack_NPCIsBoss = [ Def_NPCType_Ogre_Normal , #平凡小怪 0 # c++ 定义为普通NPC视野刷新
			@@ -5160,7 +5204,9 @@
			Def_RewardType_WeekPartyAct, # 领取周狂欢活动奖励20
			Def_RewardType_WeekPartyPoint, # 领取周狂欢积分奖励21
			Def_RewardType_ActLoginAwardAct, # 领取登录奖励活动奖励22
			)= range(23)
			Def_RewardType_NewFairyCRecharge, # 新仙界盛典充值大礼23
			Def_RewardType_NewFairyCParty, # 新仙界盛典全民来嗨24
			)= range(25)


			#boss复活相关活动定义
			@@ -5219,7 +5265,16 @@
			Def_WPAct_XMZZ, #仙魔之争 18
			Def_WPAct_FamilyWar, #仙魔联赛 19
			Def_WPAct_Login, #每日登录 20
			) = range(1, 20+1)
			Def_WPAct_Horse, #激活某只坐骑 21
			Def_WPAct_Pet, #激活某只灵宠 22
			Def_WPAct_Dogz, #出战某只神兽 23
			Def_WPAct_Stone, #宝石总等级 24
			Def_WPAct_GodWeapon, #神兵总等级 25
			Def_WPAct_Rune, #穿戴某品质符印 26
			) = range(1, 26+1)

			#可提前完成的周狂欢活动
			AheadFinishWPActList = [Def_WPAct_Horse, Def_WPAct_Pet, Def_WPAct_Dogz, Def_WPAct_Rune]

			# 套装枚举，普通套装，强化套装
			(EquipSuitType_Normal,