pet_home/pet_home_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

playroom优化

Browse Source
This commit is contained in:
hahwu 2025-06-05 10:34:05 +08:00
parent d881f0e679
commit f2517b95bd
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/game/PlayerBack.go
View File

@ -95,6 +95,7 @@ func PlayroomBackData(p *Player) {
r.DailyTaskReward = GoUtil.IntToInt32(PlayroomMod.DailyTaskReward)
r.DailyTask = PlayroomMod.BackDataTask()
r.Kiss = int32(data.Kiss)
r.Revenge = PlayroomMod.Revenge
p.PushClientRes(r)
}

6
src/server/game/mod/playroom/playroom.go
View File

@ -52,7 +52,8 @@ type PlayroomMod struct {
DailyTask map[int]*DailyTask // 每日任务
DailyTaskReward []int // 每日任务奖励
Physiology map[int]*Physiology
InteractNum int // 互动次数
InteractNum int // 互动次数
Revenge bool // 是否复仇
}
type DailyTask struct {
@ -316,6 +317,7 @@ func (p *PlayroomMod) AddChip(Uid int, Time int64) {
return
}
p.ChipList = append(p.ChipList, &ChipInfo{Uid: Uid, Time: Time})
p.Revenge = true
}
func (p *PlayroomMod) SetTarget(Target int) {
@ -447,6 +449,7 @@ func (p *PlayroomMod) ResetGame() {
p.GameId = 0
p.GameReward = make(map[int]*item.Item)
p.InteractNum = 0
p.Revenge = false
}
func (p *PlayroomMod) ResetLose() {
@ -570,6 +573,7 @@ func (p *PlayroomMod) NotifyLose() *msg.NotifyPlayroomLose {
return &msg.NotifyPlayroomLose{
LoseItem: item.ItemToMsg(p.LoseItem),
Chip: ChipMessage,
Revenge: p.Revenge,
}
}
func (p *PlayroomMod) ResetPhysiology(MoodType int) {

26
src/server/msg/Gameapi.pb.go
View File

@ -18792,6 +18792,7 @@ type ResPlayroom struct {
DailyTaskReward []int32 `protobuf:"varint,24,rep,packed,name=DailyTaskReward,proto3" json:"DailyTaskReward,omitempty"` // 任务大奖励
InteractNum int32 `protobuf:"varint,25,opt,name=InteractNum,proto3" json:"InteractNum,omitempty"` // 互动次数
Kiss int32 `protobuf:"varint,26,opt,name=Kiss,proto3" json:"Kiss,omitempty"` // 亲吻次数
Revenge bool `protobuf:"varint,27,opt,name=Revenge,proto3" json:"Revenge,omitempty"` // 是否复仇
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -19008,6 +19009,13 @@ func (x *ResPlayroom) GetKiss() int32 {
return 0
}
func (x *ResPlayroom) GetRevenge() bool {
if x != nil {
return x.Revenge
}
return false
}
type NotifyPlayroomTask struct {
state protoimpl.MessageState `protogen:"open.v1"`
DailyTask []*DailyTask `protobuf:"bytes,1,rep,name=DailyTask,proto3" json:"DailyTask,omitempty"` // 每日任务
@ -19910,6 +19918,7 @@ type NotifyPlayroomLose struct {
state protoimpl.MessageState `protogen:"open.v1"`
LoseItem []*ItemInfo `protobuf:"bytes,1,rep,name=LoseItem,proto3" json:"LoseItem,omitempty"` // 损失的道具
Chip []*ChipInfo `protobuf:"bytes,2,rep,name=Chip,proto3" json:"Chip,omitempty"` // 碎片
Revenge bool `protobuf:"varint,3,opt,name=Revenge,proto3" json:"Revenge,omitempty"` // 是否复仇
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -19958,6 +19967,13 @@ func (x *NotifyPlayroomLose) GetChip() []*ChipInfo {
return nil
}
func (x *NotifyPlayroomLose) GetRevenge() bool {
if x != nil {
return x.Revenge
}
return false
}
type ChipInfo struct {
state protoimpl.MessageState `protogen:"open.v1"`
Uid int64 `protobuf:"varint,1,opt,name=Uid,proto3" json:"Uid,omitempty"` // 玩家id
@ -24246,7 +24262,7 @@ const file_proto_Gameapi_proto_rawDesc = "" +
"\rResRaceReward\x12&\n" +
"\x04Code\x18\x01 \x01(\x0e2\x12.tutorial.RES_CODER\x04Code\x12\x10\n" +
"\x03Msg\x18\x02 \x01(\tR\x03Msg\"\r\n" +
"\vReqPlayroom\"\xc9\n" +
"\vReqPlayroom\"\xe3\n" +
"\n" +
"\vResPlayroom\x12\x16\n" +
"\x06status\x18\x01 \x01(\x05R\x06status\x12(\n" +
@ -24279,7 +24295,8 @@ const file_proto_Gameapi_proto_rawDesc = "" +
"\tDailyTask\x18\x17 \x03(\v2\x13.tutorial.DailyTaskR\tDailyTask\x12(\n" +
"\x0fDailyTaskReward\x18\x18 \x03(\x05R\x0fDailyTaskReward\x12 \n" +
"\vInteractNum\x18\x19 \x01(\x05R\vInteractNum\x12\x12\n" +
"\x04Kiss\x18\x1a \x01(\x05R\x04Kiss\x1a;\n" +
"\x04Kiss\x18\x1a \x01(\x05R\x04Kiss\x12\x18\n" +
"\aRevenge\x18\x1b \x01(\bR\aRevenge\x1a;\n" +
"\rPlayroomEntry\x12\x10\n" +
"\x03key\x18\x01 \x01(\x05R\x03key\x12\x14\n" +
"\x05value\x18\x02 \x01(\x05R\x05value:\x028\x01\x1a7\n" +
@ -24349,10 +24366,11 @@ const file_proto_Gameapi_proto_rawDesc = "" +
"\tStartTime\x18\x01 \x01(\x05R\tStartTime\x12\x1e\n" +
"\n" +
"WorkStatus\x18\x02 \x01(\x05R\n" +
"WorkStatus\"l\n" +
"WorkStatus\"\x86\x01\n" +
"\x12NotifyPlayroomLose\x12.\n" +
"\bLoseItem\x18\x01 \x03(\v2\x12.tutorial.ItemInfoR\bLoseItem\x12&\n" +
"\x04Chip\x18\x02 \x03(\v2\x12.tutorial.ChipInfoR\x04Chip\"\x1c\n" +
"\x04Chip\x18\x02 \x03(\v2\x12.tutorial.ChipInfoR\x04Chip\x12\x18\n" +
"\aRevenge\x18\x03 \x01(\bR\aRevenge\"\x1c\n" +
"\bChipInfo\x12\x10\n" +
"\x03Uid\x18\x01 \x01(\x03R\x03Uid\"\xb0\x02\n" +
"\x12NotifyPlayroomMood\x12\x18\n" +