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

上传战斗系统修复

Browse Source
This commit is contained in:
liwei1dao 2022-10-13 09:43:57 +08:00
parent e72ec3d5c9
commit eba546d0a2
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/hunting/api_challenge.go
View File

@ -50,7 +50,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
}
code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
Ptype: pb.PlayType_moonfantasy,
Ptype: pb.PlayType_hunting,
Title: "",
Leadpos: req.Leadpos,
Teamids: req.Teamids,

2
modules/mainline/api_challenge.go
View File

@ -50,7 +50,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle
}
code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
Ptype: pb.PlayType_moonfantasy,
Ptype: pb.PlayType_mainline,
Title: "",
Leadpos: req.Leadpos,
Teamids: req.Teamids,

2
modules/pagoda/api_challenge.go
View File

@ -57,7 +57,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChalleng
}
}
code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
Ptype: pb.PlayType_moonfantasy,
Ptype: pb.PlayType_pagoda,
Title: "",
Leadpos: req.Leadpos,
Teamids: req.Teamids,

2
modules/rtask/api_battlestart.go
View File

@ -39,7 +39,7 @@ func (this *apiComp) BattleStart(session comm.IUserSession, req *pb.RtaskBattleS
resp *pb.RtaskBattleStartResp
)
code, record = b.CreatePveBattle(session, &pb.BattlePVEReq{
Ptype: pb.PlayType_mainline,
Ptype: pb.PlayType_rtask,
Leadpos: req.Leadpos,
Teamids: req.Teamids,
Mformat: battleConf.FormatList,

2
modules/viking/api_challenge.go
View File

@ -50,7 +50,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
}
code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
Ptype: pb.PlayType_moonfantasy,
Ptype: pb.PlayType_viking,
Title: "",
Leadpos: req.Leadpos,
Teamids: req.Teamids,

27
pb/battle_db.pb.go
View File

@ -79,6 +79,9 @@ const (
PlayType_moonfantasy PlayType = 0 //月之秘境
PlayType_mainline PlayType = 1 //主线玩法
PlayType_pagoda PlayType = 2 //爬塔
PlayType_viking PlayType = 3 //远征
PlayType_rtask PlayType = 4 //随机任务
PlayType_hunting PlayType = 5 //狩猎
)
// Enum value maps for PlayType.
@ -87,11 +90,17 @@ var (
0: "moonfantasy",
1: "mainline",
2: "pagoda",
3: "viking",
4: "rtask",
5: "hunting",
}
PlayType_value = map[string]int32{
"moonfantasy": 0,
"mainline": 1,
"pagoda": 2,
"viking": 3,
"rtask": 4,
"hunting": 5,
}
)
@ -603,16 +612,18 @@ var file_battle_battle_db_proto_rawDesc = []byte{
0x75, 0x6c, 0x74, 0x2a, 0x30, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70,
0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76,
0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03,
0x70, 0x76, 0x62, 0x10, 0x03, 0x2a, 0x35, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70,
0x70, 0x76, 0x62, 0x10, 0x03, 0x2a, 0x59, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70,
0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79,
0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10, 0x01,
0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x2a, 0x1f, 0x0a, 0x0c,
0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02,
0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a,
0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a,
0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01,
0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06,
0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x61, 0x73,
0x6b, 0x10, 0x04, 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x10, 0x05,
0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65,
0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10,
0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d,
0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72,
0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (