From 9d5f1996ab520ab5ede2b153a15c3b8b74be662e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 29 三月 2019 17:19:17 +0800
Subject: [PATCH] 3040 【BUG】【1.6】跨服pk,快速点击购买次数,可以超出上限

---
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py |   80 +++++++++++++++++++++++++++------------
 1 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index f9d1fcf..a4e117b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -371,11 +371,12 @@
 Def_WorldKey_BossIsGeTui = "BossGeTui%s"                     #当前复活通知
 Def_WorldKey_OperationActionState = "OperationActState_%s"   #运营活动状态,参数为运营活动名
 Def_WorldKey_BossRebornNeedPoint = "BossRebornNeedPoint"     #boss复活需要总点数
-Def_WorldKey_BossIsAlive = 'BossIsAlive_%s'                  #boss是否活着
-Def_WorldKey_IsGameWorldInit = 'IsGameWorldInit'             #GameWold是否初始化完成
+Def_WorldKey_CrossBossIsAlive = 'CrossBossIsAlive_%s_%s'     #跨服boss是否活着,参数(zoneID, bossID)
+Def_WorldKey_GameWorldInitOK = 'GameWorldInitOK'             #GameWold是否初始化完成OK
 Def_WorldKey_CrossPKZoneSeasonID = "CrossPKZoneSeasonID_%s"  #跨服PK赛区对应赛季,跨服服务器控制,参数(zoneID)
 Def_WorldKey_CrossPKZoneSeasonState = "CrossPKZoneSeasonState_%s" #跨服PK赛区赛季状态,跨服服务器控制,参数(zoneID)0-未开启,1-开启中,2-已结束
 Def_WorldKey_CrossPKBillboardSyncTick = "CrossPKBillboardSyncTick_%s_%s" #跨服PK本赛季排行榜同步tick,参数(zoneID, seasonID)
+Def_WorldKey_CrossSetPlayerAttrTick = "CrossSetPlayerAttrTick" #同步设置跨服玩家属性值tick
 #---------------------------------------------------------------------
 #个人时间间隔
 TYPE_Player_Tick_Requestkey = 0                       # 玩家请求处理间隔
@@ -531,6 +532,8 @@
                                 ShareDefine.Def_UniversalGameRecType_FamilyRedPacketGrabRecord:10000000,   #仙盟红包已抢信息记录
                                 ShareDefine.Def_UniversalGameRecType_DujieHelpAllRecord:500,   #渡劫副本护法总记录
                                 ShareDefine.Def_UniversalGameRecType_DujieHelpRecord:10000,   #渡劫副本护法详细记录
+                                ShareDefine.Def_UniversalGameRecType_ZhuXianBossRecord:100,   #诛仙BOSS结算记录
+                                ShareDefine.Def_UniversalGameRecType_LuckyTreasure:5,   #幸运鉴宝记录
                               }
 #---------------------------------------------------------------------
 #比较标识
@@ -580,20 +583,9 @@
             ShareDefine.Def_BT_Campaign_Recharge        : 100,           #累计充值(开服活动榜)
             ShareDefine.Def_BT_Campaign_PetLV           : 100,           #灵宠等级(开服活动榜)  
             ShareDefine.Def_BT_FCCostGold               : 5,             #消费排行榜(仙界盛典)
+            ShareDefine.Def_BT_NewFCCostGold            : 5,             #消费排行榜(仙界盛典)
             ShareDefine.Def_BT_FBHelpBattle             : 100,           #助战次数榜
-            
-            ShareDefine.Def_BT_HighLadder               : 1000,          #玩家天梯竞技场排行
-            ShareDefine.Def_BT_HighLadder_Yester        : 1000,          #玩家天梯竞技场昨日排行
-            ShareDefine.Def_BT_RechargeTeHuiLast        : 20,            #充值特惠活动排行榜-上一期记录 
-            ShareDefine.Def_BT_RechargeTeHui            : 20,            #充值特惠活动排行榜-当前期记录 
-            
-            ShareDefine.Def_BT_MixCampaign_PlayerBattle : 2,             #战力榜(合服活动)
-            ShareDefine.Def_BT_MixCampaign_Recharge     : 2,             #累计充值榜(合服活动)
-            ShareDefine.Def_BT_MixCampaign_WinFamilyMember:1,            #获胜战盟成员(合服活动)
-            ShareDefine.Def_BT_MixCampaign_FamilyKillBoss: 1,            #战盟击杀boss(合服活动)
-            
-            ShareDefine.Def_BT_CostTeHui                : 10,            #消费特惠排行榜
-            ShareDefine.Def_BT_CostTeHuiLast            : 10,            #消费特惠排行榜上一期
+            ShareDefine.Def_BT_ZhuXianTower             : 100,           #诛仙塔榜
             }
 
 #排行榜保存类型(和BillboardType匹配), 默认保存, 如果不保存,可配置进去
@@ -623,7 +615,6 @@
 Def_PlayerDataCollect_Key = 0x86
 
 #---SetDict  玩家字典不存数据库---
-Def_Player_NoSave_Dict_RecallCountGift = 'RecallCountGift_0'    # 召回玩家个数奖励发包限制
 Def_Player_NoSave_Dict_PlayerExamRightCnt = 'PlayerExamRightCnt_1_%s'  # 玩家答题正确数量
 Def_Player_NoSave_Dict_PlayerExamCRightCnt = 'PlayerExamCRightCnt_1_%s'  # 玩家答题连续正确数量
 
@@ -636,12 +627,10 @@
 Def_PlayerKey_IsStopSendDBCommand = "StopSendDBCom"  #是否停止发送数据库操作命令
 Def_PlayerKey_SendDBComTick = "SendDBComTick"  #发送DB命令时间
 
-Def_PlayerKey_CrossRegisterType = "CrossRegisterType"  #当前上传数据的活动类型
+Def_PlayerKey_CrossRegisterMap = "CrossRegisterMap"  #跨服注册活动地图, dataMapID
 Def_PlayerKey_MergeRegisterRoomID = "MergeRegisterRoomID"  #当前上传数据的roomID
 Def_PlayerKey_IsLoginToMergeServer = "IsLoginToMergeServer"  #是否要登陆跨服服务器
 Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching"  #是否跨服匹配中
-
-Def_PlayerKey_FreshmanGuiderDay = "FreshmanGuiderDay"  #新手指导员天数
 
 Def_PlayerKey_PlayerFromPID = "PlayerFromPID"  #pid
 
@@ -670,10 +659,14 @@
 Def_FBMapID_FamilyInvade = 31170
 #封魔坛
 Def_FBMapID_SealDemon = 52010
+#诛仙BOSS
+Def_FBMapID_ZhuXianBoss = 31380
 #仙魔之争
 Def_FBMapID_XMZZ = 31010
 #仙盟boss副本
 Def_FBMapID_FamilyBossMap = 31210
+#多仙盟Boss
+Def_FBMapID_AllFamilyBoss = 31260
 #宗门试炼
 Def_FBMapID_MunekadoTrial = 60010
 #混乱妖域
@@ -684,6 +677,16 @@
 Def_FBMapID_CrossRealmPK = 32010
 #跨服蓬莱仙境
 Def_FBMapID_CrossPenglai = 32020
+#骑宠Boss
+Def_FBMapID_HorsePetBoss = 31200
+
+#需要刷世界BOSS的副本
+WorldBossFBMapIDList = [Def_FBMapID_SealDemon, Def_FBMapID_ZhuXianBoss]
+#跨服地图
+Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai]
+#跨服分区对应地图配置表名
+Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
+                             }
 
 #同系职业枚举
 JOB_TYPY_COUNT = 5
@@ -709,12 +712,6 @@
 
 # 邮件(补偿)默认发件人, 具体做活动再定
 Def_Mail_SenderSys = "SenderSys"    # 默认邮件发送人
-
-# 邮件类型划分,用于每种类型的保存上限
-(
-Mail_Type_Default,
-Mail_Type_Market,
-) = range(2)
 
 # 竖杠
 Def_Str_Montant = "|"
@@ -786,3 +783,36 @@
 VIPPrivilege_XianyuanCoinUpperAdd,    #33 仙缘币上限加成
 VIPPrivilege_XianyuanCoinAddPer,    #34 仙缘币获得倍率加成(万分比)
 ) = range(1, 35)
+
+#游戏货币来源类型定义
+(
+Def_GiveMoney_Unknown, # 未知 0
+Def_GiveMoney_GM,
+Def_GiveMoney_CTG,
+Def_GiveMoney_GMTCTG,
+Def_GiveMoney_CoinToGold,
+Def_GiveMoney_SuperAccountCreate, # 创角赠送 5
+Def_GiveMoney_Mission, # 任务
+Def_GiveMoney_Pray, # 祈祷
+Def_GiveMoney_UseItem, # 使用物品
+Def_GiveMoney_Pickup, # 拾取
+Def_GiveMoney_Bourse, # 交易所 10
+Def_GiveMoney_GoldInvest, # 绑钻投资
+Def_GiveMoney_Recover, # 资源找回
+Def_GiveMoney_RedPacket, # 红包
+Def_GiveMoney_RefineGift, # 炼制奖励
+Def_GiveMoney_Mail, # 邮件(补偿) 15
+Def_GiveMoney_RuneDecompose, # 符印
+Def_GiveMoney_Warehouse, # 仓库
+Def_GiveMoney_SellPackItem, # 出售背包物品
+Def_GiveMoney_CollectNPC, # 采集NPC
+Def_GiveMoney_20,
+Def_GiveMoney_21,
+Def_GiveMoney_Trade, # 交易
+Def_GiveMoney_Truck, # 运镖
+Def_GiveMoney_FreeGoods, # 极品白拿 
+Def_GiveMoney_BindJadeWheel, # 绑玉转盘 25
+Def_GiveMoney_GatherSoulDecompose, #聚魂分解 26
+Def_GiveMoney_AuctionBidReturn, #拍卖竞价返还
+Def_GiveMoney_AuctionGain, #拍卖获得利润
+) = range(1000, 1000 + 29)

--
Gitblit v1.8.0