From 2a54477d35896bd3f1bd6f48e222a438034a11b9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 27 十二月 2021 12:28:44 +0800
Subject: [PATCH] 5323 【主干】【后端】法器自动培养问题(自动购买支持按指定的商城表商品标识ID购买)

---
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index ef72280..7a8650d 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -369,7 +369,7 @@
 Def_WorldKey_BossIsAlive = 'BossIsAlive_%s'                  #boss是否活着
 Def_WorldKey_IsGameWorldInit = 'IsGameWorldInit'             #GameWold是否初始化完成
 Def_WorldKey_BossIsGeTui = "BossGeTui%s"                     #当前复活通知
-Def_WorldKey_OperationActionState = "OperationActState_%s"   #运营活动状态,参数为运营活动名
+Def_WorldKey_OperationActionState = "State_%s"               #运营活动状态,参数为(运营活动名)
 Def_WorldKey_BossRebornNeedPoint = "BossRebornNeedPoint"     #boss复活需要总点数
 Def_WorldKey_CrossBossIsAlive = 'CrossBossIsAlive_%s_%s'     #跨服boss是否活着,参数(zoneID, bossID)
 Def_WorldKey_GameWorldInitOK = 'GameWorldInitOK'             #GameWold是否初始化完成OK
@@ -591,6 +591,10 @@
             ShareDefine.Def_BT_NewFCCostGold            : 5,             #消费排行榜(仙界盛典)
             
             ShareDefine.Def_BT_Arena                    : 1000,          #竞技场榜
+            ShareDefine.Def_BT_Environment              : 20,            #环保榜 (垃圾分类活动)
+            ShareDefine.Def_BT_CharmTotal               : 100,           #魅力总榜
+            ShareDefine.Def_BT_CharmWeek                : 100,           #魅力周榜
+            ShareDefine.Def_BT_CharmDay                 : 100,           #魅力日榜
             }
 
 #排行榜保存类型(和BillboardType匹配), 默认保存, 如果不保存,可配置进去
@@ -686,6 +690,8 @@
 Def_FBMapID_CrossRealmPK = 32010
 #跨服蓬莱仙境
 Def_FBMapID_CrossPenglai = 32020
+#跨服魔化之地
+Def_FBMapID_CrossDemonLand = 32080
 #跨服妖王
 Def_FBMapID_CrossDemonKing = 32030
 #本服妖王
@@ -696,14 +702,17 @@
 Def_FBMapID_CrossGrasslandLing = 32040
 #跨服仙草园
 Def_FBMapID_CrossGrasslandXian = 32050
+#情缘副本
+Def_FBMapID_Love = 31300
 
 #需要刷世界BOSS的副本
 WorldBossFBMapIDList = [Def_FBMapID_SealDemon, Def_FBMapID_ZhuXianBoss, Def_FBMapID_DemonKing]
 #跨服地图
-Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
+Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonLand, Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
 #跨服分区类型配置, 没配置的默认 CrossZoneComm
 Def_CrossZoneTypeName = {0:"CrossZoneComm", # 特殊0,默认常规分区
                          Def_FBMapID_CrossPenglai:"CrossZoneComm",
+                         Def_FBMapID_CrossDemonLand:"CrossZoneComm",
                          Def_FBMapID_CrossRealmPK:"CrossZonePK",
                          Def_FBMapID_CrossDemonKing:"CrossZonePK",
                          Def_FBMapID_CrossGrasslandLing:"CrossZonePK",
@@ -711,6 +720,7 @@
                          }
 #跨服分区对应地图配置表名 - 仅适用于固定地图及虚拟分线的跨服玩法
 Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
+                             Def_FBMapID_CrossDemonLand:"CrossDemonLandZoneMap",
                              }
 #需要动态分配线路的跨服地图
 Def_CrossDynamicLineMap = [Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
@@ -751,13 +761,14 @@
 Def_Online = 1
 Def_OnlineNoClient = 2
 
-# 分组 1 最近联系人 2 好友 3 仇人 4 黑名单
+# 分组 1 最近联系人 2 好友 3 仇人 4 黑名单 5 亲密
 (
 Def_SocialGroup_Contacts,
 Def_SocialGroup_Friend,
 Def_SocialGroup_Enemy,
 Def_SocialGroup_Black,
-) = range(1, 5)
+Def_SocialGroup_Intimacy,
+) = range(1, 6)
 
 Def_CDBPlayerRefresh_Online = "OnlineType"
 

--
Gitblit v1.8.0