From aa951c5c5578194dc5076b2afb8d8e68c4af6f3f Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 04 九月 2018 17:33:48 +0800
Subject: [PATCH] fix:3260 【后端】支持戮仙武器满足仙宝寻主解锁条件

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 211280b..97bd58d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -363,6 +363,9 @@
 
 def GetItemPackType(itemType, defaultPack=IPY_GameWorld.rptItem):
     ## 获取物品类型对应存放的默认背包类型
+    if defaultPack == ShareDefine.rptTreasure:
+        #寻宝背包不做处理
+        return defaultPack
     for pack, itemTypeList in Def_PackItemTypeList_Dict.items():
         if itemType in itemTypeList:
             return pack
@@ -397,6 +400,7 @@
 Def_Effect_AddDienstgrad = 204   #使用物品获得称号
 Def_Effect_UseItemGiveZhenQi = 205      #使用道具给予真气
 Def_Effect_ItemGiveFamilyActivity = 208      #使用道具给予仙盟活跃令
+Def_Effect_ItemGiveFamilyContribution = 209      #使用道具给予仙盟贡献
 Def_Effect_TJGAddTime = 210      #增加脱机挂时间
 Def_Effect_ItemAddExp = 213      #给经验道具 
 Def_Effect_ItemAddLV = 214       #直接升级道具 
@@ -3384,6 +3388,7 @@
 Def_PDict_FirstGoldTry = "FirstGoldTry"     # 首充试用状态 0-不可试用 1-可试用 2-已试用
 Def_PDict_DailyGoldChargeState = "DailyGoldChargeState"  # 天天首充活动状态,0-未开启;1-已开启
 Def_PDict_DailyChargeState = "DailyChargeState"  # 当日是否已充值
+Def_PDict_SuperGiftData = "SuperGiftData"  # 超值礼包数据
 Def_PDict_DailyGoldChargePrizeRecord = "DailyGoldChargePrizeRecord"  # 天天首充领奖记录,0-不可领;1-可领;2-已领
 Def_PDict_DailyGoldChargeCnt = "DailyGoldChargeCnt"  # 当日已充值数
 Def_PDict_SingleGoldGiftIndex = "SingleGoldGiftIndex"  # 单日充值多选一礼包领取状态, 0-未领取,>0已领取索引
@@ -3732,6 +3737,7 @@
 
 #仙盟红包
 Def_PDict_FamilyRedPacketGoldLimit = "FmlRedPacketGoldLimit"  # 仙盟钻石红包已发额度
+Def_PDict_FamilyRedPacketCache = "FamilyRedPacketCache%s"  # 仙盟红包待发放记录参数索引
 Def_PDict_OSRedPacketGrabMoney = "OSRedPacketGrabMoney"  # 开服红包已抢数量
 Def_PDict_OSRedPacketCanGrabCnt = "OSRedPacketCanGrabCnt"  # 开服红包可抢次数
 Def_PDict_OSRedPacketStartTime = "OSRedPacketStartTime" #开服红包开始倒计时时间
@@ -4290,21 +4296,6 @@
 TriggerType_OneDamage,   # 伤害降低到1点 49
 ) = range(1, 50)
 
-#增强类型定义,参考SkillBoosts下的SkillBoost_文件
-BoostType_HappenRate = 4    # 触发几率特殊处理 - 增强
-WeakenType_HappenRate = 104    # 触发几率特殊处理 - 减弱
-
-#MapConfig表中的索引定义-----------------------------------------------------------
-# 表SkillBoostEffDropRate 中的 列表索引定义
-(
-Def_SkillBoostTable_SkillTypeID,
-Def_SkillBoostTable_BoostType,
-Def_SkillBoostTable_SkillEffectID,
-Def_SkillBoostTable_ParentSkillTypeID,  # 相对Def_SkillBoostTable_SkillTypeID的父技能如召唤
-Def_SkillBoostTable_MinValue,
-Def_SkillBoostTable_MaxValue,
-Def_SkillBoostTable_NotifyValue,
-) = range(7)
 
 # NPC功能类型定义
 Def_NPCFuncType_Goblin = 70 # 盗宝哥布林

--
Gitblit v1.8.0