From c63ffd10aecb12b2e09dae603cf9a0f824f6482c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 10 十二月 2025 15:46:15 +0800
Subject: [PATCH] 16 卡牌服务端（合成目标物品与材料物品不在同一背包时支持合成；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 98 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 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 3ec5a8f..6b54ecd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -40,6 +40,8 @@
Def_InitOpenServerTime = 'InitOpenServerTime'
Def_SetOpenServerTime = 'SetOpenServerTime' # GM工具预定的开服时间
+
+Def_OSAAwardState = 'OSAAwardState' #开服冲榜活动结算状态
# ------------------------- WorldKey -------------------------
#---奇迹, 职业枚举定义---
@@ -62,8 +64,9 @@
#支持超20亿数值的数值点单位数值, 1亿
Def_PerPointValue = 100000000
-#真实玩家ID、仙盟ID是从 1000000 开始
-RealPlayerIDStart = 1000000
+#真实玩家起始ID
+RealPlayerIDStart = 3000000
+#真实公会起始ID
RealFamilyIDStart = 1000000
#机器人ID - 供功能用，线上版本支持的机器人
@@ -252,7 +255,6 @@
OperationActionName_ExpRate = "ActExpRate" # 多倍经验活动
OperationActionName_CostRebate = "ActCostRebate" # 消费返利活动
OperationActionName_SpringSale = "ActSpringSale" # 限时特惠活动
-OperationActionName_BossReborn = "ActBossReborn" # BOSS复活活动
OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
OperationActionName_DailyGiftbag = "ActDailyGiftbag" # 每日礼包活动
OperationActionName_FairyCeremony = "ActFairyCeremony" # 仙界盛典活动
@@ -291,7 +293,7 @@
]
#所有的运营活动列表，含节日活动
OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate,
- OperationActionName_BossReborn,OperationActionName_SpringSale,
+ OperationActionName_SpringSale,
OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
OperationActionName_RealmPoint, OperationActionName_FlashSale,
OperationActionName_WishingWell, OperationActionName_TotalRecharge,
@@ -310,7 +312,7 @@
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell,
OperationActionName_NewFairyCeremony, OperationActionName_FlashSale,
- OperationActionName_BossReborn, OperationActionName_TotalRecharge,
+ OperationActionName_TotalRecharge,
OperationActionName_CostRebate, OperationActionName_FlashGiftbag,
OperationActionName_SpringSale, OperationActionName_LuckyTreasure,
OperationActionName_DailyGiftbag, OperationActionName_GrowupBuy,
@@ -429,7 +431,9 @@
Def_BT_MainLevel, # 主线关卡过关榜 0
Def_BT_Arena, # 演武场积分周榜 1
Def_BT_Tianzi, # 天子考验伤害榜 2
-) = range(0, 3)
+Def_BT_OSA_MainLevel, # 开服关卡榜 3
+Def_BT_OSA_HeroCall, # 开服招募榜 4
+) = range(0, 5)
''' 跨服排行榜类型, 从 150 开始，最大条数在功能配置表 CrossBillboardSet 配置，没配默认100
与本服榜单存储的是不一样的数据库表格，理论上类型可以和本服榜单类型重复，为了做下区分防误导，跨服榜单从 150 开始
@@ -442,7 +446,8 @@
BillboardTypeAllList = BillboardTypeList + CrossBillboardTypeList
-BillboardNameDict = {Def_BT_MainLevel:"主线过关榜", Def_BT_Arena:"演武场积分周榜", Def_BT_Tianzi:"天子考验伤害榜"}
+BillboardNameDict = {Def_BT_MainLevel:"主线过关榜", Def_BT_Arena:"演武场积分周榜", Def_BT_Tianzi:"天子考验伤害榜",
+ Def_BT_OSA_MainLevel:"开服关卡榜", Def_BT_OSA_HeroCall:"开服招募榜"}
#仙盟榜单类型
FamilyBillboardList = []
@@ -690,7 +695,9 @@
CDBPlayerRefresh_DOTPerDef, # 持续减伤 284
CDBPlayerRefresh_GoldRushEnergy, # 淘金令 285
CDBPlayerRefresh_ArenaTicket, # 挑战券 286
-) = range(146, 287)
+CDBPlayerRefresh_TehuiPoint, # 特惠印绶 287
+CDBPlayerRefresh_OSAPoint, # 开服庆典积分 288
+) = range(146, 289)
TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
TYPE_Price_FamilyExp = 6 # 战盟经验
@@ -732,12 +739,15 @@
TYPE_Price_HeroScore = 51 # 招募积分
TYPE_Price_GoldRushEnergy = 52 # 淘金令体力
TYPE_Price_ArenaTicket = 53 # 演武场挑战券
+TYPE_Price_TehuiPoint = 54 # 特惠印绶
+TYPE_Price_OSAPoint = 55 # 开服庆典积分
TYPE_Price_PayCoinDay = 98 # 代币时效，每日过天重置
TYPE_Price_PayCoin = 99 # 代币
#key可用于遍历所有货币，value仅GM相关会用到
MoneyNameDict = {
- 1:"金币", 15:"公会贡献币", 41:"战锤", 42:"将星玉髓", 43:"将魂", 51:"招募积分", 52:"淘金令", 53:"挑战券",
+ 1:"金币", 15:"公会贡献币", 41:"战锤", 42:"将星玉髓", 43:"将魂", 51:"招募积分", 52:"淘金令", 53:"挑战券", 54:"特惠印绶",
+ 55:"可用开服庆典积分",
98:"代币时效", 99:"代币"
}
#MoneyNameDict = {
@@ -761,6 +771,8 @@
TYPE_Price_HeroScore:CDBPlayerRefresh_HeroScore,
TYPE_Price_GoldRushEnergy:CDBPlayerRefresh_GoldRushEnergy,
TYPE_Price_ArenaTicket:CDBPlayerRefresh_ArenaTicket,
+ TYPE_Price_TehuiPoint:CDBPlayerRefresh_TehuiPoint,
+ TYPE_Price_OSAPoint:CDBPlayerRefresh_OSAPoint,
TYPE_Price_PayCoinDay:CDBPlayerRefresh_PayCoinDay,
#TYPE_Price_Rune:CDBPlayerRefresh_Rune,
#TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
@@ -792,13 +804,6 @@
2:CDBPlayerRefresh_MoneyMinusGoldPaper,
}
-# 高效战斗状态
-Def_Battle_Status = (
- Def_Battle_Start, # 激活
- Def_Battle_Stop, # 停止
- Def_Battle_Query # 查询
-) = range(1, 4)
-
# 游戏功能ID定义，需确保唯一，与PyGameFuncControl.txt中FuncId一致
GameFuncID_Official = 10 # 官爵，境界
GameFuncID_Family = 11 # 战盟，仙盟
@@ -806,22 +811,12 @@
GameFuncID_Arena = 27 # 竞技场
GameFuncID_Horse = 37 # 坐骑
GameFuncID_Travel = 44 # 游历
+GameFuncID_OSA_MainLevel = 45 # 开服关卡榜
+GameFuncID_OSA_HeroCall = 46 # 开服招募榜
+GameFuncID_OSA_Celebration = 47 # 开服庆典
# 以下为暂时无用的
GameFuncID_Pet = -1 # 宠物，灵宠 6
-GameFuncID_OSSail = -1 # 开服特惠 132
-GameFuncID_AddPoint = -1 # 加点功能/灵根功能 145
-
-#家族悬赏任务完成状态记录位标识
-Def_ArrestOverState_BitDic = {
- 5000:0,
- 5001:1,
- 5002:2,
- 5003:3,
- 5004:4,
- 5005:5,
- 5006:6,
- }
#背包类型
(
@@ -925,7 +920,7 @@
Def_UniversalGameRecType_28,
Def_UniversalGameRecType_BossInfo, # boss信息29
Def_UniversalGameRecType_CrossBossInfo, # 跨服boss信息 30
- Def_UniversalGameRecType_BossFirstKill, # boss首杀 31
+ Def_UniversalGameRecType_31,
Def_UniversalGameRecType_CrossCollect, # 跨服采集记录信息 32
Def_UniversalGameRecType_CrossChampionshipGroup, # 跨服排位争霸赛分组信息 33
Def_UniversalGameRecType_CrossChampionshipGuess, # 跨服排位争霸赛竞猜记录信息 34
@@ -1053,6 +1048,23 @@
CampType_Justice, #正义(与 Def_ID1Win 一致)
CampType_Evil, #邪恶(与 Def_ID2Win 一致)
] = range(3)
+
+# json里的配表 服务器类型（0主服，1子服，2跨服，3战斗服）]
+serverType_Main = 0 # 0主服
+serverType_Child = 1 # 1子服
+serverType_Cross = 2 # 2跨服
+serverType_Battle = 3 # 3战斗服
+
+# dirType //0全广播，1通知主服务器排除合服子服，2通知服务器包含合服子服， 3通知跨服服务器 ，4通知战斗服务器
+dirType_All = 0 # 0全广播
+dirType_Main = 1 # 1通知主服务器排除合服子服
+dirType_Child = 2 # 2通知服务器包含合服子服
+dirType_Cross = 3 # 3通知跨服服务器
+dirType_Battle = 4 # 4通知战斗服务器
+
+# 服务器间的信息定义
+SSMsg_BattleRequest = "SS_BattleRequest"
+SSMsg_BattleResult = "SS_BattleResult"
# 跨服服务器发送子服信息定义
CrossServerMsg_CrossServerState = "CrossServerState" # 跨服服务器状态变更
@@ -1234,6 +1246,7 @@
Def_IudetHeroBreakLV = 74 # 英雄突破等级
Def_IudetHeroAwakeLV = 76 # 英雄觉醒等级
Def_IudetHeroSkin = 78 # 英雄使用的皮肤索引
+Def_IudetHeroCardEffective = 80 # 卡牌加成是否生效的，每个武将仅有一张卡牌生效
# 200~300 宠物数据用
Def_IudetPet_NPCID = 200 # npcID
@@ -1253,7 +1266,7 @@
# 阵容定义
LineupList = (
Lineup_Main, # 主阵容 1
-Lineup_Arena, # 竞技场进攻阵容 2
+Lineup_ArenaAtk, # 竞技场进攻阵容 2
Lineup_ArenaDef, # 竞技场防守阵容 3
) = range(1, 1 + 3)
@@ -1386,7 +1399,28 @@
# 成就类型定义
SuccessTypeList = (
SuccType_MainLevel, # 通过主线关卡xxx 1
-) = range(1, 1 + 1)
+SuccType_OSAMainLevel, # 开服庆典 - 通过主线关卡xxx 2
+SuccType_OSACutTree, # 消耗X个战锤 3
+SuccType_OSARealmLV, # 官职达到X级 4
+SuccType_OSATreeLV, # 仙树达到X级 5
+SuccType_OSAEquipColor, # 穿戴x件x品质及以上装备 6
+SuccType_OSAHorseLVUP, # 坐骑升级x次 7
+SuccType_OSAHeroLVUP, # 武将升级X次 8
+SuccType_OSAHeroStarUP, # 武将升星x次 9
+SuccType_OSAHeroCall, # 武将招募x次 10
+SuccType_OSAHeroBook, # 武将图鉴激活x个 11
+SuccType_OSAArenaBattle, # 演武场战斗x次 12
+SuccType_OSAFBZhanchui, # 白骨盈野击败xx 13
+SuccType_OSAFBTianzi, # 挑战天子的考验x次 14
+SuccType_OSAGoldRush, # 淘金采集x次 15
+SuccType_OSAGoldRushWorkers, # 拥有x名监工 16
+SuccType_OSAKillNPC, # 击败X只怪物 17
+SuccType_OSAEquipDecompose, # 分解装备x次 18
+SuccType_OSAGetMoney, # 累计获得xx货币 19
+) = range(1, 1 + 19)
+
+# 开服庆典成就类型
+OSASuccTypeList = range(SuccType_OSAMainLevel, SuccType_OSAGetMoney + 1)
# 不向下适配检查的成就类型(指相对较高成就条件不会增加较低成就条件的进度)
UnDownCheckSuccessTypeList = []
--
Gitblit v1.8.0