From b2f22252b6831bcad41862d56ca7a906dc4377fd Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 12 九月 2025 10:24:19 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（新增演武场；支持机器人；支持PVP战斗；每场战斗结束后支持查看战斗回放；榜单优化存储玩家形象Value5；主线关卡榜支持；支持查看玩家；）
---
ServerPack/HA9_Function/ArenaPlayerInfo.des | 1
ServerPack/HA9_Function/ArenaMatchList.des | 2
ServerPack/HA0_Sys/GameRecInfo.des | 1
ServerPack/HA7_Interaction/SCQueryPlayerCacheResult.h | 1
ClientPack/CA0_Sys/ViewGameRec.h | 8 ++++
ServerPack/HA0_Sys/GameRecInfo | 0
ClientPack/CA0_Sys/ViewGameRec.des | 1
ServerPack/HA0_Sys/GameRecInfo.h | 11 +++--
ServerPack/HA9_Function/ArenaMatchList.h | 17 +++-----
/dev/null | 26 -------------
ServerPack/HA9_Function/ArenaPlayerInfo | 0
ServerPack/HA9_Function/ArenaPlayerInfo.h | 7 +++
ClientPack/CA0_Sys/ViewGameRec | 0
ClientPack/CB2_NewFunction/ArenaMatch.h | 6 +-
ClientPack/CB2_NewFunction/ArenaMatch.des | 2
15 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/ClientPack/CA0_Sys/ViewUniversalGameRec b/ClientPack/CA0_Sys/ViewGameRec
similarity index 100%
rename from ClientPack/CA0_Sys/ViewUniversalGameRec
rename to ClientPack/CA0_Sys/ViewGameRec
diff --git a/ClientPack/CA0_Sys/ViewGameRec.des b/ClientPack/CA0_Sys/ViewGameRec.des
new file mode 100644
index 0000000..ce2aff4
--- /dev/null
+++ b/ClientPack/CA0_Sys/ViewGameRec.des
@@ -0,0 +1 @@
+A0 08 查看通用记录 #tagCSViewGameRec
diff --git a/ClientPack/CA0_Sys/ViewGameRec.h b/ClientPack/CA0_Sys/ViewGameRec.h
new file mode 100644
index 0000000..78d4b85
--- /dev/null
+++ b/ClientPack/CA0_Sys/ViewGameRec.h
@@ -0,0 +1,8 @@
+// A0 08 查看通用记录 #tagCSViewGameRec
+
+struct tagCSViewGameRec
+{
+ tagHead Head;
+ WORD RecType; //记录类型
+ DWORD RecID; //自定义记录ID
+};
diff --git a/ClientPack/CA0_Sys/ViewUniversalGameRec.des b/ClientPack/CA0_Sys/ViewUniversalGameRec.des
deleted file mode 100644
index d6c41c1..0000000
--- a/ClientPack/CA0_Sys/ViewUniversalGameRec.des
+++ /dev/null
@@ -1 +0,0 @@
-A0 01 查看玩家信息通用记录 #tagViewUniversalGameRec
diff --git a/ClientPack/CA0_Sys/ViewUniversalGameRec.h b/ClientPack/CA0_Sys/ViewUniversalGameRec.h
deleted file mode 100644
index cf8f875..0000000
--- a/ClientPack/CA0_Sys/ViewUniversalGameRec.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//A0 01 查看玩家信息通用记录 #tagViewUniversalGameRec
-
-struct tagViewUniversalGameRec
-
-{
- tagHead Head;
- BYTE ViewType; //查看记录的类型
-};
diff --git a/ClientPack/CB2_NewFunction/ArenaBattle b/ClientPack/CB2_NewFunction/ArenaBattle
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/CB2_NewFunction/ArenaBattle
+++ /dev/null
diff --git a/ClientPack/CB2_NewFunction/ArenaBattle.des b/ClientPack/CB2_NewFunction/ArenaBattle.des
deleted file mode 100644
index 0795c14..0000000
--- a/ClientPack/CB2_NewFunction/ArenaBattle.des
+++ /dev/null
@@ -1 +0,0 @@
-B2 10 竞技场挑战玩家 #tagCMArenaBattle
diff --git a/ClientPack/CB2_NewFunction/ArenaBattle.h b/ClientPack/CB2_NewFunction/ArenaBattle.h
deleted file mode 100644
index 1c1afb0..0000000
--- a/ClientPack/CB2_NewFunction/ArenaBattle.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// B2 10 竞技场挑战玩家 #tagCMArenaBattle
-
-struct tagCMArenaBattle
-{
- tagHead Head;
- DWORD TagPlayerID; // 目标玩家ID或机器人ID
- BYTE Result; // 0-进入自定义场景发送通知后端；1-胜利（后端处理，暂时不需要发送此状态）；2-失败（前端被对手击杀需要发送此状态）
-};
diff --git a/ClientPack/CB2_NewFunction/ArenaMatch.des b/ClientPack/CB2_NewFunction/ArenaMatch.des
index bd032a0..392b45e 100644
--- a/ClientPack/CB2_NewFunction/ArenaMatch.des
+++ b/ClientPack/CB2_NewFunction/ArenaMatch.des
@@ -1 +1 @@
-B2 09 竞技场匹配玩家 #tagCMArenaMatch
+B2 09 演武场匹配玩家 #tagCSArenaMatch
diff --git a/ClientPack/CB2_NewFunction/ArenaMatch.h b/ClientPack/CB2_NewFunction/ArenaMatch.h
index 55b3ed0..6244027 100644
--- a/ClientPack/CB2_NewFunction/ArenaMatch.h
+++ b/ClientPack/CB2_NewFunction/ArenaMatch.h
@@ -1,7 +1,7 @@
-// B2 09 竞技场匹配玩家 #tagCMArenaMatch
+// B2 09 演武场匹配玩家 #tagCSArenaMatch
-struct tagCMArenaMatch
+struct tagCSArenaMatch
{
tagHead Head;
- BYTE IsRefresh; // 0-打开界面无匹配数据时时查询，1-强制刷新匹配列表
+ BYTE IsRefresh; // 0-打开界面无匹配数据时查询，1-强制刷新匹配列表
};
diff --git a/ServerPack/HA0_Sys/UniversalGameRecInfo b/ServerPack/HA0_Sys/GameRecInfo
similarity index 100%
rename from ServerPack/HA0_Sys/UniversalGameRecInfo
rename to ServerPack/HA0_Sys/GameRecInfo
diff --git a/ServerPack/HA0_Sys/GameRecInfo.des b/ServerPack/HA0_Sys/GameRecInfo.des
new file mode 100644
index 0000000..4e1e63c
--- /dev/null
+++ b/ServerPack/HA0_Sys/GameRecInfo.des
@@ -0,0 +1 @@
+A0 09 通用记录信息 #tagSCGameRecInfo
diff --git a/ServerPack/HA0_Sys/PlayerRecInfo.h b/ServerPack/HA0_Sys/GameRecInfo.h
similarity index 63%
rename from ServerPack/HA0_Sys/PlayerRecInfo.h
rename to ServerPack/HA0_Sys/GameRecInfo.h
index 7bccd0a..70de42a 100644
--- a/ServerPack/HA0_Sys/PlayerRecInfo.h
+++ b/ServerPack/HA0_Sys/GameRecInfo.h
@@ -1,6 +1,6 @@
-// A0 08 玩家记录信息 #tagGCPlayerRecInfo
+// A0 09 通用记录信息 #tagSCGameRecInfo
-struct tagGCPlayerRec
+struct tagSCGameRec
{
DWORD Time; //时间
DWORD Value1; //值1
@@ -15,10 +15,11 @@
char UserData[UserDataLen]; //扩展数据
};
-struct tagGCPlayerRecInfo
+struct tagSCGameRecInfo
{
tagHead Head;
- BYTE Type; //类型
+ WORD RecType; //记录类型
+ DWORD RecID; //自定义记录ID
WORD Count; //数量
- tagGCPlayerRec PlayerRecList[Count];
+ tagSCGameRec RecList[Count];
};
diff --git a/ServerPack/HA0_Sys/PlayerRecInfo b/ServerPack/HA0_Sys/PlayerRecInfo
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/HA0_Sys/PlayerRecInfo
+++ /dev/null
diff --git a/ServerPack/HA0_Sys/PlayerRecInfo.des b/ServerPack/HA0_Sys/PlayerRecInfo.des
deleted file mode 100644
index 0e6b460..0000000
--- a/ServerPack/HA0_Sys/PlayerRecInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A0 08 玩家记录信息 #tagGCPlayerRecInfo
diff --git a/ServerPack/HA0_Sys/UniversalGameRecInfo.des b/ServerPack/HA0_Sys/UniversalGameRecInfo.des
deleted file mode 100644
index 7613b0b..0000000
--- a/ServerPack/HA0_Sys/UniversalGameRecInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A0 03 玩家信息通用记录 #tagUniversalGameRecInfo
diff --git a/ServerPack/HA0_Sys/UniversalGameRecInfo.h b/ServerPack/HA0_Sys/UniversalGameRecInfo.h
deleted file mode 100644
index c7c677e..0000000
--- a/ServerPack/HA0_Sys/UniversalGameRecInfo.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//A0 03 玩家信息通用记录 #tagUniversalGameRecInfo
-
-struct tagUniversalGameRec
-
-{
- DWORD Time; //时间
- WORD StrValue1Len; //字符串1长度
- char StrValue1[StrValue1Len];
- WORD StrValue2Len; //字符串2长度
- char StrValue2[StrValue2Len];
- WORD StrValue3Len; //字符串3长度
- char StrValue3[StrValue3Len];
- DWORD Value1; //数值1
- DWORD Value2; //数值1
- DWORD Value3; //数值1
- DWORD Value4; //数值1
- DWORD Value5; //数值1
-};
-
-
-struct tagUniversalGameRecInfo
-
-{
- tagHead Head;
- BYTE Type; //类型
- WORD Count; //数量
- tagUniversalGameRec UniversalGameRec[Count]; ///size = Count
-};
-
diff --git a/ServerPack/HA3_Function/ArenaPlayerInfo.des b/ServerPack/HA3_Function/ArenaPlayerInfo.des
deleted file mode 100644
index edd6c8a..0000000
--- a/ServerPack/HA3_Function/ArenaPlayerInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A3 C3 竞技场玩家信息 #tagMCArenaPlayerInfo
diff --git a/ServerPack/HA3_Function/ArenaPlayerInfo.h b/ServerPack/HA3_Function/ArenaPlayerInfo.h
deleted file mode 100644
index c95ade0..0000000
--- a/ServerPack/HA3_Function/ArenaPlayerInfo.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// A3 C3 竞技场玩家信息 #tagMCArenaPlayerInfo
-
-struct tagMCArenaPlayerInfo
-{
- tagHead Head;
- BYTE IsReset; //是否是重置的
- DWORD Score; //当前积分
- BYTE BattleCountToday; //今日已挑战次数
- BYTE MatchRefreshCount; //当前已刷新匹配列表次数，每次挑战后会重置
- BYTE ItemAddBattleCountToday; //今日已使用物品增加的挑战次数
-};
diff --git a/ServerPack/HA7_Interaction/SCQueryPlayerCacheResult.h b/ServerPack/HA7_Interaction/SCQueryPlayerCacheResult.h
index c5d1218..55458a6 100644
--- a/ServerPack/HA7_Interaction/SCQueryPlayerCacheResult.h
+++ b/ServerPack/HA7_Interaction/SCQueryPlayerCacheResult.h
@@ -10,6 +10,7 @@
BYTE RealmLV;
DWORD Face;
DWORD FacePic;
+ DWORD ModelMark; //变形模型mark
DWORD TitleID; //佩戴的称号
DWORD ServerID;
DWORD FightPower;
diff --git a/ServerPack/HA9_Function/ArenaBattlePlayerInfo b/ServerPack/HA9_Function/ArenaBattlePlayerInfo
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/HA9_Function/ArenaBattlePlayerInfo
+++ /dev/null
diff --git a/ServerPack/HA9_Function/ArenaBattlePlayerInfo.des b/ServerPack/HA9_Function/ArenaBattlePlayerInfo.des
deleted file mode 100644
index faf022d..0000000
--- a/ServerPack/HA9_Function/ArenaBattlePlayerInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A9 26 竞技场对战玩家最新信息 #tagGCArenaBattlePlayerInfo
diff --git a/ServerPack/HA9_Function/ArenaBattlePlayerInfo.h b/ServerPack/HA9_Function/ArenaBattlePlayerInfo.h
deleted file mode 100644
index 9b1f750..0000000
--- a/ServerPack/HA9_Function/ArenaBattlePlayerInfo.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// A9 26 竞技场对战玩家最新信息 #tagGCArenaBattlePlayerInfo
-
-struct tagGCArenaBattlePlayerInfo
-{
- tagHead Head;
- DWORD PlayerID; //目标玩家ID
- char PlayerName[33];
- BYTE Job;
- WORD LV; //等级
- WORD RealmLV; //境界，机器人读境界表取等级对应境界
- DWORD FightPower; //战力求余亿部分，机器人读等级表取等级对应战力
- DWORD FightPowerEx; //战力整除亿部分，机器人读等级表取等级对应战力
- DWORD Score; //积分
-};
diff --git a/ServerPack/HA9_Function/ArenaBattleRecordList b/ServerPack/HA9_Function/ArenaBattleRecordList
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/HA9_Function/ArenaBattleRecordList
+++ /dev/null
diff --git a/ServerPack/HA9_Function/ArenaBattleRecordList.des b/ServerPack/HA9_Function/ArenaBattleRecordList.des
deleted file mode 100644
index 2c23e8d..0000000
--- a/ServerPack/HA9_Function/ArenaBattleRecordList.des
+++ /dev/null
@@ -1 +0,0 @@
-A9 23 竞技场对战记录列表 #tagGCArenaBattleRecordList
diff --git a/ServerPack/HA9_Function/ArenaBattleRecordList.h b/ServerPack/HA9_Function/ArenaBattleRecordList.h
deleted file mode 100644
index cd6b57b..0000000
--- a/ServerPack/HA9_Function/ArenaBattleRecordList.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// A9 23 竞技场对战记录列表 #tagGCArenaBattleRecordList
-
-struct tagGCArenaBattleRecord
-{
- DWORD PlayerID; //目标玩家ID，小于10000为机器人ID
- char PlayerName[33];
- BYTE Job;
- WORD LV; //等级
- WORD RealmLV; //境界，机器人读境界表取等级对应境界
- DWORD FightPower; //战力求余亿部分，机器人读等级表取等级对应战力
- DWORD FightPowerEx; //战力整除亿部分，机器人读等级表取等级对应战力
- DWORD Score; //积分
- BYTE AddScoreLen;
- char AddScore[AddScoreLen]; //本次对战增加的积分，有正负
- BYTE IsWin; //是否获胜
- DWORD Time; //时间戳
- DWORD Face; //基本脸型
- DWORD FacePic; //头像框
-};
-
-struct tagGCArenaBattleRecordList
-{
- tagHead Head;
- BYTE RecordCount;
- tagGCArenaBattleRecord BattleRecordList[RecordCount]; // 对战列表
-};
diff --git a/ServerPack/HA9_Function/ArenaMatchList.des b/ServerPack/HA9_Function/ArenaMatchList.des
index 80aef8d..5fc16d9 100644
--- a/ServerPack/HA9_Function/ArenaMatchList.des
+++ b/ServerPack/HA9_Function/ArenaMatchList.des
@@ -1 +1 @@
-A9 22 竞技场匹配玩家列表 #tagGCArenaMatchList
+A9 22 演武场匹配玩家列表 #tagSCArenaMatchList
diff --git a/ServerPack/HA9_Function/ArenaMatchList.h b/ServerPack/HA9_Function/ArenaMatchList.h
index ff288fc..9dcf54e 100644
--- a/ServerPack/HA9_Function/ArenaMatchList.h
+++ b/ServerPack/HA9_Function/ArenaMatchList.h
@@ -1,22 +1,19 @@
-// A9 22 竞技场匹配玩家列表 #tagGCArenaMatchList
+// A9 22 演武场匹配玩家列表 #tagSCArenaMatchList
-struct tagGCArenaMatchInfo
+struct tagSCArenaMatchInfo
{
- DWORD PlayerID; //目标玩家ID，小于10000为机器人ID
+ DWORD PlayerID; //目标玩家ID
char PlayerName[33];
- BYTE Job;
- WORD LV; //等级
WORD RealmLV; //境界，机器人读境界表取等级对应境界
- DWORD FightPower; //战力求余亿部分，机器人读等级表取等级对应战力
- DWORD FightPowerEx; //战力整除亿部分，机器人读等级表取等级对应战力
- DWORD Score; //积分
+ DWORD FightPower; //战力求余亿部分
+ DWORD FightPowerEx; //战力整除亿部分
DWORD Face; //基本脸型
DWORD FacePic; //头像框
};
-struct tagGCArenaMatchList
+struct tagSCArenaMatchList
{
tagHead Head;
BYTE MatchCount;
- tagGCArenaMatchInfo MatchList[MatchCount]; // 匹配列表
+ tagSCArenaMatchInfo MatchList[MatchCount]; // 匹配列表，从高分到低分
};
diff --git a/ServerPack/HA3_Function/ArenaPlayerInfo b/ServerPack/HA9_Function/ArenaPlayerInfo
similarity index 100%
rename from ServerPack/HA3_Function/ArenaPlayerInfo
rename to ServerPack/HA9_Function/ArenaPlayerInfo
diff --git a/ServerPack/HA9_Function/ArenaPlayerInfo.des b/ServerPack/HA9_Function/ArenaPlayerInfo.des
new file mode 100644
index 0000000..ab48346
--- /dev/null
+++ b/ServerPack/HA9_Function/ArenaPlayerInfo.des
@@ -0,0 +1 @@
+A9 23 演武场玩家信息 #tagSCArenaPlayerInfo
diff --git a/ServerPack/HA9_Function/ArenaPlayerInfo.h b/ServerPack/HA9_Function/ArenaPlayerInfo.h
new file mode 100644
index 0000000..b435a04
--- /dev/null
+++ b/ServerPack/HA9_Function/ArenaPlayerInfo.h
@@ -0,0 +1,7 @@
+// A9 23 演武场玩家信息 #tagSCArenaPlayerInfo
+
+struct tagSCArenaPlayerInfo
+{
+ tagHead Head;
+ DWORD Score; //当前积分
+};
--
Gitblit v1.8.0