From 0b4e44a6764b14b51c4b72b9c47c5a162352850d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 22 十月 2025 11:48:31 +0800
Subject: [PATCH] 16 卡牌服务端（删除 PlayerBattle）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 52 +++++++++-------------------------------------------
1 files changed, 9 insertions(+), 43 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 34881db..cbaa157 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -131,33 +131,6 @@
Def_PstMax, # 最大数量
) = range(10, 13 + 1)
-#---家族相关---
-Def_PlayerMoney_Change_FamilyMoney_Rate = 1 #玩家银子兑换家族资金比率 (PlayerMoney * 1)
-
-(
-TViewFamilyType_None, #无点击家族NPC
-TViewFamilyType_CreateFamily, #点击家族NPC, 创建家族状态
-TViewFamilyType_FamilyWar, #查看家族战
-TViewFamilyType_AddFamily, #查看申请加入家族
-) = range(0, 3 + 1)
-#家族允许加入类型
-FamilyAcceptJoinType = (
- FamilyAcceptJoin_Examine, #0 默认需要审核
- FamilyAcceptJoin_Agree, #1 自动同意申请，除非已满员
- FamilyAcceptJoin_Refuse, #2 拒绝申请
- ) = range(0, 3)
-
-#开启的副本对战仙盟信息
-(
-VSFamilyInfo_IsFinalMatch, # 是否最终决赛场次
-VSFamilyInfo_RoundNum, # 轮次
-VSFamilyInfo_GroupID, # 联赛组级别
-VSFamilyInfo_FamilyIDList, # 对战仙盟ID列表
-VSFamilyInfo_FamilyRankList, # 对战仙盟排名列表
-VSFamilyInfo_FamilyNameList, # 对战仙盟名列表
-VSFamilyInfo_WinCountList, # 对战仙盟连胜次数列表
-) = range(7)
-
Def_OnEventHour = 5 # 特殊时间点凌晨X点过天/周
Def_OnEventType = 1 # 常规过天/周策划表配置类型
Def_OnEventTypeEx = 2 # 特殊时间点过天/周策划表配置类型
@@ -199,14 +172,6 @@
Def_Notify_WorldKey_WorldAverageLv = "WorldAverageLv" #世界等级
Def_Notify_WorldKey_YdayLoginCnt= 'YdayLoginCnt' # 昨天总在线人数
Def_Notify_WorldKey_YdayNewCoinCnt = 'YdayNewCoinCnt' # 昨天总充值点券数
-
-Def_Notify_WorldKey_VSFamilyInfo = "VSFamilyInfo" # 仙盟联赛对战仙盟信息
-Def_Notify_WorldKey_ChampionFamilyID = "ChampionFamilyID" # 仙盟联赛上次冠军仙盟ID
-
-Def_Notify_WorldKey_FamilyZhenfaInfo = "FamilyZhenfaInfo" # 仙盟阵法数据
-
-Def_Notify_WorldKey_AddFamilyAuctionItem = "AddFamilyAuctionItem" # 添加仙盟拍品
-Def_Notify_WorldKey_AddSystemAuctionItem = "AddSystemAuctionItem" # 添加系统拍品
Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState" # 跨服服务器链接状态
Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen" # 跨服服务器是否开启中
@@ -611,7 +576,7 @@
CDBPlayerRefresh_ProDefHPPer, # 生命上限换算为防护值的百分比 165
CDBPlayerRefresh_ProDefAbsorb, # 防护盾吸收伤害百分比
CDBPlayerRefresh_FamilyContribution, # 战盟贡献度
-CDBPlayerRefresh_FamilyStoreScore, # 战盟仓库积分
+CDBPlayerRefresh_168, # 战盟仓库积分
CDBPlayerRefresh_Rune, # 符印精华点
CDBPlayerRefresh_RuneSplinters, # 符印碎片 170
CDBPlayerRefresh_RealmPoint, # 境界修炼点
@@ -705,7 +670,7 @@
CDBPlayerRefresh_SuperDamPer, # 强化暴伤 259
CDBPlayerRefresh_SuperDamPerDef, # 弱化暴伤 260
CDBPlayerRefresh_Lingyu, # 灵玉 261
-CDBPlayerRefresh_262, # 凭证积分 262
+CDBPlayerRefresh_HeroSoul, # 将魂 262
CDBPlayerRefresh_GatherSoul, # 聚魂精华 263
CDBPlayerRefresh_BossFinalHurtPer, # Boss最终输出伤害百分比 264
CDBPlayerRefresh_265, # 骑宠养成积分 265
@@ -734,7 +699,7 @@
TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
TYPE_Price_FamilyExp = 6 # 战盟经验
-TYPE_Price_FamilyStoreScore = 10 # 战盟仓库积分
+TYPE_Price_10 = 10 # 战盟仓库积分
TYPE_Price_RealmPoint = 13 # 境界修炼点
TYPE_Price_Ysog = 14 # 魔精
TYPE_Price_FamilyCoin = 15 # 仙盟公会贡献币
@@ -761,7 +726,7 @@
TYPE_Price_FamilyFlagWarPoint = 40 # 万界积分
TYPE_Price_Xiantao = 41 # 仙桃/战锤
TYPE_Price_Lingyu = 42 # 灵玉/将星玉髓
-TYPE_Price_43 = 43 # boss历练凭证积分
+TYPE_Price_HeroSoul = 43 # 将魂
TYPE_Price_GatherSoul = 44 # 聚魂精华
TYPE_Price_45 = 45 # 骑宠养成积分
TYPE_Price_46 = 46 # 古宝养成积分
@@ -777,7 +742,7 @@
#key可用于遍历所有货币，value仅GM相关会用到
MoneyNameDict = {
- 1:"金币", 15:"公会贡献币", 41:"战锤", 42:"将星玉髓", 51:"招募积分", 52:"淘金令", 53:"挑战券",
+ 1:"金币", 15:"公会贡献币", 41:"战锤", 42:"将星玉髓", 43:"将魂", 51:"招募积分", 52:"淘金令", 53:"挑战券",
98:"代币时效", 99:"代币"
}
#MoneyNameDict = {
@@ -794,7 +759,6 @@
# 自定义积分及通知字典 {货币类型:通知客户端刷新类型, ...} , 如果不通知的话刷新类型则配置 None
TYPE_Price_CurrencyDict = {
- TYPE_Price_FamilyStoreScore:CDBPlayerRefresh_FamilyStoreScore,
TYPE_Price_Rune:CDBPlayerRefresh_Rune,
TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
TYPE_Price_TreasureScore:CDBPlayerRefresh_TreasureScore,
@@ -815,6 +779,7 @@
TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
TYPE_Price_Xiantao:CDBPlayerRefresh_Xiantao,
TYPE_Price_Lingyu:CDBPlayerRefresh_Lingyu,
+ TYPE_Price_HeroSoul:CDBPlayerRefresh_HeroSoul,
TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,
TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,
TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit,
@@ -842,7 +807,8 @@
# 游戏功能ID定义，需确保唯一，与PyGameFuncControl.txt中FuncId一致
GameFuncID_Official = 10 # 官爵，境界
GameFuncID_Family = 11 # 战盟，仙盟
-GameFuncID_Arena = 27 # 竞技场
+GameFuncID_Shop = 16 # 商城，坊市
+GameFuncID_Arena = 27 # 竞技场
# 以下为暂时无用的
GameFuncID_Wing = -1 # 翅膀 3
@@ -1028,7 +994,7 @@
Def_ActionType_5,
Def_ActionType_6,
Def_ActionType_7,
- Def_ActionType_FamilyZhenfa, #仙盟阵法8
+ Def_ActionType_8,
Def_ActionType_9,
Def_ActionType_10,
Def_ActionType_11,
--
Gitblit v1.8.0