From d0f5f9922f17f5bff4288173f18a9ed827d95db8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 22 六月 2019 15:00:13 +0800
Subject: [PATCH] 1 装备评分增加装备掉率参数固定值 DropEquipPer

---
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py |   95 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index e4dbbe7..b94a639 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -372,7 +372,7 @@
 Def_WorldKey_OperationActionState = "OperationActState_%s"   #运营活动状态,参数为运营活动名
 Def_WorldKey_BossRebornNeedPoint = "BossRebornNeedPoint"     #boss复活需要总点数
 Def_WorldKey_CrossBossIsAlive = 'CrossBossIsAlive_%s_%s'     #跨服boss是否活着,参数(zoneID, bossID)
-Def_WorldKey_IsGameWorldInit = 'IsGameWorldInit'             #GameWold是否初始化完成
+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)
@@ -533,6 +533,7 @@
                                 ShareDefine.Def_UniversalGameRecType_DujieHelpAllRecord:500,   #渡劫副本护法总记录
                                 ShareDefine.Def_UniversalGameRecType_DujieHelpRecord:10000,   #渡劫副本护法详细记录
                                 ShareDefine.Def_UniversalGameRecType_ZhuXianBossRecord:100,   #诛仙BOSS结算记录
+                                ShareDefine.Def_UniversalGameRecType_LuckyTreasure:5,   #幸运鉴宝记录
                               }
 #---------------------------------------------------------------------
 #比较标识
@@ -581,21 +582,10 @@
             ShareDefine.Def_BT_Campaign_GodWeaponLV     : 100,           #神兵等级(开服活动榜)
             ShareDefine.Def_BT_Campaign_Recharge        : 100,           #累计充值(开服活动榜)
             ShareDefine.Def_BT_Campaign_PetLV           : 100,           #灵宠等级(开服活动榜)  
+            ShareDefine.Def_BT_Campaign_LingGen         : 100,           #灵根总点(开服活动榜)  
             ShareDefine.Def_BT_FCCostGold               : 5,             #消费排行榜(仙界盛典)
+            ShareDefine.Def_BT_NewFCCostGold            : 5,             #消费排行榜(仙界盛典)
             ShareDefine.Def_BT_FBHelpBattle             : 100,           #助战次数榜
-            ShareDefine.Def_BT_ZhuXianTower             : 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,            #消费特惠排行榜上一期
             }
 
 #排行榜保存类型(和BillboardType匹配), 默认保存, 如果不保存,可配置进去
@@ -625,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'  # 玩家答题连续正确数量
 
@@ -642,8 +631,6 @@
 Def_PlayerKey_MergeRegisterRoomID = "MergeRegisterRoomID"  #当前上传数据的roomID
 Def_PlayerKey_IsLoginToMergeServer = "IsLoginToMergeServer"  #是否要登陆跨服服务器
 Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching"  #是否跨服匹配中
-
-Def_PlayerKey_FreshmanGuiderDay = "FreshmanGuiderDay"  #新手指导员天数
 
 Def_PlayerKey_PlayerFromPID = "PlayerFromPID"  #pid
 
@@ -678,6 +665,8 @@
 Def_FBMapID_XMZZ = 31010
 #仙盟boss副本
 Def_FBMapID_FamilyBossMap = 31210
+#多仙盟Boss
+Def_FBMapID_AllFamilyBoss = 31260
 #宗门试炼
 Def_FBMapID_MunekadoTrial = 60010
 #混乱妖域
@@ -688,14 +677,37 @@
 Def_FBMapID_CrossRealmPK = 32010
 #跨服蓬莱仙境
 Def_FBMapID_CrossPenglai = 32020
+#跨服妖王
+Def_FBMapID_CrossDemonKing = 32030
+#本服妖王
+Def_FBMapID_DemonKing = 22030
+#骑宠Boss
+Def_FBMapID_HorsePetBoss = 31200
+#跨服灵草园
+Def_FBMapID_CrossGrasslandLing = 32040
+#跨服仙草园
+Def_FBMapID_CrossGrasslandXian = 32050
 
 #需要刷世界BOSS的副本
-WorldBossFBMapIDList = [Def_FBMapID_SealDemon, Def_FBMapID_ZhuXianBoss]
+WorldBossFBMapIDList = [Def_FBMapID_SealDemon, Def_FBMapID_ZhuXianBoss, Def_FBMapID_DemonKing]
 #跨服地图
-Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai]
-#跨服对应分区配置表名
-Def_CrossZoneTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZone",
-                          }
+Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
+#跨服分区类型配置, 没配置的默认 CrossZoneComm
+Def_CrossZoneTypeName = {0:"CrossZoneComm", # 特殊0,默认常规分区
+                         Def_FBMapID_CrossPenglai:"CrossZoneComm",
+                         Def_FBMapID_CrossRealmPK:"CrossZonePK",
+                         Def_FBMapID_CrossDemonKing:"CrossZonePK",
+                         Def_FBMapID_CrossGrasslandLing:"CrossZonePK",
+                         Def_FBMapID_CrossGrasslandXian:"CrossZonePK",
+                         }
+#跨服分区对应地图配置表名 - 仅适用于固定地图及虚拟分线的跨服玩法
+Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
+                             }
+#需要动态分配线路的跨服地图
+Def_CrossDynamicLineMap = [Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
+
+#需要统计副本功能线路ID人数的跨服地图
+Def_NeedCountFBFuncLinePlayerCrossMap = [Def_FBMapID_CrossDemonKing]
 
 #同系职业枚举
 JOB_TYPY_COUNT = 5
@@ -721,12 +733,6 @@
 
 # 邮件(补偿)默认发件人, 具体做活动再定
 Def_Mail_SenderSys = "SenderSys"    # 默认邮件发送人
-
-# 邮件类型划分,用于每种类型的保存上限
-(
-Mail_Type_Default,
-Mail_Type_Market,
-) = range(2)
 
 # 竖杠
 Def_Str_Montant = "|"
@@ -798,3 +804,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