From 21633503720673ff5d9074a3126e9ed652178594 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 13 十月 2025 15:17:47 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（优化战斗结算时机，修复某个阵营全部被击杀后在某些情况下不会马上结算的bug；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 35 ++++++++---------------------------
1 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 2e1a82f..a51cd79 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -214,13 +214,15 @@
Def_CalcAttr_MainEquip, # 主装备 1
Def_CalcAttr_HeroBook, # 武将图鉴 2
Def_CalcAttr_Realm, # 官职 3
-) = range(4)
+Def_CalcAttr_Gubao, # 古宝 4
+) = range(5)
CalcAttrName = {
Def_CalcAttr_LV:"主公等级",
Def_CalcAttr_MainEquip:"主装备",
Def_CalcAttr_HeroBook:"武将图鉴",
Def_CalcAttr_Realm:"官职",
+ Def_CalcAttr_Gubao:"古宝",
}
##-----------------------------------------------------------------------------------------------
@@ -454,7 +456,6 @@
Def_ItemID_GoldMoney = 20 # 直接给仙玉
Def_ItemID_SilverMoney = 22 # 直接给铜钱
Def_ItemID_FamilyContribution = 26 # 直接给战盟贡献点
-Def_ItemID_FamilyActive = 28 # 直接给战盟活跃点
Def_ItemID_SP = 29 # 直接给sp
Def_ItemID_GoldPaper = 30 # 直接给绑玉/灵石
Def_ItemID_RealmPoint = 24 # 直接给修行点
@@ -472,7 +473,7 @@
Def_ItemID_FamilyFlagWarPoint = 540 # 直接给万界积分
Def_ItemID_TongTianPoint = 720 # 直接给通天令经验点
Def_ItemID_SuccessScore = 590 # 直接给成就积分
-Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, Def_ItemID_GoldPaper,
+Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_SP, Def_ItemID_GoldPaper,
Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog,
Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor, Def_ItemID_GoldMoney,
Def_ItemID_FuncSysPrivilege, Def_ItemID_FCPartyPoint, Def_ItemID_BTGMPoint, Def_ItemID_GuShenMoney,
@@ -631,7 +632,6 @@
Def_Effect_GivePlayerMoneyGold = 203 #给人物金钱 仙玉道具效果ID
Def_Effect_AddDienstgrad = 204 #使用物品获得称号
Def_Effect_UseItemGiveZhenQi = 205 #使用道具给予真气
-Def_Effect_ItemGiveFamilyActivity = 208 #使用道具给予仙盟活跃令
Def_Effect_ItemGiveFamilyContribution = 209 #使用道具给予仙盟贡献
Def_Effect_ItemAddExp = 213 #给经验道具
Def_Effect_ItemAddLV = 214 #直接升级道具
@@ -667,7 +667,6 @@
Def_Effect_ItemGiveMoney = 264 #通用给货币道具，A值数量，B值货币类型
Def_Effect_GuajiAward = 266 #直接给挂机收益，A值分钟
Def_Effect_ItemCount = 267 #自动转化为对应物品ID的个数，不存背包
-Def_Effect_GubaoPiece = 270 #古宝碎片效果ID， A值-古宝ID
Def_Effect_TrainRealmLV = 272 #境界培养卡，值A-功能（1-坐骑；2-灵宠；3-灵器）， 值B-境界
Def_Effect_TiandaoQiyun = 273 #增加天道树气运；A值-增加值 效果值B： 领取是否默认直接使用
Def_Effect_Face = 274 #头像物品；A值-头像ID
@@ -3257,7 +3256,6 @@
Def_PlayerKey_CrossRegisterMap = "CrossRegisterMap" #跨服注册活动地图, dataMapID
-Def_Player_Dict_FamilyTechLV = "FamilyTechLV_%s" #家族科技等级, 参数(科技ID)
Def_Player_Dict_RouteServerInitOK = "RouteServerInitOK_33" #RouteServer初始化成功(仅登陆一次)
Def_Player_Dict_Wallow_LV = "GameWallowLV_34" #防沉迷等级
Def_Player_Dict_Wallow_OfflineTime = "GameWallowOfflineTime_35" #防沉迷离线累积时间
@@ -3320,16 +3318,9 @@
Def_Player_Dict_UpdatePlayerName = "UpdatePlayerName_199" # 改名锁
Def_Player_Dict_UpdateFamilyNameItemIndex = "UpdateFamilyNameItemIndex" # 改名物品在背包的位置
Def_Player_Dict_UpdateFamilyName = "UpdateFamilyName" # 改名锁
-Def_Player_Dict_FamilyDayAward = "FamilyDayAward" # 仙盟每日奖励领奖记录
-Def_Player_Dict_FamilyDonateRecord = "FamilyDonateRecord" # 仙盟今日捐献记录，按位存储每种类型今日已捐献次数
-Def_Player_Dict_FamilyEmblemID = "FamilyEmblemID" # 仙盟徽章ID
Def_Player_Dict_FamilyZhenbaogeCut = "FamilyZhenbaogeCut" #珍宝阁今日是否已砍过价
Def_Player_Dict_FamilyZhenbaogeBuy = "FamilyZhenbaogeBuy" #珍宝阁今日是否已购买过
-
-# 仙盟事务
-Def_Player_Dict_FamilyAffairRefreshFree = "FamilyAffairRefreshFree" # 今日已免费刷新事务次数
-Def_Player_Dict_FamilyAffairInfo = "FamilyAffairStar_%s" # 事务信息，星级*10+状态（0-无；1-进行中；2-已完成）；参数（事务编号ID）
-Def_Player_Dict_FamilyAffairStartTime = "FamilyAffairStartTime_%s" # 事务开始时间戳，参数（事务编号ID）
+Def_Player_Dict_FamilyDonateCnt = "FamilyDonateCnt_%s" # 仙盟今日捐献次数，参数（捐献类型）
Def_Player_Dict_DelPackIndex = "DelPackIndex215" # 装备回购不重排，只记录最旧的一个物品
@@ -3348,8 +3339,6 @@
Def_PDict_TreasureGridCnt = "TreasureGridCnt_%s_%s" # 格子对应累计产出次数, 参数(寻宝类型, 格子编号)
Def_Player_Dict_LastAutoOpenPackTick = "LastAutoOpenPackTick219_%s" #上一次自动购买的tick<背包类型>
-
-Def_PDict_OnlinePrizeNote = "OnlinePrizeNote" # 当日在线奖励领取信息
Def_PDict_OpenSererDailyAward = "OpenSererDailyAward" # 开服每日奖励记录
Def_PDict_CreateRoleAwardState = "CreateRoleAwardState" # 创角奖励领取记录
@@ -3382,10 +3371,6 @@
Def_PDict_FirstChargeRecord = "FirstChargeRecord_%s" # 首充领取记录，按位记录首充第x天是否已领取，参数（首充ID）
Def_PDict_FirstChargeTime = "FirstChargeTime_%s" # 首充充值时间戳，参数（首充ID）
Def_PDict_IsReBorn = "Def_PDict_IsReBorn" # 是否回城复活
-Def_PDict_FamilyWarDailyReward = "FamilyWarDailyReward" # 王者仙盟每日俸禄领取状态
-Def_PDict_Family_Contribution = "FamilyContribution" #战盟贡献度
-Def_PDict_HasChange_FamilyActiveToContribution = "HasChangeContribution" #战盟活跃度已转化过贡献度
-Def_PDict_KillPlayerAddActive = "KillPlayerAddActiveByDay" # 杀人每日获得活跃度
Def_PDict_LoginDayCnt = "PLoginDayCnt" # 累计登陆天数
Def_PDict_LoginDayAward = "PLoginDayAward" # 累计登陆领取情况
Def_PDict_CollNpcIDCollTime = "NPCIDCollTime_%s" # 采集NPCID对应每日对应采集次数，%sNPCID
@@ -3835,9 +3820,6 @@
Def_PDict_DailyActionDayBuyTimes = "DADayBuyTimes_%s" # 每日活动今日购买次数 参数每日活动ID
Def_PDict_DailyActionDayItemTimes = "DADayItemTimes_%s" # 每日活动今日物品增加次数 参数每日活动ID
Def_PDict_DailyActionWeekTimes = "DailyActionWeekTimes_%s" # 每日活动本周完成次数 参数每日活动ID
-#仙盟活跃
-Def_PDict_FamilyActivityFinishCnt = "FamilyActivityFinishCnt%s" # 已完成次数
-Def_PDict_FamilyActivityAwardRecord = "FamilyActivityAwardRecord" # 活跃度奖励领取记录，按二进制位标识
# 投资理财
Def_PDict_InvestTime = "InvestTime_%s" # 投资时的时间，参数为投资类型
@@ -3957,9 +3939,7 @@
Def_PDict_CharmLV = "CharmLV" # 魅力等级
#古宝
-Def_PDict_GubaoLVInfo = "GubaoLVInfo_%s" # 古宝等级信息，参数(古宝ID)，等级*100+星级
-Def_PDict_GubaoItemEffValue = "GubaoItemEffValue_%s_%s" # 古宝效果物品进度，参数(古宝ID, 效果类型)
-Def_PDict_GubaoPiece = "GubaoPiece_%s" # 古宝碎片数，参数(古宝ID)
+Def_PDict_GubaoInfo = "Gubao_%s" # 古宝信息，参数(古宝ID)，特殊效果层*100000 + 等级*100 + 星级
#神通
Def_PDict_ShentongLVInfo = "ShentongLVInfo_%s" # 神通等级信息，参数(神通ID)，阶级*100+等级
@@ -4009,6 +3989,7 @@
Def_PDict_UnXiantaoCntEquip = "UnXiantaoCntEquip" # 累计未结算装备掉落的战锤数，有3位小数，即 1234 实际为 1.234
Def_PDict_UnXiantaoCntBooty = "UnXiantaoCntBooty_%s" # 累计未结算战利品掉落的战锤数，参数(itemID)
Def_PDict_BootyDropToday = "BootyDropToday_%s" # 今日已累计掉落战利品数量，参数(itemID)
+Def_PDict_AppointDropEquipCnt = "AppointDropEquipCnt" # 定制掉落装备掉落第x次，只记录到配置的最高次数
#天子考验
Def_PDict_TianziHisHurt = "TianziHisHurt_%s" # 历史最高伤害，求余亿部分，参数（bossID）
@@ -4986,7 +4967,7 @@
# 游戏功能奖励定义
(
Def_RewardType_Activity, # 活跃度奖励 0
-Def_RewardType_FamilyActivity, # 仙盟活跃度奖励 1
+Def_RewardType_1, # 1
Def_RewardType_ChampionFamilyDailyReward, # 仙盟联赛冠军仙盟每日俸禄奖励 2
Def_RewardType_XMZZWinCnt, # 仙魔之争胜利场数奖励 3
Def_RewardType_FamilyDayAward, # 仙盟每日福利奖励 4
--
Gitblit v1.8.0