From 82671ac68b8f6e6902b067e4aad8705812be2393 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 25 十二月 2023 14:45:10 +0800
Subject: [PATCH] 3191 删除推送

---
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py |   43 +++++++++++++++++++++++++++++++------------
 1 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index 8449223..dcf9430 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -315,8 +315,6 @@
 TYPE_WorldBossOnlineCntTick = 26  # 定时世界BOSS刷新时间计算 在线玩家数量
 TYPE_TimeShopProcessTick = 27  # 定时商店处理间隔
 TYPE_WorldBossProcessTick = 28  # BOSS重生检查间隔
-TYPE_WorldBossGeTuiTick = 29  # BOSS个推
-TYPE_WorldNewGuyGeTuiTick = 30  # 低级新玩家离开5分钟后唤回
 
 TYPE_Tick_Time = [
                   1000 * 60 * 3 ,  #0 查看地图的活动人数 3分钟/次 
@@ -348,8 +346,6 @@
                   1000 * 60 * 5     ,  #26 定时世界BOSS刷新时间计算 在线玩家数量
                   1000 * 60     ,  #27 定时商店处理间隔
                   1000 * 1     ,  #28 BOSS重生检查间隔
-                  1000*45,      #29 BOSS个推
-                  1000*60,      #30 低级新玩家离开5分钟后唤回
                  ]
 
 TYPE_Tick_Count = len(TYPE_Tick_Time)
@@ -368,7 +364,6 @@
 Def_WorldKey_ExamSendSubjectCnt = 'ExamSendSubjectCnt'       #当前发题总数
 Def_WorldKey_BossIsAlive = 'BossIsAlive_%s'                  #boss是否活着
 Def_WorldKey_IsGameWorldInit = 'IsGameWorldInit'             #GameWold是否初始化完成
-Def_WorldKey_BossIsGeTui = "BossGeTui%s"                     #当前复活通知
 Def_WorldKey_OperationActionState = "State_%s"               #运营活动状态,参数为(运营活动名)
 Def_WorldKey_BossRebornNeedPoint = "BossRebornNeedPoint"     #boss复活需要总点数
 Def_WorldKey_CrossBossIsAlive = 'CrossBossIsAlive_%s_%s'     #跨服boss是否活着,参数(zoneID, bossID)
@@ -592,8 +587,10 @@
             
             ShareDefine.Def_BT_Arena                    : 1000,          #竞技场榜
             ShareDefine.Def_BT_Environment              : 20,            #环保榜 (垃圾分类活动)
-            ShareDefine.Def_BT_Charm                    : 100,           #魅力总榜
+            ShareDefine.Def_BT_CharmTotal               : 100,           #魅力总榜
+            ShareDefine.Def_BT_CharmWeek                : 100,           #魅力周榜
             ShareDefine.Def_BT_CharmDay                 : 100,           #魅力日榜
+            ShareDefine.Def_BT_BossTrialSubmit          : 1000,          #boss凭证 (boss历练活动)
             }
 
 #排行榜保存类型(和BillboardType匹配), 默认保存, 如果不保存,可配置进去
@@ -652,9 +649,6 @@
 Def_ForbiddenTalk = "ForbiddenTalk"   # 禁言
 Def_TalkTick = "ForbiddenTalk"   # 聊天间隔
 
-Def_PDict_GeTuiSet = "GetuiSet"     # 推送提醒的设置
-Def_PDict_NoGeTuiTime = "NoGetuiTime"     # 推送提醒免打扰时间,将字符串组合数字
-
 Def_PlayerKey_ViewCrossPKBillboardTick = "ViewCrossPKBillboardTick_%s_%s"  #查询PK排行榜tick,参数(zoneID, seasonID)
 
 #主城地图、缥缈宗
@@ -687,8 +681,12 @@
 Def_FBMapID_QueenRelics = 51010
 #跨服竞技场
 Def_FBMapID_CrossRealmPK = 32010
+#跨服排位
+Def_FBMapID_CrossChampionship = 32070
 #跨服蓬莱仙境
 Def_FBMapID_CrossPenglai = 32020
+#跨服魔化之地
+Def_FBMapID_CrossDemonLand = 32080
 #跨服妖王
 Def_FBMapID_CrossDemonKing = 32030
 #本服妖王
@@ -699,21 +697,29 @@
 Def_FBMapID_CrossGrasslandLing = 32040
 #跨服仙草园
 Def_FBMapID_CrossGrasslandXian = 32050
+#跨服战场
+Def_FBMapID_CrossBattlefield = 32060
+#情缘副本
+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",
                          Def_FBMapID_CrossGrasslandXian:"CrossZonePK",
+                         Def_FBMapID_CrossBattlefield:"CrossZonePK",
+                         Def_FBMapID_CrossChampionship:"CrossZonePK",
                          }
 #跨服分区对应地图配置表名 - 仅适用于固定地图及虚拟分线的跨服玩法
 Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
+                             Def_FBMapID_CrossDemonLand:"CrossDemonLandZoneMap",
                              }
 #需要动态分配线路的跨服地图
 Def_CrossDynamicLineMap = [Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
@@ -754,13 +760,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"
 
@@ -849,3 +856,15 @@
 Def_GiveMoney_AuctionBidReturn, #拍卖竞价返还
 Def_GiveMoney_AuctionGain, #拍卖获得利润
 ) = range(1000, 1000 + 29)
+
+Def_ItemID_GoldMoney = 20               # 直接给仙玉
+Def_ItemID_GoldPaper = 30               # 直接给绑玉/灵石
+Def_ItemID_SilverPaper = 500               # 直接给金票物品
+Def_ItemID_GongdePoint = 530               # 直接给功德点
+# 货币类型对应直接给货币物品ID
+MoneyItemIDDict = {IPY_GameServer.TYPE_Price_Gold_Money:Def_ItemID_GoldMoney,
+                   IPY_GameServer.TYPE_Price_Gold_Paper:Def_ItemID_GoldPaper,
+                   IPY_GameServer.TYPE_Price_Silver_Paper:Def_ItemID_SilverPaper,
+                   ShareDefine.TYPE_Price_GongdePoint:Def_ItemID_GongdePoint,
+                   }
+

--
Gitblit v1.8.0