SnxxServerCode.git

			@@ -369,6 +369,10 @@
			Def_ItemType_ZXWeapon2 = 135 # 诛仙剑2
			Def_ItemType_ZXWeapon3 = 136 # 诛仙剑3
			Def_ItemType_ZXWeapon4 = 137 # 诛仙剑4
			Def_ItemType_ZhuXianStuff = 138 # 诛仙材料

			Def_ItemType_DogzStuff = 139 # 神兽材料
			Def_ItemType_ZhuXianStone = 140 # 诛仙宝石

			#以下定义物品类型下次删除
			Def_Item_Type_Horse = 1000036 #坐骑
			@@ -379,23 +383,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.rptZhuXianItem:range(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1),
			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

			# 部位对应装备类型列表
			@@ -1827,9 +1824,9 @@
			RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai]
			#跨服地图
			Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai]
			#跨服对应分区配置表名
			Def_CrossZoneTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZone",
			}
			#跨服分区对应地图配置表名
			Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
			}

			#副本关闭时未拾取的物品邮件发放给玩家
			#这里只有需要的副本才配置，不做默认逻辑，防止某些副本实际不能给导致刷物品，如麒麟之府
			@@ -3295,8 +3292,8 @@
			Def_PDictType_LVAward, # 等级奖励领取信息记录5
			Def_PDictType_GoldGift, # 充值豪礼
			Def_PDictType_OpenServerCampaign, # 开服活动
			Def_PDictType_WeekParty,
			Def_PDictType_Family_Contribution, # 战盟贡献度
			Def_PDictType_WeekParty, #周狂欢
			Def_PDictType_FeastWeekParty, # 节日巡礼
			Def_PDictType_LoginAward, # 登录奖励运营活动
			Def_PDictType_OfficialRank, # 官爵
			Def_PDictType_Horse, # 坐骑
			@@ -3322,6 +3319,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点
			@@ -3648,7 +3647,9 @@
			Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV" # 试炼之塔通关层数
			Def_Player_Dict_TrialTower_LastDayPassLV = "Tower_LastDayPassLV" # 试炼之塔昨日通关层数
			#诛仙塔
			Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV" # 诛仙塔通关层数
			Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV" # 诛仙塔已通关层数
			Def_Player_Dict_ZhuXianTowerLastFloor = "ZhuXianTowerLastFloor" # 诛仙塔上次挑战层数

			#古神禁地
			Def_Player_Dict_GodArea_Anger = "GodArea_Anger" # 古神禁地怒气值
			Def_Player_Dict_GodArea_LastAddAngerTime = "GodArea_LastAddAngerTime" # 古神禁地上一次增加怒气值的时间
			@@ -3716,6 +3717,15 @@
			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" # 今日已转次数
			Def_PDict_BindJadeWheelHistoryCnt = "BindJadeWheelHistoryCnt" # 历史已转次数
			@@ -3750,11 +3760,18 @@
			Def_PDict_FBRealHelpCount = "FBRealHelpCount_%s" #副本真实助战次数，仅针对真实进去打的副本，参数mapID

			#周狂欢
			Def_PDict_WeekPartyID = "WeekPartyID" # 玩家身上的BOSS复活活动ID，唯一标识，取活动开始日期time值
			Def_PDict_WeekPartyID = "WeekPartyID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
			Def_PDict_WeekPartyCurTimes = "WeekPartyCurTimes_%s_%s" #当前完成次数参数(第X天,模板ID)
			Def_PDict_WeekPartyGotTimes = "WeekPartyGotTimes_%s_%s" #当前已领次数参数(第X天,模板ID)
			Def_PDict_WeekPartyAwardRecord = "WeekPartyAwardRecord_%s" #积分领奖记录参数(第X天)
			Def_PDict_WeekPartyPoint = "WeekPartyPoint_%s" #当天积分参数(第X天)

			#节日巡礼周狂欢
			Def_PDict_FeastWeekPartyID = "FeastWeekPartyID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
			Def_PDict_FeastWeekPartyCurTimes = "FeastWPCurTimes_%s_%s" #当前完成次数参数(第X天,模板ID)
			Def_PDict_FeastWeekPartyGotTimes = "FeastWPGotTimes_%s_%s" #当前已领次数参数(第X天,模板ID)
			Def_PDict_FeastWeekPartyAwardRecord = "FeastWPAward_%s" #积分领奖记录参数(第X天)
			Def_PDict_FeastWeekPartyPoint = "FeastWPPoint_%s" #当天积分参数(第X天)

			#登录奖励运营活动
			Def_PDict_LoginAwardID = "LoginAwardID" # 玩家身上的BOSS复活活动ID，唯一标识，取活动开始日期time值
			@@ -3917,6 +3934,11 @@
			Def_PDict_OSRedPacketGrabMoney = "OSRedPacketGrabMoney" # 开服红包已抢数量
			Def_PDict_OSRedPacketCanGrabCnt = "OSRedPacketCanGrabCnt" # 开服红包可抢次数
			Def_PDict_OSRedPacketStartTime = "OSRedPacketStartTime" #开服红包开始倒计时时间

			#节日红包
			Def_PDict_FeastRedPacketActID = "FeastRedPacketActID" # 玩家身上的节日红包活动ID，唯一标识，取活动开始日期time值
			Def_PDict_FeastRedPacketGrabMoney = "FeastRedPacketGrabMoney" # 节日红包已抢数量
			Def_PDict_FeastRedPacketCanGrabCnt = "FeastRedPacketCanGrabCnt" # 节日红包可抢次数

			#境界
			Def_PDict_RealmFBIsOpen = "RealmFBIsOpen" #渡劫副本是否开启 0未开启 1已开启 2可升级境界
			@@ -4394,7 +4416,8 @@
			Def_CalcAttrFunc_Coat, # ʱװ41
			Def_CalcAttrFunc_ZXEquip, # 诛仙装备42
			Def_CalcAttrFunc_ZXEquipSuit, # 诛仙装备套装43
			) = range(44)
			Def_CalcAttrFunc_ZXEquipStone, # 诛仙宝石属性44
			) = range(45)


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

			@@ -4577,7 +4600,8 @@
			Def_VerFix_Pet, # 灵宠等级上限修改，对应技能触发修改;
			Def_VerFix_AddPoint, # 老号属性点修复;
			Def_VerFix_GodWeaponItem, # 1.5删除中级神兵石;
			) = range(9)
			Def_VerFix_ZXTower, # 诛仙塔奖励变更补偿;
			) = range(10)

			##==================================================================================================
			#游戏消费点类型定义
			@@ -4881,7 +4905,8 @@
			ItemDel_ChatBubbleBox, # 激活聊天气泡框
			ItemDel_GatherSoul, # 聚魂分解
			ItemDel_CoatDecompose, # 时装分解
			) = range(2000, 2000 + 37)
			ItemDel_ZhuXianDecompose, # 诛仙装备分解
			) = range(2000, 2000 + 38)

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

			##==================================================================================================
			@@ -5195,7 +5221,11 @@
			Def_RewardType_WeekPartyAct, # 领取周狂欢活动奖励20
			Def_RewardType_WeekPartyPoint, # 领取周狂欢积分奖励21
			Def_RewardType_ActLoginAwardAct, # 领取登录奖励活动奖励22
			)= range(23)
			Def_RewardType_NewFairyCRecharge, # 新仙界盛典充值大礼23
			Def_RewardType_NewFairyCParty, # 新仙界盛典全民来嗨24
			Def_RewardType_FeastWeekPartyAct, # 领取节日巡礼活动奖励25
			Def_RewardType_FeastWeekPartyPoint, # 领取节日巡礼积分奖励26
			)= range(27)


			#boss复活相关活动定义