From 84f9abc7067dde4e6b504a1ba2e9f0600a6de46b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 12 三月 2019 20:58:56 +0800
Subject: [PATCH] 4042 【后端】【2.0】邮件包含附件时不能删除邮件 - 服务端添加防范
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 138 +++++++++++++++++++++++++--------------------
1 files changed, 77 insertions(+), 61 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 07af3b5..82b4586 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -340,17 +340,16 @@
Def_ItemType_retBelt = 105 #5 腰带
Def_ItemType_retTrousers = 106 #6 裤子
Def_ItemType_retShoes = 107 #7 鞋子
-Def_ItemType_retNeck = 108 #8 项链
-Def_ItemType_retFairyCan = 109 #9 仙器
-Def_ItemType_retFairyCan2 = 110 #10 仙器
-Def_ItemType_retWing = 111 #11 翅膀
-Def_ItemType_retGuard = 112 #12 守护
-Def_ItemType_retBaldric1 = 113 #13 佩饰
-Def_ItemType_retBaldric2 = 114 #14 佩饰
-Def_ItemType_retBaldric3 = 115 #15 佩饰
-Def_ItemType_retBaldric4 = 116 #16 佩饰
-Def_ItemType_retBaldric5 = 117 #17 佩饰
-Def_ItemType_retBaldric6 = 118 #18 佩饰
+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_retWing = 113 #13 翅膀
+Def_ItemType_retGuard1 = 114 #14 守护1
+Def_ItemType_retGuard2 = 115 #15 守护2
+Def_ItemType_retPeerlessWeapon = 116 #16 绝世武器
+Def_ItemType_retPeerlessWeapon2 = 117 #17 绝世副手
Def_ItemType_DogzEquipHorn = 119 # 神兽兽角
Def_ItemType_DogzEquipEye = 120 # 神兽魔眼
@@ -405,16 +404,11 @@
ShareDefine.retTrousers:[Def_ItemType_retTrousers],
ShareDefine.retShoes:[Def_ItemType_retShoes],
ShareDefine.retNeck:[Def_ItemType_retNeck],
- ShareDefine.retFairyCan:[Def_ItemType_retFairyCan, Def_ItemType_retFairyCan2],
- ShareDefine.retFairyCan2:[Def_ItemType_retFairyCan, Def_ItemType_retFairyCan2],
+ ShareDefine.retFairyCan:[Def_ItemType_retFairyCan],
+ ShareDefine.retFairyCan2:[Def_ItemType_retFairyCan2],
ShareDefine.retWing:[Def_ItemType_retWing],
- ShareDefine.retGuard:[Def_ItemType_retGuard],
- ShareDefine.retBaldric1:[Def_ItemType_retBaldric1],
- ShareDefine.retBaldric2:[Def_ItemType_retBaldric2],
- ShareDefine.retBaldric3:[Def_ItemType_retBaldric3],
- ShareDefine.retBaldric4:[Def_ItemType_retBaldric4],
- ShareDefine.retBaldric5:[Def_ItemType_retBaldric5],
- ShareDefine.retBaldric6:[Def_ItemType_retBaldric6],
+ ShareDefine.retGuard1:[Def_ItemType_retGuard1],
+ ShareDefine.retGuard2:[Def_ItemType_retGuard2],
}
#---------------------------------------------------------------------
#写死的物品效果ID都放这边------请按数值顺序存放
@@ -449,6 +443,8 @@
Def_Effect_ItemGiveSoulSplinters = 240 # 使用道具给予聚魂碎片
Def_Effect_ItemGiveSoulCore = 241 #使用道具给予核心环
Def_Effect_ItemGiveHonor = 242 #使用道具给予荣誉
+Def_Effect_ItemGiveWeekPartyPoint = 245 #使用道具给予七日巡礼积分
+Def_Effect_ItemGiveWeekPartyPoint1 = 246 #使用道具给予节日巡礼积分
#----以下未使用或代码依然存在的---
Def_Effect_ItemGiveGongXun = 1920 #使用道具给予功勋
Def_Effect_ItemGiveRuneJH = 1925 #使用道具给予符印精华
@@ -840,6 +836,8 @@
#大额度交易记录
Def_LargeTrade_Gold = 50 * 1000
Def_LargeTrade_Silver = 1000 * 1000
+#初始化装备背包格子数
+Def_PackCnt_Equip = 130
#主角交易栏最大格数
Def_PlayerTradeMaxItemCount = 20
#主角刚登陆游戏开启背包格子数
@@ -1818,7 +1816,8 @@
Def_FBMapID_CrossRealmPK = 32010
#跨服蓬莱仙境
Def_FBMapID_CrossPenglai = 32020
-
+#多仙盟Boss
+Def_FBMapID_AllFamilyBoss = 31260
#注册上传跨服服务器数据后直接进入跨服服务器的地图
RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai]
@@ -1845,7 +1844,7 @@
Def_MapID_LineIDToPropertyID = [Def_FBMapID_ElderBattlefield]
# 进入副本需要发送到GameServer的地图
-Def_MapID_SendToGameServer = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_SealDemon, Def_FBMapID_FamilyWar, Def_FBMapID_ZhuXianBoss] + Def_MapID_LineIDToPropertyID
+Def_MapID_SendToGameServer = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_SealDemon, Def_FBMapID_FamilyWar, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss] + Def_MapID_LineIDToPropertyID
## 进入副本需要根据请求的功能线路处理的地图， hxp-改了进入模式，暂不需要了 180320
#Def_MapID_ReqFBFuncLine = [Def_FBMapID_KirinHome, Def_FBMapID_BZZD, Def_FBMapID_SealDemonEx,
@@ -1853,10 +1852,10 @@
# + Def_FBMapID_ClearDevil
# 刷新标识点在无玩家的情况下也需要刷新的地图
-Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome, Def_FBMapID_GatherSoul, Def_FBMapID_ZhuXianBoss]
+Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome, Def_FBMapID_GatherSoul, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss]
# 可重复进的副本
-Def_NoLimitEnterCntMap = [Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield, Def_FBMapID_ZhuXianBoss]
+Def_NoLimitEnterCntMap = [Def_FBMapID_AllFamilyBoss, Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield, Def_FBMapID_ZhuXianBoss]
# 无玩家时不自动关闭的自伸缩副本
Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_GatherSoul]
@@ -1918,6 +1917,7 @@
'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
'ZhuXianTower':[Def_FBMapID_ZhuXianTower],#诛仙塔
+ 'AllFamilyBoss':[Def_FBMapID_AllFamilyBoss],#多仙盟BOSS
}
#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
@@ -2406,9 +2406,11 @@
ShareDefine.retBelt, #5 腰带
ShareDefine.retTrousers, #6 裤子
ShareDefine.retShoes, #7 鞋子
- ShareDefine.retNeck, #8 项链
- ShareDefine.retFairyCan, #9 仙器
- ShareDefine.retFairyCan2, #10 仙器
+ ShareDefine.retGlove, #8 手套
+ ShareDefine.retNeck, #9 项链
+ ShareDefine.retFairyCan, #10 仙器1
+ ShareDefine.retFairyCan2, #11 仙器2
+ ShareDefine.retJade, #12 玉佩
],
}
@@ -2432,9 +2434,14 @@
ShareDefine.retWeapon2Skin, #22 时装副手
]
-# 需要广播外观的装备部位
+# 需要广播外观的装备部位(除了境界装备3部位)
Def_SyncEquipStateByIndex = [
-
+ ShareDefine.retWing, #11 翅膀
+ ShareDefine.retGuard1, #14 守护1
+ ShareDefine.retHorse, #19 坐骑
+ ]
+#套装装备部位列表
+Def_SuitEquipPlaceList = [
ShareDefine.retWeapon, #1 主手
ShareDefine.retWeapon2, #2 副手
ShareDefine.retHat, #3 帽子
@@ -2442,14 +2449,8 @@
ShareDefine.retBelt, #5 腰带
ShareDefine.retTrousers, #6 裤子
ShareDefine.retShoes, #7 鞋子
- ShareDefine.retNeck, #8 项链
- ShareDefine.retFairyCan, #9 仙器
- ShareDefine.retFairyCan2, #10 仙器
- ShareDefine.retWing, #11 翅膀
- ShareDefine.retGuard, #12 守护
- ShareDefine.retHorse, #19 坐骑
- ]
-
+ ShareDefine.retGlove, #8 手套
+ ]
#---------------------------------------------------------------------
#特殊物品光环，永久存在
Def_SuperBuffList = [
@@ -3114,7 +3115,6 @@
Def_PlayerKey_AtkInterval = "NormalAtkInterval_%s" # 公共技能CD类型
Def_PlayerKey_AtkTick = "NormalAtkTick_%s" # 公共技能CD类型
Def_PlayerKey_QueryOpenServerAwardState = "QueryOpenServerAwardState" # 查询开服奖励状态
-Def_PlayerKey_QueryMixServerAwardState = "QueryMixServerAwardState" # 查询合服奖励状态
Def_PlayerKey_QueryFamilyStoreTick = "QueryFamilyStoreTick" # 战盟仓库操作tick
Def_PlayerKey_QueryMarkIdCardIndex = 'QueryMarkIdCardIndex' # 指定账号生成卡类型
@@ -3128,6 +3128,7 @@
Def_PlayerKey_ComboBuffProcessState = "ComboBuffProcessState" #持续性buff连击处理状态
Def_PlayerKey_LvAwardQueryState = 'LvAwardQueryState' # 等级奖励领奖查询状态
Def_PlayerKey_StoreQueryState = 'StoreQueryState' # 商店全服购买次数查询状态
+Def_PlayerKey_MysticalShopLastTime = 'MysticalShopLastTime' # 神秘商店刷新时间
#===============================================================================
# # 持续性buff伤害处理连击技能ID列表
# # 因为释放一次技能后一段时间内是持续性的, 故连接判断效果仅处理一次, 持续时间内均受此效果影响, 不重复处理连击
@@ -3500,8 +3501,6 @@
Def_PDict_SuperGiftHasOpen = "SuperGiftHasOpen" # 超值礼包是否开过
Def_PDict_DailyGoldChargePrizeRecord = "DailyGoldChargePrizeRecord" # 天天首充领奖记录，0-不可领；1-可领；2-已领
Def_PDict_DailyGoldChargeCnt = "DailyGoldChargeCnt" # 当日已充值数
-Def_PDict_SingleGoldGiftIndex = "SingleGoldGiftIndex" # 单日充值多选一礼包领取状态, 0-未领取,>0已领取索引
-Def_PDict_UnlimitedGoldGiftCnt = "UnlimitedGoldGiftCnt" # 当日无限领取礼包已领取次数
Def_PDict_IsReBorn = "Def_PDict_IsReBorn" # 是否回城复活
Def_PDict_FamilyWarDailyReward = "FamilyWarDailyReward" # 王者仙盟每日俸禄领取状态
Def_PDict_Family_Contribution = "FamilyContribution" #战盟贡献度
@@ -3517,6 +3516,9 @@
Def_PDict_CollNpcIDCollTime = "CollNpcIDCollTime_%s" # 采集NPCID对应每日对应采集次数，%sNPCID
Def_PDict_ShopItemDayBuyCnt = "ShopItemDayBuyCnt_%s" # 商店NPC商品已购买次数，itemIndex
Def_PDict_ShopItemStartTime = "ShopItemStartTime_%s" # 神秘限购商品开卖时间，itemIndex
+Def_PDict_MysticalShopGoods = "MysticalShopGoods_%s" # 神秘商店商品ID，索引
+Def_PDict_MysticalShopRefreshCnt = "MysticalShopRefreshCnt" # 神秘商店已手动刷新次数
+Def_PDict_MysticalShopLVRefreshCnt = "MysticalShopLVRefreshCnt" # 神秘商店等级段刷新次数
Def_PDict_ShopItemBuyCnt = "ShopItemBuyCnt_%s_%s" # 自定义商品已购买次数，(shopID, itemIndex)
Def_PDict_ShopItemOpenState = "ShopItemOpenState_%s_%s" # 自定义神秘商店物品开启状态，(shopID, keyNum)
Def_PDict_TimeShopRefreshCnt = "TimeShopRefreshCnt_%s" # 自定义神秘商店已手动刷新次数，(shopID)
@@ -3530,7 +3532,6 @@
Def_PDict_HighLadder_IsRelCD = "HighLadderIsRelCD" #天梯是否进入真正挑战冷却
Def_PDict_HighLadder_WinningStreak = "HighLadderWinningStreak" #天梯连胜场次
Def_PDict_HighLadder_HistoryMaxOrder = "HighLadderMaxOrder" #天梯历史最高排名
-Def_PDict_MixLoginDayState = "PMixLoginDayState" # 合服天登陆状态<按登陆天从低位起0-未领1-可领2-已领>
Def_PDict_FestivalLoginState = "FestivalLoginState_%s" # 节日登陆奖励状态_%s表示节日类型<按登陆天从低位起0-未领1-可领2-已领>
Def_PDict_Currency = "PlayerCurrency_%s" # 自定义货币类型, 参数[自定义货币类型]
Def_PDict_TJGSet = "TJGSet" # 脱机挂系统设定
@@ -3541,9 +3542,7 @@
Def_PDict_LoginClientType = "LoginClientType" # 客户端登录类型
-Def_PDict_ReUpdBillboardSign = "ReUpdBillboardSign" # 重新同步排行表标记
-Def_PDict_MSFirstLogin_UpdBillboard = "MSFirstLogin_UpdBillboard" # 合服首登同步排行榜信息
-Def_PDict_MixLoginDay = "MixLoginDay" # 合服首登处理标记
+Def_PDict_MixLoginDay = "MixLoginDay" # 合服首登处理标记天
Def_PDict_ExcActionItemCnt = "ExcI_%s_%s" # 活动兑换物品已兑换次数,参数(活动key,兑换物品对应次数编号标识)
@@ -3610,12 +3609,13 @@
Def_PDict_RunTaskAwardState = "RunTaskAwardState_%s" # 是否已领取跑环本轮结束奖励 参数任务类型
Def_PDict_RunTaskAwardRecord = "RunTaskAwardRecord_%s" # 跑环本轮结束奖励记录 参数任务类型
Def_PDict_RunTaskNextMissionID = "RunTaskNextMissionID_%s" # 跑环本轮结束下个任务ID 参数任务类型
-# 宝石
-Def_PDict_EquipPartStarLV = "EPStarLV_%s_%s" # 装备部位对应公共强化星级，参数为(packType, index)
+#强化
+Def_PDict_EquipPartPlusLV = "EPPlusLV_%s_%s" # 装备部位对应公共强化星级，参数为(packType, index)
Def_PDict_EquipActiveStarLV = "EquipActiveStarLV" #装备已激活总强化等级
-Def_PDict_EquipPartProficiency = "EPProf_%s_%s" # 装备部位对应公共强化星级，参数为(packType, index)
-Def_PDict_EquipActiveStars = "EquipActiveStars" #装备已激活总强化星级
+Def_PDict_EquipPartProficiency = "EPProf_%s_%s" # 装备部位对应公共强化熟练度，参数为(packType, index)
+Def_PDict_EquipPartPlusEvolveLV = "EPPlusEvolveLV_%s_%s" # 装备部位对应公共强化进化等级，参数为(packType, index)
+# 宝石
Def_PDict_EquipPartStoneID = "StoneID_%s_%s" # 装备位_孔位存储宝石ID*10+是(1)否(0)绑定
# 装备洗练, 暂不区分背包类型，如果有不同背包，策划设定不同的装备位
@@ -3650,6 +3650,7 @@
#诛仙塔
Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV" # 诛仙塔已通关层数
Def_Player_Dict_ZhuXianTowerLastFloor = "ZhuXianTowerLastFloor" # 诛仙塔上次挑战层数
+Def_Player_Dict_ZhuXianTowerCostTime = "ZhuXianTowerCostTime" # 诛仙塔通关时间
#古神禁地
Def_Player_Dict_GodArea_Anger = "GodArea_Anger" # 古神禁地怒气值
@@ -3780,6 +3781,7 @@
Def_PDict_LoginAwardID = "LoginAwardID" # 玩家身上的BOSS复活活动ID，唯一标识，取活动开始日期time值
Def_PDict_LoginAwardCurTimes = "LoginAwardCurTimes_%s_%s" #当前完成次数 参数(第X天,模板ID)
Def_PDict_LoginAwardGotTimes = "LoginAwardGotTimes_%s_%s" #当前已领次数 参数(第X天,模板ID)
+Def_PDict_LoginAwardWorldLV = "LoginAwardWorldLV%s" #活动开启时世界等级参数(第X天)
#诛仙BOSS
Def_PDict_ZhuXianBossHelpCnt = "ZhuXianBossHelpCnt" # 协助次数
@@ -3788,6 +3790,7 @@
Def_PDict_LuckyTreasureID = "LuckyTreasureID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
Def_PDict_LuckyTreasureFree = "LuckyTreasureFree" #是否免费过
Def_PDict_LuckyTreasurePoint = "LuckyTreasurePoint" #幸运值
+Def_PDict_LuckyTreasureCnt = "LuckyTreasureCnt" #鉴宝次数
#-------------------------------------------------------------------------------
#类型 Def_PDictType_OnlinePrize
Def_PDict1_OnlinePrizeCnt = "OnlinePrizeCnt" # 新手在线已领取奖励次数
@@ -3801,10 +3804,6 @@
Def_PDict_OSC_TagAwardRecord = "OSCTagAwardRecord_%s" # 开服活动目标奖励记录, 参数(活动类型), 按奖励位存储是否领取
Def_PDict_OSC_RecordData = "OSCRecordData_%s" # 开服活动记录数值, 参数(活动类型)
Def_PDict_OSC_EndMailState = "EndMailState" # 开服活动结束发放邮件处理状态, 记录该状态的目的是防止开服活动版本变更导致旧号重复补发奖励；
-
-Def_PDict_MixServerCampaign_AwardRecord = "MSCAwardRecord_%s" # 合服活动奖励记录
-Def_PDict_MixServerCampaign_RecordData = "MSCRecordData_%s" # 合服活动记录数值
-Def_PDict_MixServerCampaign_MailState = "MSCMailState" # 合服活动结束补发未领奖记录邮件状态, 按类型位二进制存储状态
# 坐骑 Def_PDictType_Horse
Def_PDict_Horser_LV = "Horser_LV_%d" # 坐骑等级 0代表未激活 1代表1级
@@ -4003,11 +4002,15 @@
#套装
Def_PDict_EquipPartSuiteLV = "EQPartSuiteLV_%s_%s" #部位套装等级 参数 部位、套装类型
-Def_PDict_EquipPartSuiteNotify = "EQPartSuiteNotify_%s_%s_%s" #部位套装提示记录 参数 组合类型、套装类型、X件
+Def_PDict_EquipPartSuiteNotify = "EQPartSuiteNotify_%s" #部位套装提示记录 参数 标记
#神兽
Def_PDict_DogzFightState = "DogzFightState_%s" # 神兽助战状态，参数为key编号，按神兽ID二进制位存储
Def_PDict_DogzBuyHelpbattleCount = "DogzBuyHelpbattleCount" # 额外购买的神兽助战位
+
+#装备部位星数
+Def_PDict_EquipPartStar = "EQPartStar_%s" #装备部位星数 参数 装备背包格子索引
+
#-------------------------------------------------------------------------------
#可以从07 41封包购买的背包类型,和对应字典{背包类型:[字典key, 默认格子数]}
@@ -4657,6 +4660,8 @@
Def_Cost_FBGatherSoulBoss, # 聚魂副本BOSS召唤 40
Def_Cost_CrossRealmPK, # 跨服PK
Def_Cost_LuckyTreasure, #幸运鉴宝
+Def_Cost_MysteryShopRefresh, # 神秘商店刷新
+Def_Cost_AuctionBid, # 拍卖行竞价
#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
Def_Cost_RefreshArrestTask, # 刷新悬赏任务
Def_Cost_OffLineExp, # 兑换离线经验
@@ -4673,24 +4678,24 @@
Def_Cost_Trade, # 交易
Def_Cost_Rename, # 改名
Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 58)
+) = range(2000, 2000 + 60)
Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
# 消费返利不处理的消费类型列表
CostRebate_DisableType = [Def_Cost_BourseBuy, Def_Cost_BourseCharge, Def_Cost_FreeGoods, Def_Cost_FamilyRedPacket,
- Def_Cost_Unknown, "GMSetMoney", "Warehouse"]
+ Def_Cost_Unknown, "GMSetMoney", "Warehouse", Def_Cost_AuctionBid]
CostProfit_CostType = [Def_Cost_BourseBuy, Def_Cost_BourseCharge, Def_Cost_Unknown,
- "GMSetMoney", "Warehouse"]
+ "GMSetMoney", "Warehouse", Def_Cost_AuctionBid]
# 消费VIP不处理的消费类型列表
CostVIP_CostType = [Def_Cost_BourseBuy, Def_Cost_BourseCharge, Def_Cost_Unknown,
- "GMSetMoney", "Warehouse"]
+ "GMSetMoney", "Warehouse", Def_Cost_AuctionBid]
# 可在跨服中消费的类型列表
MergeServerCanCostType = [Def_Cost_UseSpeaker, Def_Cost_Revive, Def_Cost_FBEncourage]
#内部仙玉不能用的消费类型列表
-UnUseInner_CostType = [Def_Cost_BourseBuy, Def_Cost_FamilyRedPacket]
+UnUseInner_CostType = [Def_Cost_BourseBuy, Def_Cost_FamilyRedPacket, Def_Cost_AuctionBid]
# 消费类型对应信息字典{消费类型:[eventName, 中文说明reason_name, 发送给9377的数据是否分消费子类], }
# 由于9377那边数据建议所有消费点总和最好不超过500个，故这里对部分发送给对方的数据进行归组为不分子类，或直接归属于商城分组
# .使用原价购买的物品统一归属为商城组，消费对应为AutoBuy的也归属于商城分组
@@ -4759,6 +4764,8 @@
Def_Cost_FBGatherSoulBoss:"FBGatherSoulBoss",
Def_Cost_CrossRealmPK:"CrossRealmPK",
Def_Cost_LuckyTreasure:"LuckyTreasure",
+Def_Cost_MysteryShopRefresh:"MysteryShopRefresh",
+Def_Cost_AuctionBid:"AuctionBid",
}
## -----------------------------------------------------
@@ -4791,7 +4798,9 @@
Def_GiveMoney_FreeGoods, # 极品白拿
Def_GiveMoney_BindJadeWheel, # 绑玉转盘 25
Def_GiveMoney_GatherSoulDecompose, #聚魂分解 26
-) = range(1000, 1000 + 27)
+Def_GiveMoney_AuctionBidReturn, #拍卖竞价返还
+Def_GiveMoney_AuctionGain, #拍卖获得利润
+) = range(1000, 1000 + 29)
Def_Give_Reason_SonKey = "reason_name_son" # 原因子类说明key
@@ -4824,6 +4833,8 @@
Def_GiveMoney_FreeGoods:"FreeGoods",
Def_GiveMoney_BindJadeWheel:"BindJadeWheel",
Def_GiveMoney_GatherSoulDecompose:"GatherSoulDecompose",
+Def_GiveMoney_AuctionBidReturn:"AuctionBidReturn",
+Def_GiveMoney_AuctionGain:"AuctionGain",
}
##==================================================================================================
@@ -4918,7 +4929,9 @@
ItemDel_GatherSoul, # 聚魂分解
ItemDel_CoatDecompose, # 时装分解
ItemDel_ZhuXianDecompose, # 诛仙装备分解
-) = range(2000, 2000 + 38)
+ItemDel_EquipStarUp, # 装备升星
+ItemDel_EquipPlusEvolve, # 装备强化进化
+) = range(2000, 2000 + 40)
# 物品扣除类型对应信息 {类型:eventName, ...}
ItemDelTypeDict = {
@@ -4960,6 +4973,8 @@
ItemDel_GatherSoul:"GatherSoul",
ItemDel_CoatDecompose:"CoatDecompose",
ItemDel_ZhuXianDecompose:"ZhuXianDecompose",
+ ItemDel_EquipStarUp:"EquipStarUp",
+ ItemDel_EquipPlusEvolve:"EquipPlusEvolve",
}
##==================================================================================================
@@ -5302,7 +5317,8 @@
Def_WPAct_Stone, #宝石总等级 24
Def_WPAct_GodWeapon, #神兵总等级 25
Def_WPAct_Rune, #穿戴某品质符印 26
-) = range(1, 26+1)
+Def_WPAct_Pray, #祈愿 27
+) = range(1, 27+1)
#可提前完成的周狂欢活动
AheadFinishWPActList = [Def_WPAct_Horse, Def_WPAct_Pet, Def_WPAct_Dogz, Def_WPAct_Rune]
--
Gitblit v1.8.0