From 7096dc4e22c63507fa05512fa778201c50de48c9 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 30 Oct 2023 14:19:36 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/user/api_switchdefper.go | 2 + pb/user_msg.pb.go | 110 ++++++++++++++++++------------- 2 files changed, 67 insertions(+), 45 deletions(-) diff --git a/modules/user/api_switchdefper.go b/modules/user/api_switchdefper.go index 041d60af1..3d22f9bf7 100644 --- a/modules/user/api_switchdefper.go +++ b/modules/user/api_switchdefper.go @@ -177,12 +177,14 @@ func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchD CurSkin: user.CurSkin, CurAction: user.CurAction, CurBg: user.CurBg, + CurAframe: user.Curaframe, }) session.SendMsg(string(this.module.GetType()), "switchdefper", &pb.UserSwitchDefPerResp{ Issucc: true, CurSkin: user.CurSkin, CurAction: user.CurAction, CurBg: user.CurBg, + CurAframe: user.Curaframe, }) return } diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go index 9a81c2b1b..5ffa8d232 100644 --- a/pb/user_msg.pb.go +++ b/pb/user_msg.pb.go @@ -3122,6 +3122,7 @@ type UserSwitchDefPerResp struct { CurSkin string `protobuf:"bytes,2,opt,name=curSkin,proto3" json:"curSkin"` CurAction string `protobuf:"bytes,3,opt,name=curAction,proto3" json:"curAction"` CurBg string `protobuf:"bytes,4,opt,name=curBg,proto3" json:"curBg"` + CurAframe string `protobuf:"bytes,5,opt,name=curAframe,proto3" json:"curAframe"` } func (x *UserSwitchDefPerResp) Reset() { @@ -3184,6 +3185,13 @@ func (x *UserSwitchDefPerResp) GetCurBg() string { return "" } +func (x *UserSwitchDefPerResp) GetCurAframe() string { + if x != nil { + return x.CurAframe + } + return "" +} + type UserSkinlistPush struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -3194,6 +3202,7 @@ type UserSkinlistPush struct { CurAction string `protobuf:"bytes,3,opt,name=curAction,proto3" json:"curAction"` CurBg string `protobuf:"bytes,4,opt,name=curBg,proto3" json:"curBg"` Avatar string `protobuf:"bytes,5,opt,name=avatar,proto3" json:"avatar"` + CurAframe string `protobuf:"bytes,6,opt,name=curAframe,proto3" json:"curAframe"` } func (x *UserSkinlistPush) Reset() { @@ -3263,6 +3272,13 @@ func (x *UserSkinlistPush) GetAvatar() string { return "" } +func (x *UserSkinlistPush) GetCurAframe() string { + if x != nil { + return x.CurAframe + } + return "" +} + type UserRandomNameReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -3940,51 +3956,55 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x63, 0x75, 0x72, 0x42, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x66, 0x72, 0x61, 0x6d, 0x65, - 0x22, 0x7c, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x44, 0x65, - 0x66, 0x50, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, - 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, - 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, - 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, - 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42, - 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x22, 0x8e, - 0x01, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x50, - 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, - 0x53, 0x6b, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, - 0x6b, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, - 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x22, - 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, - 0x65, 0x52, 0x65, 0x71, 0x22, 0x40, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x64, - 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, - 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, - 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x10, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x71, 0x22, 0x30, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, - 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, - 0x74, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, - 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, - 0x65, 0x72, 0x47, 0x65, 0x74, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x71, 0x22, - 0x33, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, - 0x03, 0x61, 0x74, 0x6e, 0x22, 0x2a, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, - 0x74, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, - 0x22, 0x49, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54, 0x69, - 0x74, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, - 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, - 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x47, 0x0a, 0x11, 0x55, - 0x73, 0x65, 0x72, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x75, 0x73, 0x68, - 0x12, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x06, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0x9a, 0x01, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x44, + 0x65, 0x66, 0x50, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, + 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, + 0x63, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, + 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, + 0x42, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x12, + 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x22, 0xac, 0x01, + 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x50, 0x75, + 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, + 0x6b, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, + 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x1c, + 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x13, 0x0a, 0x11, + 0x55, 0x73, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, + 0x71, 0x22, 0x40, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, + 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, + 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, + 0x64, 0x65, 0x72, 0x22, 0x10, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x52, 0x65, 0x71, 0x22, 0x30, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, + 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, + 0x65, 0x74, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x12, + 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, + 0x6e, 0x22, 0x2a, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54, + 0x69, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x49, 0x0a, + 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x54, 0x69, 0x74, 0x6c, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x1a, 0x0a, 0x08, + 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x47, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, + 0x54, 0x69, 0x74, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, + 0x06, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x74, + 0x69, 0x74, 0x6c, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x74, 0x69, 0x74, 0x6c, + 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( From 927df75d9f07831d739c48cc1af3866da02afb54 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 30 Oct 2023 15:00:56 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_msgdistrib.json | 12 + bin/json/game_playerinfor_overview.json | 132 +++++- bin/json/game_playingmethod.json | 64 +++ comm/const.go | 5 + modules/island/api.go | 35 ++ modules/island/api_Info.go | 23 + modules/island/configure.go | 51 +++ modules/island/model.go | 49 +++ modules/island/modelhero.go | 37 ++ modules/island/module.go | 45 ++ pb/island_db.pb.go | 248 +++++++++++ pb/island_msg.pb.go | 541 ++++++++++++++++++++++++ 12 files changed, 1236 insertions(+), 6 deletions(-) create mode 100644 modules/island/api.go create mode 100644 modules/island/api_Info.go create mode 100644 modules/island/configure.go create mode 100644 modules/island/model.go create mode 100644 modules/island/modelhero.go create mode 100644 modules/island/module.go create mode 100644 pb/island_db.pb.go create mode 100644 pb/island_msg.pb.go diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json index 2681ae9cf..61c763669 100644 --- a/bin/json/game_msgdistrib.json +++ b/bin/json/game_msgdistrib.json @@ -154,5 +154,17 @@ "open": true, "routrules": "~/worker", "describe": "三消" + }, + { + "msgid": "gameinvite", + "open": true, + "routrules": "~/worker", + "describe": "游戏邀请" + }, + { + "msgid": "caninerabbit", + "open": true, + "routrules": "~/worker", + "describe": "犬兔大战" } ] \ No newline at end of file diff --git a/bin/json/game_playerinfor_overview.json b/bin/json/game_playerinfor_overview.json index d67a8eb00..420a9df4d 100644 --- a/bin/json/game_playerinfor_overview.json +++ b/bin/json/game_playerinfor_overview.json @@ -4,6 +4,7 @@ "sex": 1, "type": 1, "icon": "sbkp_js_nz", + "playerhead": "tx_js_nz", "tujing": [ 107 ], @@ -13,10 +14,13 @@ "pvpAnimator": "Person/10000/10000_MPvp.controller", "mainq": "Person/10000/10000M_q.prefab", "vagueq": "Person/10000/10000MT_q.prefab", - "playerhead": "tx_js_nz", "name": { "key": "playerinfor_playerinfor_overview_name_1", "text": "陈旧服饰" + }, + "txt": { + "key": "playerinfor_playerinfor_overview_txt_1", + "text": "" } }, { @@ -24,6 +28,7 @@ "sex": 2, "type": 1, "icon": "sbkp_js_nvz", + "playerhead": "tx_js_nvz", "tujing": [ 107 ], @@ -33,10 +38,13 @@ "pvpAnimator": "Person/10000/10000_WPvp.controller", "mainq": "Person/10000/10000W_q.prefab", "vagueq": "Person/10000/10000WT_q.prefab", - "playerhead": "tx_js_nvz", "name": { "key": "playerinfor_playerinfor_overview_name_2", "text": "陈旧服饰" + }, + "txt": { + "key": "playerinfor_playerinfor_overview_txt_2", + "text": "" } }, { @@ -44,6 +52,7 @@ "sex": 1, "type": 2, "icon": "zj_dz_001", + "playerhead": "tx_js_nz", "tujing": [ 107 ], @@ -53,10 +62,13 @@ "pvpAnimator": "", "mainq": "", "vagueq": "", - "playerhead": "tx_js_nz", "name": { "key": "playerinfor_playerinfor_overview_name_3", "text": "陈述观念" + }, + "txt": { + "key": "playerinfor_playerinfor_overview_txt_3", + "text": "" } }, { @@ -64,6 +76,7 @@ "sex": 2, "type": 2, "icon": "zj_dz_002", + "playerhead": "tx_js_nvz", "tujing": [ 107 ], @@ -73,10 +86,13 @@ "pvpAnimator": "", "mainq": "", "vagueq": "", - "playerhead": "tx_js_nvz", "name": { "key": "playerinfor_playerinfor_overview_name_4", "text": "讲解原理" + }, + "txt": { + "key": "playerinfor_playerinfor_overview_txt_4", + "text": "" } }, { @@ -84,6 +100,7 @@ "sex": 1, "type": 3, "icon": "zj_dz_003", + "playerhead": "tx_js_nz", "tujing": [ 107 ], @@ -93,10 +110,13 @@ "pvpAnimator": "", "mainq": "", "vagueq": "", - "playerhead": "tx_js_nz", "name": { "key": "playerinfor_playerinfor_overview_name_5", "text": "虚无星空" + }, + "txt": { + "key": "playerinfor_playerinfor_overview_txt_5", + "text": "" } }, { @@ -104,6 +124,7 @@ "sex": 2, "type": 3, "icon": "zj_dz_004", + "playerhead": "tx_js_nvz", "tujing": [ 107 ], @@ -113,10 +134,109 @@ "pvpAnimator": "", "mainq": "", "vagueq": "", - "playerhead": "tx_js_nvz", "name": { "key": "playerinfor_playerinfor_overview_name_6", "text": "虚无星空" + }, + "txt": { + "key": "playerinfor_playerinfor_overview_txt_6", + "text": "" + } + }, + { + "id": "16010401", + "sex": 0, + "type": 4, + "icon": "zj_txk_01", + "playerhead": "zj_txk_01", + "tujing": [ + 107 + ], + "url": "", + "resources": "", + "vague": "", + "pvpAnimator": "", + "mainq": "", + "vagueq": "", + "name": { + "key": "playerinfor_playerinfor_overview_name_7", + "text": "头像框1" + }, + "txt": { + "key": "playerinfor_playerinfor_overview_txt_7", + "text": "头像框道具明细1" + } + }, + { + "id": "16010402", + "sex": 0, + "type": 4, + "icon": "zj_txk_02", + "playerhead": "zj_txk_02", + "tujing": [ + 107 + ], + "url": "", + "resources": "", + "vague": "", + "pvpAnimator": "", + "mainq": "", + "vagueq": "", + "name": { + "key": "playerinfor_playerinfor_overview_name_8", + "text": "头像框2" + }, + "txt": { + "key": "playerinfor_playerinfor_overview_txt_8", + "text": "头像框道具明细2" + } + }, + { + "id": "16010403", + "sex": 0, + "type": 4, + "icon": "zj_txk_03", + "playerhead": "zj_txk_03", + "tujing": [ + 107 + ], + "url": "", + "resources": "", + "vague": "", + "pvpAnimator": "", + "mainq": "", + "vagueq": "", + "name": { + "key": "playerinfor_playerinfor_overview_name_9", + "text": "头像框3" + }, + "txt": { + "key": "playerinfor_playerinfor_overview_txt_9", + "text": "头像框道具明细3" + } + }, + { + "id": "16010404", + "sex": 0, + "type": 4, + "icon": "zj_txk_04", + "playerhead": "zj_txk_04", + "tujing": [ + 107 + ], + "url": "", + "resources": "", + "vague": "", + "pvpAnimator": "", + "mainq": "", + "vagueq": "", + "name": { + "key": "playerinfor_playerinfor_overview_name_10", + "text": "头像框4" + }, + "txt": { + "key": "playerinfor_playerinfor_overview_txt_10", + "text": "头像框道具明细4" } } ] \ No newline at end of file diff --git a/bin/json/game_playingmethod.json b/bin/json/game_playingmethod.json index f86cfc57c..0a6ac999d 100644 --- a/bin/json/game_playingmethod.json +++ b/bin/json/game_playingmethod.json @@ -15,6 +15,22 @@ "detail": 1, "weight": 0 }, + { + "key": 2, + "open": 999999, + "icon": "", + "name": { + "key": "consume_consume_playingmethod_name_02", + "text": "3分模式" + }, + "txt": { + "key": "consume_consume_playingmethod_txt_02", + "text": "额外新增3分方块，独立于普通6色方块之外，消除后可以获得3分。" + }, + "type": 2, + "detail": 1, + "weight": 2000 + }, { "key": 3, "open": 999999, @@ -46,5 +62,53 @@ "type": 2, "detail": 1, "weight": 2000 + }, + { + "key": 5, + "open": 999999, + "icon": "", + "name": { + "key": "consume_consume_playingmethod_name_05", + "text": "锣鼓喧天" + }, + "txt": { + "key": "consume_consume_playingmethod_txt_05", + "text": "中央格子被改造为锣鼓，消除锣鼓内的方块会获得额外积分，每次操作如果没有触发锣鼓内的方块消除，积分可以被累计。" + }, + "type": 2, + "detail": 2, + "weight": 2000 + }, + { + "key": 6, + "open": 999999, + "icon": "", + "name": { + "key": "consume_consume_playingmethod_name_06", + "text": "电闪雷鸣" + }, + "txt": { + "key": "consume_consume_playingmethod_txt_06", + "text": "每名玩家行动开始会随机生成2个雷电格子，消除雷电格子内的方块会获得一次行动步骤。" + }, + "type": 2, + "detail": 2, + "weight": 2000 + }, + { + "key": 7, + "open": 999999, + "icon": "", + "name": { + "key": "consume_consume_playingmethod_name_07", + "text": "飞天舞女" + }, + "txt": { + "key": "consume_consume_playingmethod_txt_07", + "text": "每名玩家行动开始会随机生成2个飞天舞女格子，消除飞天舞女格子内的方块会消除周围所有方块。" + }, + "type": 2, + "detail": 2, + "weight": 2000 } ] \ No newline at end of file diff --git a/comm/const.go b/comm/const.go index 08321f6a3..e47b23fb2 100644 --- a/comm/const.go +++ b/comm/const.go @@ -120,6 +120,7 @@ const ( ModuleTreasureMap core.M_Modules = "treasuremap" //藏宝图 ModuleGameInvite core.M_Modules = "gameinvite" //游戏邀请 ModuleCanineRabbit core.M_Modules = "caninerabbit" //犬兔游戏 + ModuleIsLand core.M_Modules = "island" //海岛探险 ) // 数据表名定义处 @@ -407,6 +408,10 @@ const ( TableDcolor = "dcolor" TablekCanineRabbit = "caninerabbit" TableEntertainm = "entertainm" + //海岛 + TableIsLand = "island" + //海岛 + TableIsLandHero = "islandhero" ) // RPC服务接口定义处 diff --git a/modules/island/api.go b/modules/island/api.go new file mode 100644 index 000000000..6c544c5ad --- /dev/null +++ b/modules/island/api.go @@ -0,0 +1,35 @@ +package island + +import ( + "go_dreamfactory/modules" + + "go_dreamfactory/lego/core" +) + +const ( //消息回复的头名称 + GetlistResp = "getlistresp" + UseItemResp = "useitemresp" + SellItemResp = "sellitemresp" +) + +/* +背包 处理用户的请求组件 必须继承 modules.MComp_GateComp +*/ +type apiComp struct { + modules.MCompGate + service core.IService + module *IsLand +} + +//组件初始化接口 +func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.MCompGate.Init(service, module, comp, options) + this.module = module.(*IsLand) + this.service = service + return +} + +func (this *apiComp) Start() (err error) { + err = this.MCompGate.Start() + return +} diff --git a/modules/island/api_Info.go b/modules/island/api_Info.go new file mode 100644 index 000000000..26a36c47b --- /dev/null +++ b/modules/island/api_Info.go @@ -0,0 +1,23 @@ +package island + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +// 参数校验 +func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.IsLandInfoReq) (errdata *pb.ErrorData) { + + return +} + +// /获取自己的排行榜信息 +func (this *apiComp) Info(session comm.IUserSession, req *pb.IsLandInfoReq) (errdata *pb.ErrorData) { + var () + if errdata = this.InfoCheck(session, req); errdata != nil { + return + } + + session.SendMsg(string(this.module.GetType()), "info", &pb.IsLandInfoResp{}) + return +} diff --git a/modules/island/configure.go b/modules/island/configure.go new file mode 100644 index 000000000..fc6bfc042 --- /dev/null +++ b/modules/island/configure.go @@ -0,0 +1,51 @@ +package island + +import ( + "fmt" + "go_dreamfactory/modules" + cfg "go_dreamfactory/sys/configure/structs" + + "go_dreamfactory/lego/core" +) + +const ( + game_item = "game_item.json" + game_potions = "game_potions.json" + + // game_propsgroup = "game_propsgroup.json" + // game_propsgrouplist = "game_propsgrouplist.json" +) + +// /背包配置管理组件 +type ConfigureComp struct { + modules.MCompConfigure + module *IsLand +} + +// 组件初始化接口 +func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.MCompConfigure.Init(service, module, comp, options) + this.module = module.(*IsLand) + err = this.LoadConfigure(game_item, cfg.NewGameItem) + err = this.LoadConfigure(game_potions, cfg.NewGamePotions) + return +} + +// 读取物品配置 +func (this *ConfigureComp) GetMaterialConfigure(id int32) (configure *cfg.GamePotionsData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(game_potions); err != nil { + this.module.Errorf("err:%v", err) + return + } else { + if configure, ok = v.(*cfg.GamePotions).GetDataMap()[id]; !ok { + err = fmt.Errorf("no found Material:%d configure", id) + this.module.Errorf("err:%v", err) + return + } + } + return +} diff --git a/modules/island/model.go b/modules/island/model.go new file mode 100644 index 000000000..1a1897db6 --- /dev/null +++ b/modules/island/model.go @@ -0,0 +1,49 @@ +package island + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/mgo" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + + "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +type modelComp struct { + modules.MCompModel + module *IsLand +} + +func (this *modelComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompModel.Init(service, module, comp, options) + this.TableName = comm.TableIsLand + this.module = module.(*IsLand) + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + }) + return +} + +// 读取数据 +func (this *modelComp) getmodel(uid string) (result *pb.DBIsland, err error) { + result = &pb.DBIsland{} + if err = this.Get(uid, result); err != nil && err != mgo.MongodbNil { + this.module.Errorln(err) + } + if err == mgo.MongodbNil { + result = &pb.DBIsland{ + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Islands: make(map[int32]*pb.DBIslandItem), + } + if err = this.Add(uid, result); err != nil { + this.module.Errorln(err) + return + } + } + err = nil + return +} diff --git a/modules/island/modelhero.go b/modules/island/modelhero.go new file mode 100644 index 000000000..69de240af --- /dev/null +++ b/modules/island/modelhero.go @@ -0,0 +1,37 @@ +package island + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +type modelHeroComp struct { + modules.MCompModel + module *IsLand +} + +func (this *modelHeroComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompModel.Init(service, module, comp, options) + this.TableName = comm.TableIsLandHero + this.module = module.(*IsLand) + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + }) + return +} + +// 读取数据 +// 获取玩家的英雄列表 +func (this *modelHeroComp) getHeroList(uid string) []*pb.DBHero { + heroes := make([]*pb.DBHero, 0) + err := this.GetList(uid, &heroes) + if err != nil { + return nil + } + return heroes +} diff --git a/modules/island/module.go b/modules/island/module.go new file mode 100644 index 000000000..3509f2a15 --- /dev/null +++ b/modules/island/module.go @@ -0,0 +1,45 @@ +package island + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/base" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" +) + +/* +模块名:Pack +描述:背包系统模块 +开发:李伟 +*/ +func NewModule() core.IModule { + m := new(IsLand) + return m +} + +type IsLand struct { + modules.ModuleBase + service base.IRPCXService + privilege comm.IPrivilege + api *apiComp + model *modelComp + configure *ConfigureComp +} + +func (this *IsLand) GetType() core.M_Modules { + return comm.ModuleGameInvite +} + +func (this *IsLand) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { + if err = this.ModuleBase.Init(service, module, options); err != nil { + return + } + this.service = service.(comm.IService) + return +} + +func (this *IsLand) OnInstallComp() { + this.ModuleBase.OnInstallComp() + this.api = this.RegisterComp(new(apiComp)).(*apiComp) + this.model = this.RegisterComp(new(modelComp)).(*modelComp) +} diff --git a/pb/island_db.pb.go b/pb/island_db.pb.go new file mode 100644 index 000000000..d7e733240 --- /dev/null +++ b/pb/island_db.pb.go @@ -0,0 +1,248 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: island/island_db.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type DBIsland struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` + Islands map[int32]*DBIslandItem `protobuf:"bytes,4,rep,name=islands,proto3" json:"islands" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //岛屿 +} + +func (x *DBIsland) Reset() { + *x = DBIsland{} + if protoimpl.UnsafeEnabled { + mi := &file_island_island_db_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBIsland) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBIsland) ProtoMessage() {} + +func (x *DBIsland) ProtoReflect() protoreflect.Message { + mi := &file_island_island_db_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DBIsland.ProtoReflect.Descriptor instead. +func (*DBIsland) Descriptor() ([]byte, []int) { + return file_island_island_db_proto_rawDescGZIP(), []int{0} +} + +func (x *DBIsland) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBIsland) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBIsland) GetIslands() map[int32]*DBIslandItem { + if x != nil { + return x.Islands + } + return nil +} + +//海岛地图 +type DBIslandItem struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` + Level map[int32]int32 `protobuf:"bytes,2,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //key 关卡id value 0或者不存在 表示未通关 不等于 0表示通关 不等于 1 表示 选择的剧情id +} + +func (x *DBIslandItem) Reset() { + *x = DBIslandItem{} + if protoimpl.UnsafeEnabled { + mi := &file_island_island_db_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBIslandItem) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBIslandItem) ProtoMessage() {} + +func (x *DBIslandItem) ProtoReflect() protoreflect.Message { + mi := &file_island_island_db_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DBIslandItem.ProtoReflect.Descriptor instead. +func (*DBIslandItem) Descriptor() ([]byte, []int) { + return file_island_island_db_proto_rawDescGZIP(), []int{1} +} + +func (x *DBIslandItem) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *DBIslandItem) GetLevel() map[int32]int32 { + if x != nil { + return x.Level + } + return nil +} + +var File_island_island_db_proto protoreflect.FileDescriptor + +var file_island_island_db_proto_rawDesc = []byte{ + 0x0a, 0x16, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2f, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x5f, + 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa9, 0x01, 0x0a, 0x08, 0x44, 0x42, 0x49, + 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x30, 0x0a, 0x07, 0x69, 0x73, 0x6c, 0x61, 0x6e, + 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, + 0x61, 0x6e, 0x64, 0x2e, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x07, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x1a, 0x49, 0x0a, 0x0c, 0x49, 0x73, 0x6c, + 0x61, 0x6e, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x49, + 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x22, 0x88, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, + 0x64, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49, + 0x74, 0x65, 0x6d, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, + 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_island_island_db_proto_rawDescOnce sync.Once + file_island_island_db_proto_rawDescData = file_island_island_db_proto_rawDesc +) + +func file_island_island_db_proto_rawDescGZIP() []byte { + file_island_island_db_proto_rawDescOnce.Do(func() { + file_island_island_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_island_island_db_proto_rawDescData) + }) + return file_island_island_db_proto_rawDescData +} + +var file_island_island_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_island_island_db_proto_goTypes = []interface{}{ + (*DBIsland)(nil), // 0: DBIsland + (*DBIslandItem)(nil), // 1: DBIslandItem + nil, // 2: DBIsland.IslandsEntry + nil, // 3: DBIslandItem.LevelEntry +} +var file_island_island_db_proto_depIdxs = []int32{ + 2, // 0: DBIsland.islands:type_name -> DBIsland.IslandsEntry + 3, // 1: DBIslandItem.level:type_name -> DBIslandItem.LevelEntry + 1, // 2: DBIsland.IslandsEntry.value:type_name -> DBIslandItem + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name +} + +func init() { file_island_island_db_proto_init() } +func file_island_island_db_proto_init() { + if File_island_island_db_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_island_island_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBIsland); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_island_island_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBIslandItem); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_island_island_db_proto_rawDesc, + NumEnums: 0, + NumMessages: 4, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_island_island_db_proto_goTypes, + DependencyIndexes: file_island_island_db_proto_depIdxs, + MessageInfos: file_island_island_db_proto_msgTypes, + }.Build() + File_island_island_db_proto = out.File + file_island_island_db_proto_rawDesc = nil + file_island_island_db_proto_goTypes = nil + file_island_island_db_proto_depIdxs = nil +} diff --git a/pb/island_msg.pb.go b/pb/island_msg.pb.go new file mode 100644 index 000000000..e17d5c1e2 --- /dev/null +++ b/pb/island_msg.pb.go @@ -0,0 +1,541 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: island/island_msg.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +//海岛探险 +type IsLandInfoReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *IsLandInfoReq) Reset() { + *x = IsLandInfoReq{} + if protoimpl.UnsafeEnabled { + mi := &file_island_island_msg_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *IsLandInfoReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*IsLandInfoReq) ProtoMessage() {} + +func (x *IsLandInfoReq) ProtoReflect() protoreflect.Message { + mi := &file_island_island_msg_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use IsLandInfoReq.ProtoReflect.Descriptor instead. +func (*IsLandInfoReq) Descriptor() ([]byte, []int) { + return file_island_island_msg_proto_rawDescGZIP(), []int{0} +} + +type IsLandInfoResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Info *DBIsland `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` + Heros []*DBHero `protobuf:"bytes,2,rep,name=heros,proto3" json:"heros"` +} + +func (x *IsLandInfoResp) Reset() { + *x = IsLandInfoResp{} + if protoimpl.UnsafeEnabled { + mi := &file_island_island_msg_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *IsLandInfoResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*IsLandInfoResp) ProtoMessage() {} + +func (x *IsLandInfoResp) ProtoReflect() protoreflect.Message { + mi := &file_island_island_msg_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use IsLandInfoResp.ProtoReflect.Descriptor instead. +func (*IsLandInfoResp) Descriptor() ([]byte, []int) { + return file_island_island_msg_proto_rawDescGZIP(), []int{1} +} + +func (x *IsLandInfoResp) GetInfo() *DBIsland { + if x != nil { + return x.Info + } + return nil +} + +func (x *IsLandInfoResp) GetHeros() []*DBHero { + if x != nil { + return x.Heros + } + return nil +} + +//海岛探险 战斗 请求 +type IsLandBattleReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` + Battle *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"` //战斗类型 +} + +func (x *IsLandBattleReq) Reset() { + *x = IsLandBattleReq{} + if protoimpl.UnsafeEnabled { + mi := &file_island_island_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *IsLandBattleReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*IsLandBattleReq) ProtoMessage() {} + +func (x *IsLandBattleReq) ProtoReflect() protoreflect.Message { + mi := &file_island_island_msg_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use IsLandBattleReq.ProtoReflect.Descriptor instead. +func (*IsLandBattleReq) Descriptor() ([]byte, []int) { + return file_island_island_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *IsLandBattleReq) GetLevel() int32 { + if x != nil { + return x.Level + } + return 0 +} + +func (x *IsLandBattleReq) GetBattle() *BattleFormation { + if x != nil { + return x.Battle + } + return nil +} + +//海岛探险 战斗 回应 +type IsLandBattleResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` + Info *BattleInfo `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` //战斗信息 +} + +func (x *IsLandBattleResp) Reset() { + *x = IsLandBattleResp{} + if protoimpl.UnsafeEnabled { + mi := &file_island_island_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *IsLandBattleResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*IsLandBattleResp) ProtoMessage() {} + +func (x *IsLandBattleResp) ProtoReflect() protoreflect.Message { + mi := &file_island_island_msg_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use IsLandBattleResp.ProtoReflect.Descriptor instead. +func (*IsLandBattleResp) Descriptor() ([]byte, []int) { + return file_island_island_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *IsLandBattleResp) GetLevel() int32 { + if x != nil { + return x.Level + } + return 0 +} + +func (x *IsLandBattleResp) GetInfo() *BattleInfo { + if x != nil { + return x.Info + } + return nil +} + +//海岛探险 关卡完成 请求 +type IsLandCompleteReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` + Story int32 `protobuf:"varint,2,opt,name=story,proto3" json:"story"` + Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报 打怪事件完成需要提交战报 +} + +func (x *IsLandCompleteReq) Reset() { + *x = IsLandCompleteReq{} + if protoimpl.UnsafeEnabled { + mi := &file_island_island_msg_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *IsLandCompleteReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*IsLandCompleteReq) ProtoMessage() {} + +func (x *IsLandCompleteReq) ProtoReflect() protoreflect.Message { + mi := &file_island_island_msg_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use IsLandCompleteReq.ProtoReflect.Descriptor instead. +func (*IsLandCompleteReq) Descriptor() ([]byte, []int) { + return file_island_island_msg_proto_rawDescGZIP(), []int{4} +} + +func (x *IsLandCompleteReq) GetLevel() int32 { + if x != nil { + return x.Level + } + return 0 +} + +func (x *IsLandCompleteReq) GetStory() int32 { + if x != nil { + return x.Story + } + return 0 +} + +func (x *IsLandCompleteReq) GetReport() *BattleReport { + if x != nil { + return x.Report + } + return nil +} + +//海岛探险 关卡完成 回应 +type IsLandCompleteResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` + Story int32 `protobuf:"varint,2,opt,name=story,proto3" json:"story"` + Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励 +} + +func (x *IsLandCompleteResp) Reset() { + *x = IsLandCompleteResp{} + if protoimpl.UnsafeEnabled { + mi := &file_island_island_msg_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *IsLandCompleteResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*IsLandCompleteResp) ProtoMessage() {} + +func (x *IsLandCompleteResp) ProtoReflect() protoreflect.Message { + mi := &file_island_island_msg_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use IsLandCompleteResp.ProtoReflect.Descriptor instead. +func (*IsLandCompleteResp) Descriptor() ([]byte, []int) { + return file_island_island_msg_proto_rawDescGZIP(), []int{5} +} + +func (x *IsLandCompleteResp) GetLevel() int32 { + if x != nil { + return x.Level + } + return 0 +} + +func (x *IsLandCompleteResp) GetStory() int32 { + if x != nil { + return x.Story + } + return 0 +} + +func (x *IsLandCompleteResp) GetAward() []*UserAtno { + if x != nil { + return x.Award + } + return nil +} + +var File_island_island_msg_proto protoreflect.FileDescriptor + +var file_island_island_msg_proto_rawDesc = []byte{ + 0x0a, 0x17, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2f, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x5f, + 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x69, 0x73, 0x6c, 0x61, 0x6e, + 0x64, 0x2f, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x68, 0x65, 0x72, 0x6f, + 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, + 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x0f, 0x0a, 0x0d, 0x49, 0x73, + 0x4c, 0x61, 0x6e, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x4e, 0x0a, 0x0e, 0x49, + 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, + 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, + 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x05, + 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, + 0x48, 0x65, 0x72, 0x6f, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x22, 0x51, 0x0a, 0x0f, 0x49, + 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, + 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, + 0x65, 0x76, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, + 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x49, + 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, + 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x66, 0x0a, 0x11, 0x49, 0x73, 0x4c, + 0x61, 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, + 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, + 0x65, 0x76, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, + 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, + 0x74, 0x22, 0x61, 0x0a, 0x12, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, + 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x14, 0x0a, + 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, + 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_island_island_msg_proto_rawDescOnce sync.Once + file_island_island_msg_proto_rawDescData = file_island_island_msg_proto_rawDesc +) + +func file_island_island_msg_proto_rawDescGZIP() []byte { + file_island_island_msg_proto_rawDescOnce.Do(func() { + file_island_island_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_island_island_msg_proto_rawDescData) + }) + return file_island_island_msg_proto_rawDescData +} + +var file_island_island_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_island_island_msg_proto_goTypes = []interface{}{ + (*IsLandInfoReq)(nil), // 0: IsLandInfoReq + (*IsLandInfoResp)(nil), // 1: IsLandInfoResp + (*IsLandBattleReq)(nil), // 2: IsLandBattleReq + (*IsLandBattleResp)(nil), // 3: IsLandBattleResp + (*IsLandCompleteReq)(nil), // 4: IsLandCompleteReq + (*IsLandCompleteResp)(nil), // 5: IsLandCompleteResp + (*DBIsland)(nil), // 6: DBIsland + (*DBHero)(nil), // 7: DBHero + (*BattleFormation)(nil), // 8: BattleFormation + (*BattleInfo)(nil), // 9: BattleInfo + (*BattleReport)(nil), // 10: BattleReport + (*UserAtno)(nil), // 11: UserAtno +} +var file_island_island_msg_proto_depIdxs = []int32{ + 6, // 0: IsLandInfoResp.info:type_name -> DBIsland + 7, // 1: IsLandInfoResp.heros:type_name -> DBHero + 8, // 2: IsLandBattleReq.battle:type_name -> BattleFormation + 9, // 3: IsLandBattleResp.info:type_name -> BattleInfo + 10, // 4: IsLandCompleteReq.report:type_name -> BattleReport + 11, // 5: IsLandCompleteResp.award:type_name -> UserAtno + 6, // [6:6] is the sub-list for method output_type + 6, // [6:6] is the sub-list for method input_type + 6, // [6:6] is the sub-list for extension type_name + 6, // [6:6] is the sub-list for extension extendee + 0, // [0:6] is the sub-list for field type_name +} + +func init() { file_island_island_msg_proto_init() } +func file_island_island_msg_proto_init() { + if File_island_island_msg_proto != nil { + return + } + file_island_island_db_proto_init() + file_battle_battle_msg_proto_init() + file_hero_hero_db_proto_init() + file_comm_proto_init() + if !protoimpl.UnsafeEnabled { + file_island_island_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*IsLandInfoReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_island_island_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*IsLandInfoResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_island_island_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*IsLandBattleReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_island_island_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*IsLandBattleResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_island_island_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*IsLandCompleteReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_island_island_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*IsLandCompleteResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_island_island_msg_proto_rawDesc, + NumEnums: 0, + NumMessages: 6, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_island_island_msg_proto_goTypes, + DependencyIndexes: file_island_island_msg_proto_depIdxs, + MessageInfos: file_island_island_msg_proto_msgTypes, + }.Build() + File_island_island_msg_proto = out.File + file_island_island_msg_proto_rawDesc = nil + file_island_island_msg_proto_goTypes = nil + file_island_island_msg_proto_depIdxs = nil +} From 4dca086bed18b5a1080a1c3d871c7287eab045a5 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 30 Oct 2023 15:04:23 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=AE=E8=82=A4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/user/module.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/user/module.go b/modules/user/module.go index c44097af6..240d98200 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -1224,6 +1224,7 @@ func (this *User) AddPer(session comm.IUserSession, pers map[string]int32, bPush CurAction: user.CurAction, CurBg: user.CurBg, Avatar: user.Avatar, + CurAframe: user.Curaframe, }) } return From 296ab08423861986d83ca8f8a7fc2b9982f39718 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 30 Oct 2023 15:07:28 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys/configure/structs/Game.PlayerInfor_overviewData.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/configure/structs/Game.PlayerInfor_overviewData.go b/sys/configure/structs/Game.PlayerInfor_overviewData.go index bb35886d9..3b8c72567 100644 --- a/sys/configure/structs/Game.PlayerInfor_overviewData.go +++ b/sys/configure/structs/Game.PlayerInfor_overviewData.go @@ -15,6 +15,7 @@ type GamePlayerInfor_overviewData struct { Sex int32 Type int32 Icon string + Playerhead string Tujing []int32 Url string Resources string @@ -22,8 +23,8 @@ type GamePlayerInfor_overviewData struct { PvpAnimator string Mainq string Vagueq string - Playerhead string Name string + Txt string } const TypeId_GamePlayerInfor_overviewData = -725250341 @@ -37,6 +38,7 @@ func (_v *GamePlayerInfor_overviewData)Deserialize(_buf map[string]interface{}) { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sex"].(float64); !_ok_ { err = errors.New("sex error"); return }; _v.Sex = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + { var _ok_ bool; if _v.Playerhead, _ok_ = _buf["playerhead"].(string); !_ok_ { err = errors.New("playerhead error"); return } } { var _arr_ []interface{} var _ok_ bool @@ -57,8 +59,8 @@ func (_v *GamePlayerInfor_overviewData)Deserialize(_buf map[string]interface{}) { var _ok_ bool; if _v.PvpAnimator, _ok_ = _buf["pvpAnimator"].(string); !_ok_ { err = errors.New("pvpAnimator error"); return } } { var _ok_ bool; if _v.Mainq, _ok_ = _buf["mainq"].(string); !_ok_ { err = errors.New("mainq error"); return } } { var _ok_ bool; if _v.Vagueq, _ok_ = _buf["vagueq"].(string); !_ok_ { err = errors.New("vagueq error"); return } } - { var _ok_ bool; if _v.Playerhead, _ok_ = _buf["playerhead"].(string); !_ok_ { err = errors.New("playerhead error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return } From 4f92e949688d94c8693f3c032053ba08734c5e17 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 30 Oct 2023 15:12:12 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/entertainment/configure.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/entertainment/configure.go b/modules/entertainment/configure.go index ac9ed0529..0c6c8d183 100644 --- a/modules/entertainment/configure.go +++ b/modules/entertainment/configure.go @@ -15,7 +15,7 @@ const ( game_block = "game_block.json" game_consumehero = "game_consumehero.json" game_integral = "game_integral.json" - game_consumeIntegral = "game_consumeIntegral.json" + game_consumeIntegral = "game_consumeintegral.json" game_playingmethod = "game_playingmethod.json" ) From 9cdf4d0cf80f4b536190891f62fd04ae01c8fa95 Mon Sep 17 00:00:00 2001 From: liwei Date: Mon, 30 Oct 2023 15:12:53 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/start.sh | 4 +++- bin/stop.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/start.sh b/bin/start.sh index cfde5e35b..66d1b2c41 100755 --- a/bin/start.sh +++ b/bin/start.sh @@ -6,11 +6,13 @@ sleep 1 ./stup.sh start df01_mainte mainte ./conf/df01_mainte.yaml sleep 1 ./stup.sh start df01_worker0 worker ./conf/df01_worker0.yaml +sleep 1 +./stup.sh start df01_worker1 worker ./conf/df01_worker1.yaml sleep 5 ./stup.sh start df01_gateway0 gateway ./conf/df01_gateway0.yaml sleep 1 -curl -XPOST -s -L 'https://oapi.dingtalk.com/robot/send?access_token=afd9b57c786ddfb5d370500dcee1ca97e5449952c536c8575a7f491fd1a59a5b' -H 'Content-Type: application/json' -H "charset:utf-8" -d '{"msgtype": "text", +curl -XPOST -s -L 'https://oapi.dingtalk.com/robot/send?access_token=c6d2066cd4b36882b5dc3033e359a1c1b259eb4fd6cb69f397a65f544dbce86f' -H 'Content-Type: application/json' -H "charset:utf-8" -d '{"msgtype": "text", "text": { diff --git a/bin/stop.sh b/bin/stop.sh index 181d38c6b..70600fc53 100755 --- a/bin/stop.sh +++ b/bin/stop.sh @@ -1,5 +1,5 @@ #!/bin/sh -curl -XPOST -s -L 'https://oapi.dingtalk.com/robot/send?access_token=afd9b57c786ddfb5d370500dcee1ca97e5449952c536c8575a7f491fd1a59a5b' -H 'Content-Type: application/json' -H "charset:utf-8" -d '{"msgtype": "text", +curl -XPOST -s -L 'https://oapi.dingtalk.com/robot/send?access_token=c6d2066cd4b36882b5dc3033e359a1c1b259eb4fd6cb69f397a65f544dbce86f' -H 'Content-Type: application/json' -H "charset:utf-8" -d '{"msgtype": "text", "text": { @@ -15,6 +15,8 @@ curl -XPOST -s -L 'https://oapi.dingtalk.com/robot/send?access_token=afd9b57c78 ./stup.sh stop df01_worker0 +./stup.sh stop df01_worker1 + ./stup.sh stop dfcross_1_worker0 ./stup.sh stop dfcross_1_mainte From d0606fdb75ecdb9247f67f540116266ad9c527a2 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 30 Oct 2023 15:28:19 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=AE=E8=82=A4?= =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/gm/module.go | 2 +- modules/user/comp_configure.go | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/gm/module.go b/modules/gm/module.go index 121d1ecbc..67a35e743 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -75,7 +75,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er if keys[0] == "bingo" { this.Debugf("create CMD :%s", cmd) // 打印个日志方便查询 datas := strings.Split(keys[1], ",") - if len(datas) == 3 && (comm.TitleType == datas[0] || datas[0] == comm.AttrType || datas[0] == comm.ItemType || + if len(datas) == 3 && (comm.TitleType == datas[0] || comm.PerType == datas[0] || datas[0] == comm.AttrType || datas[0] == comm.ItemType || datas[0] == comm.HeroType || datas[0] == comm.EquipmentType || datas[0] == comm.VipType || datas[0] == comm.AtlasType || datas[0] == comm.PandaType || datas[0] == comm.MountsType || datas[0] == comm.XxlType) { num, err := strconv.Atoi(datas[2]) diff --git a/modules/user/comp_configure.go b/modules/user/comp_configure.go index 27f92a973..a5bbead22 100644 --- a/modules/user/comp_configure.go +++ b/modules/user/comp_configure.go @@ -186,9 +186,13 @@ func (this *configureComp) GetPlayerOverview(id string, sex int32) (configure *c ) key = fmt.Sprintf("%s%d", id, sex) if configure, ok = this._pInforoverview[key]; !ok { - err = comm.NewNotFoundConfErr("用户模块", game_playerinfor_overview, key) - this.module.Errorf("err:%v", err) - return + key = fmt.Sprintf("%s%d", id, 0) + if configure, ok = this._pInforoverview[key]; !ok { + err = comm.NewNotFoundConfErr("用户模块", game_playerinfor_overview, key) + this.module.Errorf("err:%v", err) + return + } + } return } From 67cce21c5e8250c471fc6e37e291e3c1ec3f1cd1 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 30 Oct 2023 15:58:50 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/island/api_Info.go | 22 ++++- modules/island/api_battle.go | 76 +++++++++++++++ modules/island/api_complete.go | 155 +++++++++++++++++++++++++++++++ modules/island/modelhero.go | 11 +-- modules/island/module.go | 17 +++- modules/user/api_switchdefper.go | 13 ++- 6 files changed, 277 insertions(+), 17 deletions(-) create mode 100644 modules/island/api_battle.go create mode 100644 modules/island/api_complete.go diff --git a/modules/island/api_Info.go b/modules/island/api_Info.go index 26a36c47b..2e80dba47 100644 --- a/modules/island/api_Info.go +++ b/modules/island/api_Info.go @@ -13,11 +13,29 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.IsLandInfoReq) // /获取自己的排行榜信息 func (this *apiComp) Info(session comm.IUserSession, req *pb.IsLandInfoReq) (errdata *pb.ErrorData) { - var () + var ( + info *pb.DBIsland + heros []*pb.DBHero + err error + ) if errdata = this.InfoCheck(session, req); errdata != nil { return } - session.SendMsg(string(this.module.GetType()), "info", &pb.IsLandInfoResp{}) + if info, err = this.module.model.getmodel(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + return + } + if heros, err = this.module.modelhero.getHeroList(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + return + } + session.SendMsg(string(this.module.GetType()), "info", &pb.IsLandInfoResp{Info: info, Heros: heros}) return } diff --git a/modules/island/api_battle.go b/modules/island/api_battle.go new file mode 100644 index 000000000..8df5ac3e6 --- /dev/null +++ b/modules/island/api_battle.go @@ -0,0 +1,76 @@ +package island + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/sys/log" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +// 参数校验 +func (this *apiComp) BattleCheck(session comm.IUserSession, req *pb.IsLandBattleReq) (errdata *pb.ErrorData) { + if req.Level == 0 || req.Battle == nil { + this.module.Error("战斗开始参数错误", + log.Field{Key: "uid", Value: session.GetUserId()}, + log.Field{Key: "params", Value: req.String()}, + ) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: "BattleConfId is 0", + } + } + return +} + +// /获取系统公告 +func (this *apiComp) Battle(session comm.IUserSession, req *pb.IsLandBattleReq) (errdata *pb.ErrorData) { + var ( + conf *cfg.GameHeroupstoryChapterData + bconf *cfg.GameHeroupstoryBattleData + record *pb.DBBattleRecord + err error + ) + if errdata = this.BattleCheck(session, req); errdata != nil { + return + } + if conf, err = this.module.configure.getGameHeroupstoryChapter(req.Level); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + if bconf, err = this.module.configure.getGameHeroupstoryBattle(conf.Battle); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + if errdata, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{ + Rulesid: bconf.BattleReadyID, + Ptype: pb.PlayType_rtask, + Format: req.Battle, + Mformat: bconf.FormatList, + }); err != nil { + return + } + session.SendMsg(string(this.module.GetType()), "battle", &pb.StorylineBattleResp{ + Level: req.Level, + Info: &pb.BattleInfo{ + Id: record.Id, + Rulesid: bconf.BattleReadyID, + Btype: record.Btype, + Ptype: record.Ptype, + RedCompId: record.RedCompId, + Redflist: record.Redflist, + BlueCompId: record.BlueCompId, + Buleflist: record.Buleflist, + Tasks: record.Tasks, + }, + }) + return +} diff --git a/modules/island/api_complete.go b/modules/island/api_complete.go new file mode 100644 index 000000000..7ab386d0a --- /dev/null +++ b/modules/island/api_complete.go @@ -0,0 +1,155 @@ +package island + +import ( + "fmt" + "go_dreamfactory/comm" + "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" +) + +// 参数校验 +func (this *apiComp) CompleteCheck(session comm.IUserSession, req *pb.IsLandCompleteReq) (errdata *pb.ErrorData) { + + return +} + +// /获取自己的排行榜信息 +func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteReq) (errdata *pb.ErrorData) { + var ( + info *pb.DBIsland + item *pb.DBIslandItem + award []*pb.UserAtno + ok bool + iswin bool + isfish bool + err error + ) + if errdata = this.CompleteCheck(session, req); errdata != nil { + return + } + + if conf, err = this.module.configure.getGameHeroupstoryChapter(req.Level); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + + if info, err = this.module.model.getmodel(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + + if item, ok = info.Item[conf.Hero]; !ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("no activation hero:%d", conf.Hero), + } + return + } + //前置判断 + if conf.Onlevel != 0 && item.Level[conf.Onlevel] == 0 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("%d onlevel no Complete", req.Level), + } + return + } + + //前置判断 + if len(conf.Onlevelstory) == 2 && item.Level[conf.Onlevelstory[0]] == conf.Onlevelstory[1] { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("%d onlevel no Complete", req.Level), + } + return + } + + if conf.Leveltype != 1 && item.Level[req.Level] != 0 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("%d received", req.Level), + } + return + } + + if item.Level[req.Level] != 0 { + isfish = true + } + + if chapterconf, err = this.module.configure.getGameHeroupstoryChaptertxt(conf.Chapter); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + + if conf.Leveltype == 1 { //剧情关卡 + item.Level[req.Level] = req.Story + } else if conf.Leveltype == 2 { //战斗管卡 + if errdata, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { + return + } + if !iswin { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: "battle no win!", + } + return + } + item.Level[req.Level] = 1 + } else if conf.Leveltype == 4 { + item.Level[req.Level] = 1 + item.Chapter[conf.Chapter] = configure.Now().Unix() + } else if conf.Leveltype == 5 { + if req.Report != nil { + if errdata, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { + return + } + if !iswin { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: "battle no win!", + } + return + } + } + item.Level[req.Level] = 1 + } else { + item.Level[req.Level] = 1 + } + + if !isfish { + if errdata = this.module.DispenseRes(session, conf.Reward, true); errdata != nil { + return + } + award = make([]*pb.UserAssets, 0) + for _, v := range conf.Reward { + award = append(award, &pb.UserAssets{ + A: v.A, + T: v.T, + N: v.N, + }) + } + } + + this.module.model.Change(session.GetUserId(), map[string]interface{}{ + "islands": info.Islands, + }) + session.SendMsg(string(this.module.GetType()), "complete", &pb.StorylineCompleteResp{Level: req.Level, Story: req.Story, Award: award}) + return +} diff --git a/modules/island/modelhero.go b/modules/island/modelhero.go index 69de240af..1d09ff6d2 100644 --- a/modules/island/modelhero.go +++ b/modules/island/modelhero.go @@ -27,11 +27,8 @@ func (this *modelHeroComp) Init(service core.IService, module core.IModule, comp // 读取数据 // 获取玩家的英雄列表 -func (this *modelHeroComp) getHeroList(uid string) []*pb.DBHero { - heroes := make([]*pb.DBHero, 0) - err := this.GetList(uid, &heroes) - if err != nil { - return nil - } - return heroes +func (this *modelHeroComp) getHeroList(uid string) (heros []*pb.DBHero, err error) { + heros = make([]*pb.DBHero, 0) + err = this.GetList(uid, &heros) + return } diff --git a/modules/island/module.go b/modules/island/module.go index 3509f2a15..cba5fc0f8 100644 --- a/modules/island/module.go +++ b/modules/island/module.go @@ -20,9 +20,10 @@ func NewModule() core.IModule { type IsLand struct { modules.ModuleBase service base.IRPCXService - privilege comm.IPrivilege + battle comm.IBattle api *apiComp model *modelComp + modelhero *modelHeroComp configure *ConfigureComp } @@ -42,4 +43,18 @@ func (this *IsLand) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.model = this.RegisterComp(new(modelComp)).(*modelComp) + this.modelhero = this.RegisterComp(new(modelHeroComp)).(*modelHeroComp) + this.configure = this.RegisterComp(new(ConfigureComp)).(*ConfigureComp) +} + +func (this *IsLand) Start() (err error) { + if err = this.ModuleBase.Start(); err != nil { + return + } + var module core.IModule + if module, err = this.service.GetModule(comm.ModuleBattle); err != nil { + return + } + this.battle = module.(comm.IBattle) + return } diff --git a/modules/user/api_switchdefper.go b/modules/user/api_switchdefper.go index 3d22f9bf7..59ca74c4c 100644 --- a/modules/user/api_switchdefper.go +++ b/modules/user/api_switchdefper.go @@ -97,10 +97,9 @@ func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchD } return } - user.CurAction = req.CurAction - change["curAction"] = req.CurAction } - + user.CurAction = req.CurAction + change["curAction"] = req.CurAction if req.CurBg != "" { if conf, err = this.module.configure.GetPlayerOverview(req.CurBg, user.Gender); err != nil { errdata = &pb.ErrorData{ @@ -129,9 +128,9 @@ func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchD } return } - user.CurBg = req.CurBg - change["curBg"] = req.CurBg } + user.CurBg = req.CurBg + change["curBg"] = req.CurBg if req.CurAframe != "" { if conf, err = this.module.configure.GetPlayerOverview(req.CurAframe, 0); err != nil { errdata = &pb.ErrorData{ @@ -160,9 +159,9 @@ func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchD } return } - user.Curaframe = req.CurAframe - change["curaframe"] = req.CurAframe } + user.Curaframe = req.CurAframe + change["curaframe"] = req.CurAframe if err = this.module.modelUser.Change(session.GetUserId(), change); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError,