From ac448ba660cafdba69ca409b45942dbad57f5732 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 09 十月 2020 16:40:43 +0800
Subject: [PATCH] 8533 【BT】【后端】宗门试炼助战修(增加可配置至多机器人人数、是否出现非社交关系玩家)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |   87 +++++++++++++++++++++++++++----------------
 1 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 2b7a31f..29e074b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -146,6 +146,7 @@
 Def_Notify_WorldKey_MapServerScriptReloadVersion = 'MapServerScriptReloadVersion'  # MapServer 脚本重读版本标记
 Def_Notify_WorldKey_InitGameWorldTime = "InitGameWorldTime"  #启动服务器时间
 Def_Notify_WorldKey_OperationActionInfo = "OperationActionInfo_%s" # 运营活动信息,参数为运营活动名
+Def_Notify_WorldKey_ActionBossRebornSign = "ActBossSign_%s" # 活动boss重生标记,参数为日常活动ID 或 运营活动名
 Def_Notify_WorldKey_DailyActionState = "DailyActionState_%s" # 日常活动状态,参数为日常活动ID
 Def_Notify_WorldKey_CrossDailyActionState = "CrossDailyActionState_%s" # 跨服日常活动状态,参数为日常活动ID
 Def_Notify_WorldKey_FBEnterTimeLimiitMapID = "FBEnterTimeLimiitMapID" # 进入副本有时间限制的地图ID列表
@@ -204,6 +205,7 @@
 OperationActionName_SpringSale = "ActSpringSale" # 限时特惠活动
 OperationActionName_BossReborn = "ActBossReborn" # BOSS复活活动
 OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
+OperationActionName_DailyGiftbag = "ActDailyGiftbag" # 每日礼包活动
 OperationActionName_FairyCeremony = "ActFairyCeremony" # 仙界盛典活动
 OperationActionName_NewFairyCeremony = "ActNewFairyCeremony" # 仙界盛典活动
 OperationActionName_RealmPoint = "ActRealmPoint" # 多倍修行点活动
@@ -216,6 +218,7 @@
 OperationActionName_FeastRedPacket = "ActFeastRedPacket" # 节日红包活动
 OperationActionName_FeastCollectWords = "ActFeastCollectWords" # 节日集字活动
 OperationActionName_LuckyTreasure = "ActLuckyTreasure" # 幸运鉴宝活动
+OperationActionName_RechargePrize = "ActRechargePrize" # 充值返利活动
 #节日活动类型列表 - 该类型无视开服天,日期到了就开启
 FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket, OperationActionName_FeastCollectWords]
 #所有的运营活动列表,含节日活动
@@ -225,7 +228,8 @@
                            OperationActionName_RealmPoint, OperationActionName_FlashSale,
                            OperationActionName_WishingWell, OperationActionName_TotalRecharge, 
                            OperationActionName_WeekParty, OperationActionName_LoginAward, 
-                           OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure] \
+                           OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure,
+                           OperationActionName_DailyGiftbag, OperationActionName_RechargePrize] \
                            + FeastOperationActionNameList
 #需要记录开启活动时的世界等级的运营活动
 NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
@@ -279,8 +283,9 @@
     Def_ViewExpType_Sys        ,            #系统给经验-需要展示倍率,实际不享受 5
     Def_ViewExpType_RealmBuff,              #境界全服福利经验(玄女天花) 6
     Def_ViewExpType_SysEx,                  #系统给经验-不需要展示倍率 用来区别于类型0 7
-    Def_ViewExpType_LYZS,                   #烈焰战神 特殊特效
-) = range(0, 9)
+    Def_ViewExpType_LYZS,                   #烈焰战神 特殊特效 8
+    Def_ViewExpType_Activity,               #活跃吸纳 9
+) = range(0, 10)
 
 
 #物品相关操作类型
@@ -633,8 +638,8 @@
     Def_BT_Realm,                             #境界榜
     Def_BT_TotalRecharge,                     #充值排行榜 10
     
-    Def_BT_Campaign_PlusLV,                   #强化等级(开服活动榜)
-    Def_BT_Campaign_HorseLV,                  #坐骑等级(开服活动榜)
+    Def_BT_Campaign_Plus,                     #强化战力(开服活动榜)
+    Def_BT_Campaign_Horse,                    #坐骑战力(开服活动榜)
     Def_BT_Campaign_StoneLV,                  #宝石等级(开服活动榜)
     Def_BT_Campaign_LV,                       #冲级排行(开服活动榜)
     Def_BT_Campaign_RealmLV,                  #境界等级(开服活动榜) 15
@@ -650,9 +655,12 @@
     Def_BT_NewFCCostGold,                     #消费排行榜(新仙界盛典)
     Def_BT_Campaign_LingGen,                  #灵根总点(开服活动榜)
     Def_BT_Campaign_StarLV,                   #升星等级(开服活动榜) 25
+    Def_BT_Campaign_Wash,                     #洗练战力(开服活动榜)
+    
+    Def_BT_SkyTower,                          #天星塔榜
     
     Def_BT_Max,                               #排行榜最大类型
-) = range(0, 25 + 2) 
+) = range(0, 27 + 2) 
     
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -664,6 +672,7 @@
 #排行榜Value1存储境界信息的榜单列表
 BTValue1_OfficialRankList = [Def_BT_FightPower, Def_BT_FightPower_Warrior, Def_BT_FightPower_Wizard, Def_BT_FightPower_Assassin, 
                              Def_BT_LV, Def_BT_FightPower_Horse, Def_BT_FightPower_Pet, Def_BT_TrialTower, Def_BT_OffLineEfficient,
+                             Def_BT_SkyTower,
                              ]
 
 ##---比率---
@@ -1043,7 +1052,7 @@
                                 Def_UniversalGameRecType_YesterdayPlayerLVInfo,#昨日活跃玩家等级信息7
                                 Def_UniversalGameRecType_StoreServerCntRecord,  #商店全服购买记录 8,
                                 Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
-                                Def_UniversalGameRecType_10,
+                                Def_UniversalGameRecType_SkyTowerPassPlayer, #天星塔过关玩家记录10
                                 Def_UniversalGameRecType_ZhuXianBossRecord, #诛仙BOSS结算记录11
                                 Def_UniversalGameRecType_LuckyTreasure, #幸运鉴宝大奖记录12
                                 Def_UniversalGameRecType_FairyDomain, #缥缈仙域事件次数记录13
@@ -1177,8 +1186,8 @@
 
 # 开服活动类型标识, 不可超过32
 Def_Campaign_Type_List = (
-Def_Campaign_Type_PlusLV,           # 强化等级排行 1
-Def_Campaign_Type_HorseLV,          # 坐骑等级排行 2
+Def_Campaign_Type_Plus,             # 强化战力排行 1
+Def_Campaign_Type_Horse,            # 坐骑战力排行 2
 Def_Campaign_Type_StoneLV,          # 宝石等级排行 3
 Def_Campaign_Type_LV,               # 冲级等级排行 4
 Def_Campaign_Type_RealmLV,          # 境界等级排行 5
@@ -1189,12 +1198,13 @@
 Def_Campaign_Type_PetLV,            # 灵宠等级排行 10
 Def_Campaign_Type_LingGen,          # 灵根点数排行 11
 Def_Campaign_Type_StarLV,           # 升星等级排行 12
-) = range(1, 1 + 12)
+Def_Campaign_Type_Wash,             # 洗练战力排行 13
+) = range(1, 1 + 13)
 
 # 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
 Def_Campaign_Billboard_Dict = {
-                               Def_Campaign_Type_PlusLV:Def_BT_Campaign_PlusLV,
-                               Def_Campaign_Type_HorseLV:Def_BT_Campaign_HorseLV,
+                               Def_Campaign_Type_Plus:Def_BT_Campaign_Plus,
+                               Def_Campaign_Type_Horse:Def_BT_Campaign_Horse,
                                Def_Campaign_Type_StoneLV:Def_BT_Campaign_StoneLV,
                                Def_Campaign_Type_LV:Def_BT_Campaign_LV,
                                Def_Campaign_Type_RealmLV:Def_BT_Campaign_RealmLV,
@@ -1205,6 +1215,7 @@
                                Def_Campaign_Type_PetLV:Def_BT_Campaign_PetLV,
                                Def_Campaign_Type_LingGen:Def_BT_Campaign_LingGen,
                                Def_Campaign_Type_StarLV:Def_BT_Campaign_StarLV,
+                               Def_Campaign_Type_Wash:Def_BT_Campaign_Wash,
                                }
 
 #队伍最大人数
@@ -1513,7 +1524,7 @@
 SuccType_KirinHomeEx, #通关麒麟之府X次成就7
 SuccType_GodWeapon, # x神器达到X级成就8
 SuccType_XXX9, # 废弃9
-SuccType_HorseAllLV, # X坐骑等级达到XX级 10
+SuccType_HorseAllLV, # 坐骑等级达到X级 10
 SuccType_XXX11, # 废弃11
 SuccType_KillBossHomeBoss, # BOSS之家BOSS击杀成就12
 SuccType_XXX13, # 废弃13
@@ -1529,8 +1540,8 @@
 SuccType_XXX23 , # 废弃23
 SuccType_XXX24 , # 废弃24
 SuccType_XXX25, # 废弃25
-SuccType_EquipPlus, # 强化x次成就26
-SuccType_EquipPlusLV, # x件装备强化等级达到x级27 (已废弃)
+SuccType_EquipPlus, # x件x阶x强化等级 26
+SuccType_XXX27, # 废弃27
 SuccType_KillWorldBoss, # 击杀世界bossx次成就(有伤害就算)28
 SuccType_XXX29, # 废弃29
 SuccType_PassWagicWeapon, # 通关法宝副本30
@@ -1541,8 +1552,8 @@
 SuccType_Pray, # 祈祷x次35
 SuccType_KillSpecificNPC, # 击杀特定NPC36
 SuccType_XXX37, # 废弃37
-SuccType_XXX38, # 废弃38
-SuccType_EquipColorItem, #穿戴某阶某品质的装备成就39
+SuccType_EquipPlace, # x件x阶x部位 38
+SuccType_EquipColorItem, # x件x阶x品质 39
 SuccType_XXX40, #废弃40
 SuccType_XXX41, #废弃41
 SuccType_PassRuneTower, #通关符印塔成就42
@@ -1573,9 +1584,9 @@
 SuccType_ChaosDemon, #混乱妖域X人以上队伍X评级通关67
 SuccType_XXX68, #废弃68
 SuccType_CompoundItemEx, #物品X的合成成功X次69
-SuccType_EquipWashLV1, #武器洗练X级(主手+副手)70
-SuccType_EquipWashLV2, #防具洗练X级(防具5件)71
-SuccType_EquipWashLV3, #仙器洗练X级(仙器3件)72
+SuccType_EquipWash, #x件x阶x洗练等级 70
+SuccType_XXX71, #废弃71
+SuccType_XXX72, #废弃72
 SuccType_XXX73, #废弃73
 SuccType_XXX74, #废弃74
 SuccType_XXX75, #废弃75
@@ -1585,17 +1596,17 @@
 SuccType_DujieFBHelpPass, #渡劫助战成功X次 79
 SuccType_XXX80, #废弃 80
 SuccType_FBEncourage, #x副本累计鼓舞X次 81
-SuccType_EquipArmor, #穿戴X颜色X星级X阶防具一套(5件防具) 82
-SuccType_EquipWeapon, #穿戴X颜色X星级X阶武器一套(主手+副手) 83
+SuccType_EquipStar, #x件x阶x星 82
+SuccType_XXX83, #废弃 83
 SuccType_XXX84, #废弃 84
 SuccType_XXX85, #废弃85
 SuccType_XXX86, #废弃 86
 SuccType_XXX87, #废弃 87
 SuccType_XXX88, #废弃 88
-SuccType_XXX89, #仙盟宴会答题X题 89
-SuccType_EquipWing, #穿戴X阶X品质羽翼 90
+SuccType_XXX89, #废弃 89
+SuccType_XXX90, #废弃 90
 SuccType_MWSkillUp, #X法宝潜力技能提升X级 91
-SuccType_EquipSuit, #套装 X件X阶普通(强化)防具套装 92
+SuccType_EquipSuit, # X件X阶套装 92
 SuccType_TalkFamily, # 仙盟频道发言93
 SuccType_UseItem, # 使用X物品X次94
 SuccType_XXX95, # 废弃95
@@ -1646,7 +1657,8 @@
 SuccType_FeastRedPack_Dice, # 节日红包 - 天机摇骰子x次  140
 SuccType_FeastRedPack_CrossPK, # 节日红包 - 跨服PK x次  141
 SuccType_FeastRedPack_FBSweep, # 节日红包 - 副本扫荡 x次  142
-) = range(1, 143)
+SuccType_PassSkyTower, #通关天星塔 143
+) = range(1, 144)
 
 # 节日红包成就类型
 FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
@@ -1656,17 +1668,28 @@
 
 # 不向下适配检查的成就类型(指相对较高成就条件不会增加较低成就条件的进度)
 UnDownCheckSuccessTypeList = [
-                              SuccType_EquipPlusLV, SuccType_GodWeapon,
+                              SuccType_GodWeapon,
                               SuccType_MainTaskNode,SuccType_PassWagicWeapon,
                               SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
                               SuccType_Pray,SuccType_PetClassLV,
-                              SuccType_HorseAllLV, SuccType_QueenRelics,SuccType_XMZZConWin,
-                              SuccType_EquipSuit,SuccType_Collect,SuccType_DogzBattle,
+                              SuccType_QueenRelics,SuccType_XMZZConWin,
+                              SuccType_Collect,SuccType_DogzBattle,
                               SuccType_UseItem,SuccType_FamilyTechLV,
                               SuccType_GetSpecialItem,SuccType_GetMagicWeapon,SuccType_FBEncourage,SuccType_XBXZ,
                               SuccType_FeastRedPack_KillSpecificNPC,SuccType_FeastRedPack_KillBoss,
                               SuccType_FeastRedPack_EnterMap, SuccType_FeastRedPack_FBSweep,
                               ]
+
+# 部分参数不向下适配检查的成就类型,此配置的类型不能在 UnDownCheckSuccessTypeList 里 {类型:[不向下适配的参数索引, ...], ...}
+PartUnDownCheckSuccessTypeInfo = {
+                                  SuccType_EquipSuit:[0], # 阶不向下适配
+                                  SuccType_EquipPlace:[0,1], # 阶、部位不向下适配
+                                  SuccType_EquipColorItem:[0], # 阶不向下适配
+                                  SuccType_EquipPlus:[0], # 阶不向下适配
+                                  SuccType_EquipWash:[0], # 阶不向下适配
+                                  SuccType_EquipStar:[0], # 阶不向下适配
+                                  }
+
 #传进来的条件满足配置的条件列表中的一个就行的成就类型
 ContainSuccessTypeList = [SuccType_CompoundItemEx, SuccType_PickUpItem, SuccType_MWSkillUp]
 
@@ -1675,9 +1698,9 @@
 
 #增加进度前需要重置的成就类型
 NeedResetSuccessTypeList = [
-                            SuccType_InlayStone1,SuccType_InlayStone2,SuccType_EquipSuit,SuccType_InlayRune,
-                            SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,SuccType_DogzEquipPlus,
-                            SuccType_HorseAllLV, SuccType_EquipPlusLV,SuccType_PetClassLV,SuccType_InlayGatherSoul,
+                            SuccType_InlayStone1,SuccType_InlayStone2,SuccType_InlayRune,
+                            SuccType_DogzEquipPlus,
+                            SuccType_PetClassLV,SuccType_InlayGatherSoul,
                             ]
 
 # 聊天类型, 从100开始, 前100个给c++用

--
Gitblit v1.8.0