From 17343a432e3271a0036bb5491c925200042cdac5 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 29 May 2025 18:15:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=9D=E5=A4=96=E7=9A=84?=
 =?UTF-8?q?=E7=BB=8F=E9=AA=8C=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/Gm.go            |  2 +-
 src/server/game/PlayerBaseMod.go |  1 +
 src/server/game/UnitTest.go      |  2 +-
 src/server/msg/Gameapi.pb.go     | 14 ++++++++++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/server/game/Gm.go b/src/server/game/Gm.go
index b90bd3ea..fe60cc5e 100644
--- a/src/server/game/Gm.go
+++ b/src/server/game/Gm.go
@@ -72,7 +72,7 @@ func ReqGmCommand_(player *Player, Command string) error {
 		player.PushClientRes(player.PlayMod.mod_list.Card.BackData())
 	case "addexp":
 		num, _ := strconv.Atoi(arg[1])
-		player.GetPlayerBaseMod().AddExp(player, num)
+		player.GetPlayerBaseMod().AddExp(player, num, 0)
 		player.PushClientRes(&player.GetPlayerBaseMod().Data)
 	case "addDailyActive":
 		num, _ := strconv.Atoi(arg[1])
diff --git a/src/server/game/PlayerBaseMod.go b/src/server/game/PlayerBaseMod.go
index 6404b14d..5f5e328a 100644
--- a/src/server/game/PlayerBaseMod.go
+++ b/src/server/game/PlayerBaseMod.go
@@ -582,6 +582,7 @@ func (p *PlayerBaseData) BackAsset() *msg.ResPlayerAsset {
 		Exp:         int32(BaseMod.Exp),
 		Login:       int32(BaseMod.LoginTime),
 		Logout:      int32(BaseMod.LogoutTime),
+		PExp:        int32(BaseMod.PExp),
 	}
 }
 
diff --git a/src/server/game/UnitTest.go b/src/server/game/UnitTest.go
index 603cf3e8..5b8193fe 100644
--- a/src/server/game/UnitTest.go
+++ b/src/server/game/UnitTest.go
@@ -80,7 +80,7 @@ func UnitDecorate(p *Player) error {
 	PlayerBaseMod := p.GetPlayerBaseMod()
 	PlayerBaseMod.Data.Level = 6
 	PlayerBaseMod.Data.Exp = 50
-	PlayerBaseMod.AddExp(p, 100)
+	PlayerBaseMod.AddExp(p, 100, 0)
 	return nil
 }
 
diff --git a/src/server/msg/Gameapi.pb.go b/src/server/msg/Gameapi.pb.go
index f29dbfbf..2e87c3f9 100644
--- a/src/server/msg/Gameapi.pb.go
+++ b/src/server/msg/Gameapi.pb.go
@@ -2276,6 +2276,7 @@ type ResPlayerAsset struct {
 	Exp           int32                  `protobuf:"varint,7,opt,name=exp,proto3" json:"exp,omitempty"`
 	Login         int32                  `protobuf:"varint,8,opt,name=Login,proto3" json:"Login,omitempty"`
 	Logout        int32                  `protobuf:"varint,9,opt,name=Logout,proto3" json:"Logout,omitempty"`
+	PExp          int32                  `protobuf:"varint,10,opt,name=pExp,proto3" json:"pExp,omitempty"` // 玩家经验
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -2373,6 +2374,13 @@ func (x *ResPlayerAsset) GetLogout() int32 {
 	return 0
 }
 
+func (x *ResPlayerAsset) GetPExp() int32 {
+	if x != nil {
+		return x.PExp
+	}
+	return 0
+}
+
 // 客户端向服务器请求更新基本信息条目（没有响应）
 type UpdateBaseItemInfo struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
@@ -22972,7 +22980,7 @@ const file_proto_Gameapi_proto_rawDesc = "" +
 	"\n" +
 	"FaceBookId\x18\x17 \x01(\tR\n" +
 	"FaceBookId\"\x10\n" +
-	"\x0eReqPlayerAsset\"\xe5\x01\n" +
+	"\x0eReqPlayerAsset\"\xf9\x01\n" +
 	"\x0eResPlayerAsset\x12\x14\n" +
 	"\x05dwUin\x18\x01 \x01(\x03R\x05dwUin\x12\x16\n" +
 	"\x06energy\x18\x02 \x01(\x05R\x06energy\x12\x12\n" +
@@ -22982,7 +22990,9 @@ const file_proto_Gameapi_proto_rawDesc = "" +
 	"\x05level\x18\x06 \x01(\x05R\x05level\x12\x10\n" +
 	"\x03exp\x18\a \x01(\x05R\x03exp\x12\x14\n" +
 	"\x05Login\x18\b \x01(\x05R\x05Login\x12\x16\n" +
-	"\x06Logout\x18\t \x01(\x05R\x06Logout\"\xbb\x01\n" +
+	"\x06Logout\x18\t \x01(\x05R\x06Logout\x12\x12\n" +
+	"\x04pExp\x18\n" +
+	" \x01(\x05R\x04pExp\"\xbb\x01\n" +
 	"\x12UpdateBaseItemInfo\x12\x14\n" +
 	"\x05dwUin\x18\x01 \x01(\x03R\x05dwUin\x12O\n" +
 	"\vmUpdateItem\x18\x02 \x03(\v2-.tutorial.UpdateBaseItemInfo.MUpdateItemEntryR\vmUpdateItem\x1a>\n" +