diff --git a/src/server/game/ChampshipMgr.go b/src/server/game/ChampshipMgr.go index 86a0db04..8b5d029f 100644 --- a/src/server/game/ChampshipMgr.go +++ b/src/server/game/ChampshipMgr.go @@ -254,6 +254,7 @@ func (c *ChampshipMgr) GetPreRankMsg(Uid int) *proto.ResChampshipPreRank { Avatar: int32(SimplePlayer.Avatar), Face: int32(SimplePlayer.Face), Level: int32(SimplePlayer.Level), + Type: int32(v.Type), } } } diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index f218c40b..4d2cc4e1 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -515,7 +515,7 @@ func ReqDecorate(player *Player, buf []byte) error { } if DecorateMod.GetAreaId() != AreaId { // 解锁上报 player.TeLog("plot_unlock", map[string]interface{}{ - "plot_id": AreaId, + "plot_id": DecorateMod.GetAreaId(), }) } player.TeLog("finish_deco", map[string]interface{}{ diff --git a/src/server/game/UnitTest.go b/src/server/game/UnitTest.go index a8eb4b4f..513e40b0 100644 --- a/src/server/game/UnitTest.go +++ b/src/server/game/UnitTest.go @@ -298,6 +298,15 @@ func UnitTriggerMail(p *Player) error { return nil } +func UnitDecorateErr(p *Player) error { + DecorateMod := p.PlayMod.getDecorateMod() + if len(DecorateMod.FinishList) != DecorateMod.Progress { + log.Debug("decorate error uid %d", p.M_DwUin) + } + log.Debug("decorate ok uid %d", p.M_DwUin) + return nil +} + func UnitPlayroomOrder(p *Player) error { PlayroomMod := p.PlayMod.getPlayroomMod() PlayroomMod.CreateOrderReward(100, p.PlayMod.getItemMod()) diff --git a/src/server/msg/Gameapi.pb.go b/src/server/msg/Gameapi.pb.go index c2fa39ee..ffa1b440 100644 --- a/src/server/msg/Gameapi.pb.go +++ b/src/server/msg/Gameapi.pb.go @@ -704,6 +704,8 @@ const ( TIME_LINE_TYPE_LOG_TYPE_CARD_GIVE_ACCEPT TIME_LINE_TYPE = 28 // 接受卡牌请求 TIME_LINE_TYPE_LOG_TYPE_FRIEND_INVITE TIME_LINE_TYPE = 29 // 邀请注册 TIME_LINE_TYPE_LOG_TYPE_TREASURE_HELP TIME_LINE_TYPE = 30 // 宠物宝藏帮助 + TIME_LINE_TYPE_LOG_TYPE_FRIEND_SPONSOR TIME_LINE_TYPE = 31 // 好友赞助体力 + TIME_LINE_TYPE_LOG_TYPE_FRIEND_SPONSOR_GET TIME_LINE_TYPE = 32 // 获得好友赞助体力 ) // Enum value maps for TIME_LINE_TYPE. @@ -738,6 +740,8 @@ var ( 28: "LOG_TYPE_CARD_GIVE_ACCEPT", 29: "LOG_TYPE_FRIEND_INVITE", 30: "LOG_TYPE_TREASURE_HELP", + 31: "LOG_TYPE_FRIEND_SPONSOR", + 32: "LOG_TYPE_FRIEND_SPONSOR_GET", } TIME_LINE_TYPE_value = map[string]int32{ "DEFAULT": 0, @@ -769,6 +773,8 @@ var ( "LOG_TYPE_CARD_GIVE_ACCEPT": 28, "LOG_TYPE_FRIEND_INVITE": 29, "LOG_TYPE_TREASURE_HELP": 30, + "LOG_TYPE_FRIEND_SPONSOR": 31, + "LOG_TYPE_FRIEND_SPONSOR_GET": 32, } ) @@ -13551,6 +13557,7 @@ type ResPlayerRank struct { Avatar int32 `protobuf:"varint,4,opt,name=Avatar,proto3" json:"Avatar,omitempty"` Level int32 `protobuf:"varint,5,opt,name=Level,proto3" json:"Level,omitempty"` Score float32 `protobuf:"fixed32,6,opt,name=score,proto3" json:"score,omitempty"` + Type int32 `protobuf:"varint,7,opt,name=type,proto3" json:"type,omitempty"` // 排行类型 0:玩家 2:机器人 unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -13627,6 +13634,13 @@ func (x *ResPlayerRank) GetScore() float32 { return 0 } +func (x *ResPlayerRank) GetType() int32 { + if x != nil { + return x.Type + } + return 0 +} + type ResFriendLog struct { state protoimpl.MessageState `protogen:"open.v1"` Player *ResPlayerSimple `protobuf:"bytes,1,opt,name=Player,proto3" json:"Player,omitempty"` @@ -28123,14 +28137,15 @@ const file_proto_Gameapi_proto_rawDesc = "" + "\x06ActLog\x12\x12\n" + "\x04Type\x18\x01 \x01(\x05R\x04Type\x12\x12\n" + "\x04Time\x18\x02 \x01(\x03R\x04Time\x12\x14\n" + - "\x05Param\x18\x03 \x01(\tR\x05Param\"\x8d\x01\n" + + "\x05Param\x18\x03 \x01(\tR\x05Param\"\xa1\x01\n" + "\rResPlayerRank\x12\x10\n" + "\x03Uid\x18\x01 \x01(\x03R\x03Uid\x12\x12\n" + "\x04Name\x18\x02 \x01(\tR\x04Name\x12\x12\n" + "\x04Face\x18\x03 \x01(\x05R\x04Face\x12\x16\n" + "\x06Avatar\x18\x04 \x01(\x05R\x06Avatar\x12\x14\n" + "\x05Level\x18\x05 \x01(\x05R\x05Level\x12\x14\n" + - "\x05score\x18\x06 \x01(\x02R\x05score\"\xa7\x01\n" + + "\x05score\x18\x06 \x01(\x02R\x05score\x12\x12\n" + + "\x04type\x18\a \x01(\x05R\x04type\"\xa7\x01\n" + "\fResFriendLog\x121\n" + "\x06Player\x18\x01 \x01(\v2\x19.tutorial.ResPlayerSimpleR\x06Player\x12\x12\n" + "\x04Type\x18\x02 \x01(\x05R\x04Type\x12\x12\n" + @@ -29255,7 +29270,7 @@ const file_proto_Gameapi_proto_rawDesc = "" + "\n" + "CODE_LOGIN\x10\x01\x12\x10\n" + "\fDEVICE_LOGIN\x10\x02\x12\r\n" + - "\tSDK_LOGIN\x10\x03*\xb9\x06\n" + + "\tSDK_LOGIN\x10\x03*\xf7\x06\n" + "\x0eTIME_LINE_TYPE\x12\v\n" + "\aDEFAULT\x10\x00\x12\x19\n" + "\x15LOG_TYPE_FRIEND_APPLY\x10\x01\x12\x1a\n" + @@ -29286,7 +29301,9 @@ const file_proto_Gameapi_proto_rawDesc = "" + "\x1aLOG_TYPE_PLAYROOM_CAT_LOSE\x10\x1b\x12\x1d\n" + "\x19LOG_TYPE_CARD_GIVE_ACCEPT\x10\x1c\x12\x1a\n" + "\x16LOG_TYPE_FRIEND_INVITE\x10\x1d\x12\x1a\n" + - "\x16LOG_TYPE_TREASURE_HELP\x10\x1e*\x9b\x01\n" + + "\x16LOG_TYPE_TREASURE_HELP\x10\x1e\x12\x1b\n" + + "\x17LOG_TYPE_FRIEND_SPONSOR\x10\x1f\x12\x1f\n" + + "\x1bLOG_TYPE_FRIEND_SPONSOR_GET\x10 *\x9b\x01\n" + "\rCHESS_EX_TYPE\x12\x11\n" + "\rCHESS_EX_NONE\x10\x00\x12\x13\n" + "\x0fCHESS_EX_BUBBLE\x10\x01\x12\x10\n" +