liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

上传代码

Browse Source
This commit is contained in:
liwei1dao 2024-03-08 18:29:45 +08:00
parent 05fe8fe6f0
commit 87c0724b13
10 changed files with 1223 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1460
bin/json/game_buriedcondi.json
View File

File diff suppressed because it is too large Load Diff

18
bin/json/game_item.json
View File

@ -8948,7 +8948,7 @@
"decompose_deplete": [], "decompose_deplete": [],
"decompose_get": [], "decompose_get": [],
"access": [ "access": [
122 126
], ],
"use_skip": 1002, "use_skip": 1002,
"upper_limit": 0, "upper_limit": 0,
@ -21635,10 +21635,10 @@
"id": "24012020", "id": "24012020",
"name": { "name": {
"key": "item_item_name_24012020", "key": "item_item_name_24012020",
"text": "饼干" "text": "美味姜饼"
}, },
"usetype": 1, "usetype": 1,
"color": 3, "color": 4,
"bagtype": 0, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
@ -21659,11 +21659,11 @@
"img": "item_24012020", "img": "item_24012020",
"intr": { "intr": {
"key": "item_item_intr_24012020", "key": "item_item_intr_24012020",
"text": "与驴同行中使用的道具" "text": "与驴同行中用于召唤和刷新守护者的道具"
}, },
"describe": { "describe": {
"key": "item_item_describe_24012020", "key": "item_item_describe_24012020",
"text": "在这饱经风霜藏宝图上，隐隐约约有着几个字，三只！" "text": "在这饱经风霜姜饼上，隐隐约约有着几个字，三只！"
}, },
"dialogue": { "dialogue": {
"key": "item_item_dialogue_24012020", "key": "item_item_dialogue_24012020",
@ -21682,10 +21682,10 @@
"id": "24012021", "id": "24012021",
"name": { "name": {
"key": "item_item_name_24012021", "key": "item_item_name_24012021",
"text": "马蹄" "text": "驴蹄铁"
}, },
"usetype": 1, "usetype": 1,
"color": 3, "color": 4,
"bagtype": 0, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
@ -21706,11 +21706,11 @@
"img": "item_24012021", "img": "item_24012021",
"intr": { "intr": {
"key": "item_item_intr_24012021", "key": "item_item_intr_24012021",
"text": "与驴同行中使用的道具" "text": "与驴同行中用于养成的道具"
}, },
"describe": { "describe": {
"key": "item_item_describe_24012021", "key": "item_item_describe_24012021",
"text": "果酱教授身体的毛发" "text": "果酱教授研制"
}, },
"dialogue": { "dialogue": {
"key": "item_item_dialogue_24012021", "key": "item_item_dialogue_24012021",

22
bin/json/game_mainchapter.json
View File

@ -176,7 +176,7 @@
}, },
"starreward": 11002, "starreward": 11002,
"exploreward": 11002, "exploreward": 11002,
"bosspro": 2000, "bosspro": 0,
"models": [ "models": [
25001 25001
], ],
@ -222,7 +222,7 @@
}, },
"starreward": 11003, "starreward": 11003,
"exploreward": 11003, "exploreward": 11003,
"bosspro": 3000, "bosspro": 0,
"models": [ "models": [
25001 25001
], ],
@ -268,7 +268,7 @@
}, },
"starreward": 11004, "starreward": 11004,
"exploreward": 11004, "exploreward": 11004,
"bosspro": 4000, "bosspro": 0,
"models": [ "models": [
25001 25001
], ],
@ -314,7 +314,7 @@
}, },
"starreward": 11005, "starreward": 11005,
"exploreward": 11005, "exploreward": 11005,
"bosspro": 5000, "bosspro": 0,
"models": [ "models": [
25001 25001
], ],
@ -360,7 +360,7 @@
}, },
"starreward": 11006, "starreward": 11006,
"exploreward": 11006, "exploreward": 11006,
"bosspro": 6000, "bosspro": 0,
"models": [ "models": [
25001 25001
], ],
@ -406,7 +406,7 @@
}, },
"starreward": 11007, "starreward": 11007,
"exploreward": 11007, "exploreward": 11007,
"bosspro": 7000, "bosspro": 0,
"models": [ "models": [
25001 25001
], ],
@ -452,7 +452,7 @@
}, },
"starreward": 11008, "starreward": 11008,
"exploreward": 11008, "exploreward": 11008,
"bosspro": 8000, "bosspro": 0,
"models": [ "models": [
25001 25001
], ],
@ -498,7 +498,7 @@
}, },
"starreward": 11009, "starreward": 11009,
"exploreward": 11009, "exploreward": 11009,
"bosspro": 9000, "bosspro": 0,
"models": [ "models": [
25001 25001
], ],
@ -544,7 +544,7 @@
}, },
"starreward": 11010, "starreward": 11010,
"exploreward": 11010, "exploreward": 11010,
"bosspro": 10000, "bosspro": 0,
"models": [ "models": [
25001 25001
], ],
@ -590,7 +590,7 @@
}, },
"starreward": 11011, "starreward": 11011,
"exploreward": 11011, "exploreward": 11011,
"bosspro": 11000, "bosspro": 0,
"models": [ "models": [
25001 25001
], ],
@ -636,7 +636,7 @@
}, },
"starreward": 11012, "starreward": 11012,
"exploreward": 11012, "exploreward": 11012,
"bosspro": 12000, "bosspro": 0,
"models": [ "models": [
25001 25001
], ],

4
bin/json/game_rdtasknpc.json
View File

@ -635,7 +635,7 @@
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"功能入口-烹饪_剧情专用", "20033_邦尼兔",
"901" "901"
], ],
"event": [ "event": [
@ -650,7 +650,7 @@
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"功能入口-烹饪_剧情专用", "20033_邦尼兔",
"901" "901"
], ],
"event": [ "event": [

20
bin/json/game_reddot.json
View File

@ -1344,5 +1344,25 @@
"opencond": [], "opencond": [],
"path": "Root|Catchbugs|Reward", "path": "Root|Catchbugs|Reward",
"header": "" "header": ""
},
{
"id": 42100,
"msg_type": 0,
"show_type": 0,
"count_type": 0,
"opencond_id": "",
"opencond": [],
"path": "Root|PlayerInfo",
"header": ""
},
{
"id": 42101,
"msg_type": 1,
"show_type": 0,
"count_type": 1,
"opencond_id": "",
"opencond": [],
"path": "Root|PlayerInfo|Unlock",
"header": ""
} }
] ]

4
bin/json/game_shopitem.json
View File

@ -25656,7 +25656,7 @@
{ {
"a": "item", "a": "item",
"t": "10000034", "t": "10000034",
"n": 3 "n": 5
} }
], ],
"preview": false, "preview": false,
@ -25845,7 +25845,7 @@
"iteminfo": [ "iteminfo": [
{ {
"a": "item", "a": "item",
"t": "13000003", "t": "13000004",
"n": 1 "n": 1
} }
], ],

2
modules/practice/module.go
View File

@ -342,7 +342,7 @@ func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) {
"statuers": buleroom.Statuers, "statuers": buleroom.Statuers,
}) })
this.SendMsgToUsers(string(this.GetType()), "qiecuofinish", &pb.PracticeQiecuoFinishPush{Winside: winSide}) this.SendMsgToUsers(string(this.GetType()), "qiecuofinish", &pb.PracticeQiecuoFinishPush{Roomid: bid, Winside: winSide})
} }
// 解锁武馆柱子 // 解锁武馆柱子

1
modules/realarena/romm.go
View File

@ -233,6 +233,7 @@ func (this *Room) ChallengeResults(winSide int32) {
v.Push() v.Push()
} }
this.PushMessage("battlefinish", &pb.RealArenaBattleFinishPush{ this.PushMessage("battlefinish", &pb.RealArenaBattleFinishPush{
Roomid: this.Id,
Winside: winSide, Winside: winSide,
Red: this.members[0], Red: this.members[0],
Bule: this.members[1], Bule: this.members[1],

87
pb/practice_msg.pb.go
View File

@ -1899,7 +1899,8 @@ type PracticeQiecuoFinishPush struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Winside int32 `protobuf:"varint,1,opt,name=winside,proto3" json:"winside"` Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"`
Winside int32 `protobuf:"varint,2,opt,name=winside,proto3" json:"winside"`
} }
func (x *PracticeQiecuoFinishPush) Reset() { func (x *PracticeQiecuoFinishPush) Reset() {
@ -1934,6 +1935,13 @@ func (*PracticeQiecuoFinishPush) Descriptor() ([]byte, []int) {
return file_practice_practice_msg_proto_rawDescGZIP(), []int{36} return file_practice_practice_msg_proto_rawDescGZIP(), []int{36}
} }
func (x *PracticeQiecuoFinishPush) GetRoomid() string {
if x != nil {
return x.Roomid
}
return ""
}
func (x *PracticeQiecuoFinishPush) GetWinside() int32 { func (x *PracticeQiecuoFinishPush) GetWinside() int32 {
if x != nil { if x != nil {
return x.Winside return x.Winside
@ -2427,45 +2435,46 @@ var file_practice_practice_msg_proto_rawDesc = []byte{
0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
0x52, 0x0a, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x34, 0x0a, 0x18, 0x52, 0x0a, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x4c, 0x0a, 0x18,
0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x46, 0x69, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x46, 0x69,
0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
0x64, 0x65, 0x22, 0x47, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x2e, 0x0a, 0x09, 0x66, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x22, 0x47, 0x0a, 0x15, 0x50, 0x72,
0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65,
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x2e, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x59, 0x0a, 0x16, 0x50, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x69, 0x6f, 0x6e, 0x22, 0x59, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e,
0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a,
0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72,
0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a,
0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x44, 0x0a, 0x1b, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61,
0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x44,
0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x0a, 0x1b, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74,
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a,
0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xd9, 0x01, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
0x1c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65,
0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xd9, 0x01, 0x0a, 0x1c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73,
0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x1f, 0x0a,
0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x44, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55,
0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x44,
0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x2a, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74,
0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48,
0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
0x22, 0x2f, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x44, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x44,
0x69, 0x61, 0x6c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x22, 0x2f, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63,
0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x52, 0x65, 0x73,
0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28,
0x33, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

58
pb/realarena_msg.pb.go
View File

@ -1019,9 +1019,10 @@ type RealArenaBattleFinishPush struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Winside int32 `protobuf:"varint,1,opt,name=winside,proto3" json:"winside"` Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"`
Red *DBRealArenaMember `protobuf:"bytes,2,opt,name=red,proto3" json:"red"` Winside int32 `protobuf:"varint,2,opt,name=winside,proto3" json:"winside"`
Bule *DBRealArenaMember `protobuf:"bytes,3,opt,name=bule,proto3" json:"bule"` Red *DBRealArenaMember `protobuf:"bytes,3,opt,name=red,proto3" json:"red"`
Bule *DBRealArenaMember `protobuf:"bytes,4,opt,name=bule,proto3" json:"bule"`
} }
func (x *RealArenaBattleFinishPush) Reset() { func (x *RealArenaBattleFinishPush) Reset() {
@ -1056,6 +1057,13 @@ func (*RealArenaBattleFinishPush) Descriptor() ([]byte, []int) {
return file_realarena_realarena_msg_proto_rawDescGZIP(), []int{21} return file_realarena_realarena_msg_proto_rawDescGZIP(), []int{21}
} }
func (x *RealArenaBattleFinishPush) GetRoomid() string {
if x != nil {
return x.Roomid
}
return ""
}
func (x *RealArenaBattleFinishPush) GetWinside() int32 { func (x *RealArenaBattleFinishPush) GetWinside() int32 {
if x != nil { if x != nil {
return x.Winside return x.Winside
@ -1333,28 +1341,30 @@ var file_realarena_realarena_msg_proto_rawDesc = []byte{
0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4c, 0x65, 0x61, 0x64, 0x65,
0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x83, 0x01, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x9b, 0x01,
0x0a, 0x19, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x0a, 0x19, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c,
0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72,
0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
0x6e, 0x73, 0x69, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x6d, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02,
0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x12, 0x24, 0x0a,
0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52,
0x75, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x03,
0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, 0x62, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
0x75, 0x6c, 0x65, 0x22, 0x30, 0x0a, 0x16, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d,
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x22, 0x30, 0x0a, 0x16, 0x52,
0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x78,
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x69, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18,
0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x19, 0x0a,
0x22, 0x4d, 0x0a, 0x1b, 0x52, 0x50, 0x43, 0x5f, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x17, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x61, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x45, 0x78, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x4d, 0x0a, 0x1b, 0x52, 0x50, 0x43, 0x5f,
0x16, 0x0a, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65,
0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x66, 0x66, 0x55, 0x69, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49,
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x4f, 0x66, 0x66, 0x55, 0x69, 0x64, 0x22, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12,
0x1e, 0x0a, 0x1c, 0x52, 0x50, 0x43, 0x5f, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x16, 0x0a, 0x06, 0x4f, 0x66, 0x66, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x4f, 0x66, 0x66, 0x55, 0x69, 0x64, 0x22, 0x1e, 0x0a, 0x1c, 0x52, 0x50, 0x43, 0x5f, 0x52,
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73,
0x68, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (