From 1ea23ac831a440e8eb302b199ab1abdadfec184c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 11 四月 2024 16:30:49 +0800
Subject: [PATCH] 10019 【砍树】回合战斗(增加buff被动效果ID 4543、4544、4545、4546;) 1. 增加buff被动效果ID4543: 被暴击附加额外伤害百分比; 2. 增加buff被动效果ID4544: 触发时减少buff层数; 3. 增加buff被动效果ID4545: 灵宠技能释放成功触发技能; 4. 增加buff被动效果ID4546: 灵宠释放技能后触发删除本buff; 5. 技能被动效果ID 5000,支持每X回合配置; 6. buff替换方式增加方式3 - 只取最高,相同或低级的则不处理,减少长时buff无用的重复添加逻辑;

---
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py |   68 +++++++++++++++++++++++++++-------
 1 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index 75616d2..8b88d59 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -58,6 +58,12 @@
     ##获取服务器根路径
     return GameServerPath.split("CoreServerGroup")[0]
 
+def GetSizeof(o, isAsize=True):
+    return 0
+    #if isAsize:
+    #    return asizeof.asizeof(o)
+    #return sys.getsizeof(0)
+    
 #------主角相关设定
 #主角发型列表 [职业:发型列表]
 Def_RoleHair = {
@@ -315,8 +321,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 +352,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,8 +370,7 @@
 Def_WorldKey_ExamSendSubjectCnt = 'ExamSendSubjectCnt'       #当前发题总数
 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
@@ -534,6 +535,7 @@
                                 ShareDefine.Def_UniversalGameRecType_DujieHelpRecord:10000,   #渡劫副本护法详细记录
                                 ShareDefine.Def_UniversalGameRecType_ZhuXianBossRecord:100,   #诛仙BOSS结算记录
                                 ShareDefine.Def_UniversalGameRecType_LuckyTreasure:5,   #幸运鉴宝记录
+                                ShareDefine.Def_UniversalGameRecType_FeastWish:30,   #节日祝福大奖记录
                               }
 #---------------------------------------------------------------------
 #比较标识
@@ -568,12 +570,13 @@
             ShareDefine.Def_BT_FightPower_Horse         : 100,           #坐骑战斗力总榜
             ShareDefine.Def_BT_FightPower_Pet           : 100,           #宠物总战力榜
             ShareDefine.Def_BT_TrialTower               : 100,           #天神之塔榜
+            ShareDefine.Def_BT_SkyTower                 : 100,           #天星塔榜
             ShareDefine.Def_BT_OffLineEfficient         : 100,           #脱机效率榜
             ShareDefine.Def_BT_Realm                    : 100,           #境界榜
             ShareDefine.Def_BT_TotalRecharge            : 100,           #充值榜
             
-            ShareDefine.Def_BT_Campaign_PlusLV          : 100,           #强化等级(开服活动榜)
-            ShareDefine.Def_BT_Campaign_HorseLV         : 100,           #坐骑等级(开服活动榜)  
+            ShareDefine.Def_BT_Campaign_Plus            : 100,           #强化战力(开服活动榜)
+            ShareDefine.Def_BT_Campaign_Horse           : 100,           #坐骑战力(开服活动榜)  
             ShareDefine.Def_BT_Campaign_StoneLV         : 100,           #宝石等级(开服活动榜)
             ShareDefine.Def_BT_Campaign_LV              : 100,           #冲级排行(开服活动榜)
             ShareDefine.Def_BT_Campaign_RealmLV         : 100,           #境界等级(开服活动榜)
@@ -584,8 +587,16 @@
             ShareDefine.Def_BT_Campaign_PetLV           : 100,           #灵宠等级(开服活动榜)  
             ShareDefine.Def_BT_Campaign_LingGen         : 100,           #灵根总点(开服活动榜)  
             ShareDefine.Def_BT_Campaign_StarLV          : 100,           #升星等级(开服活动榜)  
+            ShareDefine.Def_BT_Campaign_Wash            : 100,           #洗练战力(开服活动榜)
             ShareDefine.Def_BT_FCCostGold               : 5,             #消费排行榜(仙界盛典)
             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,           #魅力日榜
+            ShareDefine.Def_BT_BossTrialSubmit          : 1000,          #boss凭证 (boss历练活动)
             }
 
 #排行榜保存类型(和BillboardType匹配), 默认保存, 如果不保存,可配置进去
@@ -644,9 +655,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)
 
 #主城地图、缥缈宗
@@ -673,12 +681,18 @@
 Def_FBMapID_MunekadoTrial = 60010
 #混乱妖域
 Def_FBMapID_ChaosDemon = 31180
+#讨伐妖魔
+Def_FBMapID_KillDevil = 31280
 #娲皇遗迹
 Def_FBMapID_QueenRelics = 51010
 #跨服竞技场
 Def_FBMapID_CrossRealmPK = 32010
+#跨服排位
+Def_FBMapID_CrossChampionship = 32070
 #跨服蓬莱仙境
 Def_FBMapID_CrossPenglai = 32020
+#跨服魔化之地
+Def_FBMapID_CrossDemonLand = 32080
 #跨服妖王
 Def_FBMapID_CrossDemonKing = 32030
 #本服妖王
@@ -689,21 +703,34 @@
 Def_FBMapID_CrossGrasslandLing = 32040
 #跨服仙草园
 Def_FBMapID_CrossGrasslandXian = 32050
+#跨服战场
+Def_FBMapID_CrossBattlefield = 32060
+#情缘副本
+Def_FBMapID_Love = 31300
+
+#回合战斗自定义地图ID
+TurnFightMapIDList = (
+Def_TFMapID_MineArea, # 福地 1
+) = range(1, 1 + 1)
 
 #需要刷世界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]
@@ -744,13 +771,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"
 
@@ -839,3 +867,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