Project_SG_ServerCode.git

			@@ -324,6 +324,7 @@
			Def_PetBaseEffectList = range(5000, 5007 + 1)

			#---------------------------------------------------------------------------
			Def_ItemCount_Max = 2000000000 # 物品最大叠加上限
			#写死的物品ID都放这边
			Def_ItemID_PetSoul = -1 #宠物满魂
			Def_ItemID_PetDoubleExp = -1 #宠物双倍
			@@ -442,10 +443,10 @@
			Def_ItemType_retTrousers = 106 #6 裤子
			Def_ItemType_retShoes = 107 #7 鞋子
			Def_ItemType_retGlove = 108 #8 手套
			Def_ItemType_retNeck = 109 #9 项链
			Def_ItemType_retFairyCan = 110 #10 仙器1
			Def_ItemType_retFairyCan2 = 111 #11 仙器2
			Def_ItemType_retJade = 112 #12 玉佩
			Def_ItemType_retShawl = 109 #9 披肩
			Def_ItemType_retNeck = 110 #10 项链
			Def_ItemType_retRing = 111 #11 戒指
			Def_ItemType_retAmulet = 112 #12 玉佩
			Def_ItemType_retWing = 113 #13 翅膀
			Def_ItemType_retGuard1 = 114 #14 守护1
			Def_ItemType_retGuard2 = 115 #15 守护2
			@@ -470,8 +471,8 @@

			#虚拟背包最大格子数功能配置表对应的key
			Def_VPackCnt_Dict = {
			ShareDefine.rptRune:'RunePackageNum',
			ShareDefine.rptGatherSoul:'GatherSoulPackCount',
			#ShareDefine.rptRune:'RunePackageNum',
			#ShareDefine.rptGatherSoul:'GatherSoulPackCount',
			}

			def GetItemPackType(itemData, defaultPack=IPY_GameWorld.rptItem):
			@@ -498,13 +499,13 @@
			ShareDefine.retTrousers:[Def_ItemType_retTrousers],
			ShareDefine.retShoes:[Def_ItemType_retShoes],
			ShareDefine.retGlove:[Def_ItemType_retGlove],
			ShareDefine.retShawl:[Def_ItemType_retShawl],
			ShareDefine.retNeck:[Def_ItemType_retNeck],
			ShareDefine.retFairyCan:[Def_ItemType_retFairyCan],
			ShareDefine.retFairyCan2:[Def_ItemType_retFairyCan2],
			ShareDefine.retJade:[Def_ItemType_retJade],
			ShareDefine.retWing:[Def_ItemType_retWing],
			ShareDefine.retGuard1:[Def_ItemType_retGuard1],
			ShareDefine.retGuard2:[Def_ItemType_retGuard2],
			ShareDefine.retRing:[Def_ItemType_retRing],
			ShareDefine.retAmulet:[Def_ItemType_retAmulet],
			#ShareDefine.retWing:[Def_ItemType_retWing],
			#ShareDefine.retGuard1:[Def_ItemType_retGuard1],
			#ShareDefine.retGuard2:[Def_ItemType_retGuard2],
			}
			#---------------------------------------------------------------------
			#写死的物品效果ID都放这边------请按数值顺序存放
			@@ -882,6 +883,9 @@
			#装备类型
			Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1)

			#主线装备类型
			Def_MainEquipType = range(Def_ItemType_retWeapon, Def_ItemType_retAmulet + 1)

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

			@@ -920,12 +924,6 @@
			Def_PackCnt_Fashion = 1
			#登陆初始武器时装格子数
			Def_PackCnt_WeaponCoat = 8
			#初始化回收站
			Def_PackCnt_Recycle = 6
			#初始化临时交换背包格子数
			Def_PackCnt_TempSwap = 1
			#初始化临时存放背包格子数
			Def_PackCnt_TempItem = 10
			#玩家脱离战斗状态时间(6秒)
			Def_PlayerLeaveBattleTick = 3000
			#玩家PK多杀间隔
			@@ -1140,11 +1138,12 @@

			#玩家登陆需要初始化的背包索引
			Def_PlayerLoginInitPackIndexList = [#主角背包
			IPY_GameWorld.rptRecycle,
			#IPY_GameWorld.rptRecycle,
			IPY_GameWorld.rptEquip,
			IPY_GameWorld.rptItem,
			#IPY_GameWorld.rptFineSoulSlot,
			IPY_GameWorld.rptAnyWhere,
			#IPY_GameWorld.rptAnyWhere,
			IPY_GameWorld.rptIdentify,
			#时装背包
			#IPY_GameWorld.rptCabinetWeaponCoat,
			#IPY_GameWorld.rptCabinetHorse,
			@@ -1152,10 +1151,10 @@
			#IPY_GameWorld.rptHorseEquip,
			ShareDefine.rptTempItem,
			ShareDefine.rptTreasure,
			ShareDefine.rptPet,
			ShareDefine.rptDogzItem,
			ShareDefine.rptDogzEquip,
			ShareDefine.rptGarbage,
			#ShareDefine.rptPet,
			#ShareDefine.rptDogzItem,
			#ShareDefine.rptDogzEquip,
			#ShareDefine.rptGarbage,
			ShareDefine.rptHero,
			]

			@@ -1956,6 +1955,7 @@

			#副本ID转换
			Def_FB_MapID = {
			'MainLevel':[Def_FBMapID_Main, Def_FBMapID_MainBoss], # 主线关卡
			'FamilyWar':[Def_FBMapID_FamilyWar], # 仙盟联赛
			'FamilyInvade':[Def_FBMapID_FamilyInvade], # 守卫人皇
			'FamilyBoss':[Def_FBMapID_FamilyBossMap], # 战盟boss
			@@ -2446,25 +2446,21 @@
			ShareDefine.retTrousers, #6 裤子
			ShareDefine.retShoes, #7 鞋子
			ShareDefine.retGlove, #8 手套
			ShareDefine.retNeck, #9 项链
			ShareDefine.retFairyCan, #10 仙器1
			ShareDefine.retFairyCan2, #11 仙器2
			ShareDefine.retJade, #12 玉佩
			ShareDefine.retShawl, #9 披肩
			ShareDefine.retNeck, #10 项链
			ShareDefine.retRing, #11 戒指
			ShareDefine.retAmulet, #12 玉佩
			],
			}

			## 装备位 - 基础攻击类
			EquipPlace_BaseWeapon = [ShareDefine.retWeapon, ShareDefine.retWeapon2, ShareDefine.retBelt, ShareDefine.retGlove]
			EquipPlace_BaseWeapon = []
			## 装备位 - 基础防具类
			EquipPlace_BaseArmor = [ShareDefine.retHat, ShareDefine.retClothes, ShareDefine.retTrousers, ShareDefine.retShoes]
			## 装备位 - 仙器
			EquipPlace_Relics = [ShareDefine.retFairyCan, ShareDefine.retFairyCan2]
			## 装备位 - 特殊
			EquipPlace_Special = [ShareDefine.retNeck, ShareDefine.retFairyCan, ShareDefine.retFairyCan2, ShareDefine.retJade]
			EquipPlace_BaseArmor = []
			## 装备位 - 所有基础
			EquipPlace_Base = EquipPlace_BaseWeapon + EquipPlace_BaseArmor
			## 装备位 - 灵器
			EquipPlace_LingQi = [ShareDefine.retWing, ShareDefine.retGuard1, ShareDefine.retPeerlessWeapon, ShareDefine.retPeerlessWeapon2]
			EquipPlace_LingQi = []

			#装备物品位置,不需要重刷属性
			EquipItemNoRefreshState = [
			@@ -2946,6 +2942,8 @@
			#---Obj字典-------
			Def_Obj_Dict_Faction = 'Faction' # 所属阵营
			Def_Obj_Dict_LineupPlayerID = 'LineupPlayerID' # 阵容所属玩家ID，可用于判断是否玩家阵容，PVP或PVE
			Def_Obj_Dict_HeroID = 'HeroID' # 该战斗NPC所绑定的武将ID，一般仅玩家阵容有
			Def_Obj_Dict_SkinID = 'SkinID' # 该战斗NPC所绑定的武将皮肤ID，一般仅玩家阵容有
			Def_Obj_Dict_TurnFightPosInfo = 'TurnFightPosInfo' # 回合制站位：阵营编号*100+阵型站位，阵型站位为0时代表非主战单位
			Def_Obj_Dict_TurnFightTimeline = 'TurnFightTimeline' # 回合制战斗时间线: 回合数*100+行动编号节点
			Def_Obj_Dict_TurnComboNum = 'TurnComboNum' # 单次累计连击次数
			@@ -4401,7 +4399,9 @@
			Def_PDict_HeroBook = "HeroBook_%s" # 武将图鉴激活等级，参数(武将ID) cccbbba a-初始激活状态1-英雄激活，2-初始图鉴激活； bbb-存星级图鉴激活等级；ccc-存突破图鉴激活等级

			#主线
			Def_PDict_UnXiantaoCnt = "UnXiantaoCnt" # 累计未结算的战锤数
			Def_PDict_UnXiantaoCntExp = "UnXiantaoCntExp" # 累计未结算经验的战锤数
			Def_PDict_UnXiantaoCntEquip = "UnXiantaoCntEquip" # 累计未结算掉落的战锤数
			Def_PDict_BootyDropToday = "BootyDropToday_%s" # 今日已累计掉落战利品数量，参数(itemID)

			#-------------------------------------------------------------------------------
			#可以从07 41封包购买的背包类型,和对应字典{背包类型:[字典key, 默认格子数]}
			@@ -4881,10 +4881,10 @@
			ShareDefine.Def_Effect_HatAddPer: [ShareDefine.retHat, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_TrousersAddPer: [ShareDefine.retTrousers, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_ShoesAddPer: [ShareDefine.retShoes, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_FairyCanAddPer: [ShareDefine.retFairyCan, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_FairyCan2AddPer: [ShareDefine.retFairyCan2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_ShawlAddPer: [ShareDefine.retShawl, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_RingAddPer: [ShareDefine.retRing, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_NeckAddPer: [ShareDefine.retNeck, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_JadeAddPer: [ShareDefine.retJade, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_AmuletAddPer: [ShareDefine.retAmulet, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			}

			# 指定地图生效的非线性属性配置
			@@ -5782,7 +5782,8 @@
			Def_SkillFuncType_ShentongSkill, #20 神通技能
			Def_SkillFuncType_ElfSkill, #21 精怪技能
			Def_SkillFuncType_GatherTheSoul, #22 聚魂技能
			) = range(23)
			Def_SkillFuncType_TurnNormaAttack, #23 回合普攻技能
			) = range(24)

			# 受技能效果完全影响的怪，对应 Def_BattleRelationType_CommNoBoss
			Def_SkillAttack_NPCIsBoss = [ Def_NPCType_Ogre_Normal , #平凡小怪 0 # c++ 定义为普通NPC视野刷新
			@@ -5798,6 +5799,12 @@
			Def_BattleRelationType_CommNoBoss, # 除了（指定）BOSS，可对其释放技能，但是无实际效果
			) = range(0, 4)

			# 近战远程
			AtkDistTypeList = (
			AtkDistType_Short, # 近战
			AtkDistType_Long, # 远程
			) = range(1, 1 + 2)

			# 经验倍率限制类型
			(
			ExpRateLimitType_Recover, # 资源找回