From 3d658259b25c4914c766c43aeea883bdd0847c5d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 04 三月 2019 16:39:42 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index cb93207..c01cc03 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -4656,6 +4656,7 @@
 Def_Cost_CrossRealmPK, # 跨服PK
 Def_Cost_LuckyTreasure, #幸运鉴宝
 Def_Cost_MysteryShopRefresh, # 神秘商店刷新
+Def_Cost_AuctionBid, # 拍卖行竞价
 #-----------以下为暂时没用的,先不删除,如有新增消费点则放在这些之前------------
 Def_Cost_RefreshArrestTask, # 刷新悬赏任务
 Def_Cost_OffLineExp, # 兑换离线经验
@@ -4672,24 +4673,24 @@
 Def_Cost_Trade, # 交易
 Def_Cost_Rename, # 改名
 Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 59)
+) = 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,8 +4760,11 @@
 Def_Cost_CrossRealmPK:"CrossRealmPK",
 Def_Cost_LuckyTreasure:"LuckyTreasure",
 Def_Cost_MysteryShopRefresh:"MysteryShopRefresh",
+Def_Cost_AuctionBid:"AuctionBid",
 }
 ## -----------------------------------------------------
+
+Def_MailMoneySource = "MoneySource" # 邮件货币来源key
 
 #游戏货币来源类型定义
 (
@@ -4791,7 +4795,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 +4830,8 @@
 Def_GiveMoney_FreeGoods:"FreeGoods",
 Def_GiveMoney_BindJadeWheel:"BindJadeWheel",
 Def_GiveMoney_GatherSoulDecompose:"GatherSoulDecompose",
+Def_GiveMoney_AuctionBidReturn:"AuctionBidReturn",
+Def_GiveMoney_AuctionGain:"AuctionGain",
 }
 
 ##==================================================================================================

--
Gitblit v1.8.0