Commit 0ba9c113dddaecfd9970b3ddb009949b60843f7c
1 parent
3445674b
fix: update
Showing
4 changed files
with
36 additions
and
35 deletions
Show diff stats
common/conf.go
| @@ -121,6 +121,7 @@ func init() { | @@ -121,6 +121,7 @@ func init() { | ||
| 121 | fmt.Printf("serverlist.yml unmarshal faild: %v\n", err) | 121 | fmt.Printf("serverlist.yml unmarshal faild: %v\n", err) |
| 122 | return | 122 | return |
| 123 | } | 123 | } |
| 124 | + fmt.Println(GlobalConf.GameService) | ||
| 124 | 125 | ||
| 125 | c, err := json.Marshal(&GlobalConf.LogConf) | 126 | c, err := json.Marshal(&GlobalConf.LogConf) |
| 126 | if err != nil { | 127 | if err != nil { |
conf/serverlist.yml
| @@ -2,10 +2,10 @@ server_list: | @@ -2,10 +2,10 @@ server_list: | ||
| 2 | - id: "1" | 2 | - id: "1" |
| 3 | name: "似海浮沉" | 3 | name: "似海浮沉" |
| 4 | address: "47.118.38.251" | 4 | address: "47.118.38.251" |
| 5 | - game_port: 8849 | ||
| 6 | - gm_port: 8880 | 5 | + gameport: 8849 |
| 6 | + gmport: 8880 | ||
| 7 | - id: "2" | 7 | - id: "2" |
| 8 | name: "西风一年" | 8 | name: "西风一年" |
| 9 | address: "192.168.0.100" | 9 | address: "192.168.0.100" |
| 10 | - game_port: 8849 | ||
| 11 | - gm_port: 8880 | ||
| 12 | \ No newline at end of file | 10 | \ No newline at end of file |
| 11 | + gameport: 8849 | ||
| 12 | + gmport: 8880 | ||
| 13 | \ No newline at end of file | 13 | \ No newline at end of file |
docker/serverlist.yml
| @@ -2,10 +2,10 @@ server_list: | @@ -2,10 +2,10 @@ server_list: | ||
| 2 | - id: "1" | 2 | - id: "1" |
| 3 | name: "似海浮沉" | 3 | name: "似海浮沉" |
| 4 | address: "47.118.38.251" | 4 | address: "47.118.38.251" |
| 5 | - game_port: 8849 | ||
| 6 | - gm_port: 8880 | 5 | + gameport: 8849 |
| 6 | + gmport: 8880 | ||
| 7 | - id: "2" | 7 | - id: "2" |
| 8 | name: "西风一年" | 8 | name: "西风一年" |
| 9 | address: "192.168.0.100" | 9 | address: "192.168.0.100" |
| 10 | - game_port: 8849 | ||
| 11 | - gm_port: 8880 | ||
| 12 | \ No newline at end of file | 10 | \ No newline at end of file |
| 11 | + gameport: 8849 | ||
| 12 | + gmport: 8880 | ||
| 13 | \ No newline at end of file | 13 | \ No newline at end of file |
pb/account.pb.go
| @@ -28,8 +28,8 @@ type ServiceInfo struct { | @@ -28,8 +28,8 @@ type ServiceInfo struct { | ||
| 28 | Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` | 28 | Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` |
| 29 | Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` | 29 | Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` |
| 30 | Address string `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` | 30 | Address string `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` |
| 31 | - GamePort int32 `protobuf:"varint,4,opt,name=game_port,json=gamePort,proto3" json:"game_port,omitempty"` | ||
| 32 | - GmPort int32 `protobuf:"varint,5,opt,name=gm_port,json=gmPort,proto3" json:"gm_port,omitempty"` | 31 | + Gameport int32 `protobuf:"varint,4,opt,name=gameport,proto3" json:"gameport,omitempty"` |
| 32 | + Gmport int32 `protobuf:"varint,5,opt,name=gmport,proto3" json:"gmport,omitempty"` | ||
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | func (x *ServiceInfo) Reset() { | 35 | func (x *ServiceInfo) Reset() { |
| @@ -85,16 +85,16 @@ func (x *ServiceInfo) GetAddress() string { | @@ -85,16 +85,16 @@ func (x *ServiceInfo) GetAddress() string { | ||
| 85 | return "" | 85 | return "" |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | -func (x *ServiceInfo) GetGamePort() int32 { | 88 | +func (x *ServiceInfo) GetGameport() int32 { |
| 89 | if x != nil { | 89 | if x != nil { |
| 90 | - return x.GamePort | 90 | + return x.Gameport |
| 91 | } | 91 | } |
| 92 | return 0 | 92 | return 0 |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | -func (x *ServiceInfo) GetGmPort() int32 { | 95 | +func (x *ServiceInfo) GetGmport() int32 { |
| 96 | if x != nil { | 96 | if x != nil { |
| 97 | - return x.GmPort | 97 | + return x.Gmport |
| 98 | } | 98 | } |
| 99 | return 0 | 99 | return 0 |
| 100 | } | 100 | } |
| @@ -221,27 +221,27 @@ var File_account_proto protoreflect.FileDescriptor | @@ -221,27 +221,27 @@ var File_account_proto protoreflect.FileDescriptor | ||
| 221 | 221 | ||
| 222 | var file_account_proto_rawDesc = []byte{ | 222 | var file_account_proto_rawDesc = []byte{ |
| 223 | 0x0a, 0x0d, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, | 223 | 0x0a, 0x0d, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, |
| 224 | - 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x81, 0x01, 0x0a, 0x0b, 0x53, 0x65, 0x72, | ||
| 225 | - 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, | ||
| 226 | - 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, | ||
| 227 | - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, | ||
| 228 | - 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, | ||
| 229 | - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x70, | ||
| 230 | - 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x67, 0x61, 0x6d, 0x65, 0x50, | ||
| 231 | - 0x6f, 0x72, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x67, 0x6d, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, | ||
| 232 | - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6d, 0x50, 0x6f, 0x72, 0x74, 0x22, 0x59, 0x0a, 0x08, | ||
| 233 | - 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, | ||
| 234 | - 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x37, | ||
| 235 | - 0x0a, 0x0c, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, | ||
| 236 | - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x53, | ||
| 237 | - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x67, 0x61, 0x6d, 0x65, | ||
| 238 | - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x08, 0x52, 0x65, 0x67, 0x69, 0x73, | ||
| 239 | - 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, | ||
| 240 | - 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, | ||
| 241 | - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, | ||
| 242 | - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, | ||
| 243 | - 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, | ||
| 244 | - 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | 224 | + 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x7f, 0x0a, 0x0b, 0x53, 0x65, 0x72, 0x76, |
| 225 | + 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, | ||
| 226 | + 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, | ||
| 227 | + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, | ||
| 228 | + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, | ||
| 229 | + 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6d, 0x65, 0x70, 0x6f, 0x72, | ||
| 230 | + 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x67, 0x61, 0x6d, 0x65, 0x70, 0x6f, 0x72, | ||
| 231 | + 0x74, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, | ||
| 232 | + 0x05, 0x52, 0x06, 0x67, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x59, 0x0a, 0x08, 0x4c, 0x6f, 0x67, | ||
| 233 | + 0x69, 0x6e, 0x52, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, | ||
| 234 | + 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x37, 0x0a, 0x0c, 0x67, | ||
| 235 | + 0x61, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, | ||
| 236 | + 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, | ||
| 237 | + 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x67, 0x61, 0x6d, 0x65, 0x53, 0x65, 0x72, | ||
| 238 | + 0x76, 0x69, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x08, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, | ||
| 239 | + 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, | ||
| 240 | + 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, | ||
| 241 | + 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, | ||
| 242 | + 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, | ||
| 243 | + 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, | ||
| 244 | + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||
| 245 | } | 245 | } |
| 246 | 246 | ||
| 247 | var ( | 247 | var ( |