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-12 18:45:18 +08:00
parent 948326e7f6
commit ce0529252c
11 changed files with 133 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
comm/const.go
View File

@ -462,6 +462,13 @@ const (
//专武装备数据表 //专武装备数据表
TableExclusive = "exclusive" TableExclusive = "exclusive"
//实时竞技场
TableRealarena = "realarena"
//实时竞技场 战斗记录
TableRealarenaRecord = "realarenarecord"
//实时竞技场排名
TableRealarenaRank = "realarenarank"
) )
// RPC服务接口定义处 // RPC服务接口定义处

4
comm/imodule.go
View File

@ -523,7 +523,7 @@ type (
//添加武馆资源 //添加武馆资源
AddItems(session IUserSession, items map[string]int32, bPush bool) (errdata *pb.ErrorData) AddItems(session IUserSession, items map[string]int32, bPush bool) (errdata *pb.ErrorData)
//pvp切磋结果通知 //pvp切磋结果通知
ChallengeResults(bid, red, bule string, winSide int32) ChallengeResults(bid, red, bule string, winSide int32, report *pb.BattleReport)
// 清除玩家踢馆状态 // 清除玩家踢馆状态
CleanUpNpc(uid string) CleanUpNpc(uid string)
@ -767,6 +767,6 @@ type (
//实时竞技场 //实时竞技场
IRealarena interface { IRealarena interface {
//pvp切磋结果通知 //pvp切磋结果通知
ChallengeResults(bid, red, bule string, winSide int32) ChallengeResults(bid, red, bule string, winSide int32, report *pb.BattleReport)
} }
) )

2
modules/practice/module.go
View File

@ -235,7 +235,7 @@ func (this *Practice) OpenCmdNotice(session comm.IUserSession, keys ...string) {
// } // }
} }
func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) { func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32, report *pb.BattleReport) {
this.Debug("ChallengeResults", this.Debug("ChallengeResults",
log.Field{Key: "bid", Value: bid}, log.Field{Key: "bid", Value: bid},
log.Field{Key: "red", Value: red}, log.Field{Key: "red", Value: red},

6
modules/pvp/module.go
View File

@ -265,12 +265,12 @@ func (this *Pvp) PvpFinishPush(out *pb.BattleFinishPush) {
case pb.PlayType_friendsmeet: case pb.PlayType_friendsmeet:
go func() { go func() {
this.gameInvite.GameInviteEnd(3, battle.Red.Uid) this.gameInvite.GameInviteEnd(3, battle.Red.Uid)
this.practice.ChallengeResults(out.Battleid, battle.Red.Uid, battle.Blue.Uid, out.WinSide) this.practice.ChallengeResults(out.Battleid, battle.Red.Uid, battle.Blue.Uid, out.WinSide, out.Report)
}() }()
break break
case pb.PlayType_realarena: case pb.PlayType_realarena:
go func() { go func() {
this.realarena.ChallengeResults(out.Battleid, battle.Red.Uid, battle.Blue.Uid, out.WinSide) this.realarena.ChallengeResults(out.Battleid, battle.Red.Uid, battle.Blue.Uid, out.WinSide, out.Report)
}() }()
break break
} }
@ -323,7 +323,7 @@ func (this *Pvp) readyTimeOut(task *timewheel.Task, args ...interface{}) {
} }
go func() { go func() {
this.gameInvite.GameInviteEnd(3, battle.Red.Uid) this.gameInvite.GameInviteEnd(3, battle.Red.Uid)
this.practice.ChallengeResults(battle.Id, battle.Red.Uid, battle.Blue.Uid, winside) this.practice.ChallengeResults(battle.Id, battle.Red.Uid, battle.Blue.Uid, winside, nil)
}() }()
break break
} }

6
modules/realarena/model.go
View File

@ -3,6 +3,7 @@ package realarena
import ( import (
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/event"
"go_dreamfactory/lego/sys/mgo" "go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
@ -29,7 +30,7 @@ type modelComp struct {
// 组件初始化接口 // 组件初始化接口
func (this *modelComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { func (this *modelComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) {
this.TableName = comm.TableExclusive this.TableName = comm.TableRealarena
this.MCompModel.Init(service, module, comp, opt) this.MCompModel.Init(service, module, comp, opt)
this.module = module.(*RealArena) this.module = module.(*RealArena)
//创建uid索引 //创建uid索引
@ -40,9 +41,12 @@ func (this *modelComp) Init(service core.IService, module core.IModule, comp cor
} }
func (this *modelComp) Start() (err error) { func (this *modelComp) Start() (err error) {
err = this.MCompModel.Start()
event.RegisterGO(core.Event_ServiceStartEnd, func() {
this.whichissue = &pb.DBRealArenaWhichIssue{} this.whichissue = &pb.DBRealArenaWhichIssue{}
this.module.ModuleTools.GetGlobalData(GlobalWhichIssueKey, this.whichissue) this.module.ModuleTools.GetGlobalData(GlobalWhichIssueKey, this.whichissue)
this.computeWhich() this.computeWhich()
})
return return
} }

2
modules/realarena/modelrank.go
View File

@ -21,7 +21,7 @@ type modelRank struct {
// 组件初始化接口 // 组件初始化接口
func (this *modelRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { func (this *modelRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) {
this.TableName = comm.TableArenaRank this.TableName = comm.TableRealarenaRank
this.MCompModel.Init(service, module, comp, opt) this.MCompModel.Init(service, module, comp, opt)
this.module = module.(*RealArena) this.module = module.(*RealArena)

30
modules/realarena/modelrecord.go Normal file
View File

@ -0,0 +1,30 @@
package realarena
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 modelRecordComp struct {
modules.MCompModel
module *RealArena
whichissue *pb.DBRealArenaWhichIssue
}
// 组件初始化接口
func (this *modelRecordComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) {
this.TableName = comm.TableRealarenaRecord
this.MCompModel.Init(service, module, comp, opt)
this.module = module.(*RealArena)
//创建uid索引
_, err = this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
})
return
}

2
modules/realarena/module.go
View File

@ -180,7 +180,7 @@ func (this *RealArena) endgame(ctx context.Context, req *pb.RPC_RealArenaTrustee
} }
//战斗结束 //战斗结束
func (this *RealArena) ChallengeResults(roomid, red, bule string, winSide int32) { func (this *RealArena) ChallengeResults(roomid, red, bule string, winSide int32, report *pb.BattleReport) {
this.Debug("ChallengeResults", log.Field{Key: "roomid", Value: roomid}) this.Debug("ChallengeResults", log.Field{Key: "roomid", Value: roomid})
var ( var (
room *Room room *Room

2
modules/realarena/romm.go
View File

@ -162,7 +162,7 @@ func (this *Room) UserOffline(uid string) (err error) {
if this.members[0].User.Uid == uid { if this.members[0].User.Uid == uid {
winSide = 2 winSide = 2
} }
this.module.ChallengeResults(this.Id, this.members[0].User.Uid, this.members[1].User.Uid, winSide) this.module.ChallengeResults(this.Id, this.members[0].User.Uid, this.members[1].User.Uid, winSide, nil)
return return
} }

134
pb/battle_msg.pb.go
View File

@ -1763,6 +1763,7 @@ type BattleFinishPush struct {
Battleid string `protobuf:"bytes,1,opt,name=battleid,proto3" json:"battleid"` Battleid string `protobuf:"bytes,1,opt,name=battleid,proto3" json:"battleid"`
WinSide int32 `protobuf:"varint,2,opt,name=winSide,proto3" json:"winSide"` WinSide int32 `protobuf:"varint,2,opt,name=winSide,proto3" json:"winSide"`
Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"`
} }
func (x *BattleFinishPush) Reset() { func (x *BattleFinishPush) Reset() {
@ -1811,6 +1812,13 @@ func (x *BattleFinishPush) GetWinSide() int32 {
return 0 return 0
} }
func (x *BattleFinishPush) GetReport() *BattleReport {
if x != nil {
return x.Report
}
return nil
}
//战斗认输 请求 //战斗认输 请求
type BattleConcedeReq struct { type BattleConcedeReq struct {
state protoimpl.MessageState state protoimpl.MessageState
@ -2371,55 +2379,58 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64,
0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x48, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x6f, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74,
0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74,
0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x22, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12,
0x42, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x42, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61,
0x69, 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61,
0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02,
0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61,
0x22, 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74,
0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69,
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74,
0x6d, 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x09, 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07,
0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d,
0x74, 0x43, 0x6d, 0x64, 0x73, 0x22, 0xf2, 0x01, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x6f, 0x6e, 0x65, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18,
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x06, 0x64, 0x69, 0x42, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d,
0x75, 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x79, 0x53, 0x6b, 0x64, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x22, 0xf2, 0x01, 0x0a,
0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x12, 0x0f, 0x53, 0x74, 0x72, 0x6f, 0x6e, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71,
0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x12, 0x24, 0x0a, 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x32, 0x0c, 0x2e, 0x44, 0x79, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x06,
0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1f,
0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42,
0x6f, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12,
0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
0x42, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x42, 0x74, 0x79,
0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05,
0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x42, 0x61, 0x50, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c,
0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xc0, 0x01, 0x0a, 0x13, 0x42, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x45, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20,
0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74,
0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x73, 0x22, 0xc0, 0x01, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x45, 0x50,
0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79,
0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54,
0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69,
0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65,
0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x2e, 0x0a, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f,
0x09, 0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74,
0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f,
0x6f, 0x6e, 0x52, 0x09, 0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x06, 0x5a, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x2e, 0x0a, 0x09, 0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64, 0x65, 0x66, 0x66, 0x6f,
0x72, 0x6d, 0x61, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -2511,21 +2522,22 @@ var file_battle_battle_msg_proto_depIdxs = []int32{
35, // 32: BattleInCmdReq.in:type_name -> BattleCmd 35, // 32: BattleInCmdReq.in:type_name -> BattleCmd
35, // 33: BattleInCmdResp.in:type_name -> BattleCmd 35, // 33: BattleInCmdResp.in:type_name -> BattleCmd
35, // 34: BattleOutCmdPush.cmd:type_name -> BattleCmd 35, // 34: BattleOutCmdPush.cmd:type_name -> BattleCmd
11, // 35: BattleStateInfo.info:type_name -> BattleInfo 12, // 35: BattleFinishPush.report:type_name -> BattleReport
35, // 36: BattleStateInfo.outCmds:type_name -> BattleCmd 11, // 36: BattleStateInfo.info:type_name -> BattleInfo
35, // 37: BattleStateInfo.inputCmds:type_name -> BattleCmd 35, // 37: BattleStateInfo.outCmds:type_name -> BattleCmd
37, // 38: StroneBattleReq.diBuff:type_name -> DySkillData 35, // 38: BattleStateInfo.inputCmds:type_name -> BattleCmd
32, // 39: StroneBattleReq.role:type_name -> BattleRole 37, // 39: StroneBattleReq.diBuff:type_name -> DySkillData
33, // 40: StroneBattleReq.Btype:type_name -> BattleType 32, // 40: StroneBattleReq.role:type_name -> BattleRole
30, // 41: StroneBattleReq.Ptype:type_name -> PlayType 33, // 41: StroneBattleReq.Btype:type_name -> BattleType
30, // 42: BattlePVEPlunderReq.ptype:type_name -> PlayType 30, // 42: StroneBattleReq.Ptype:type_name -> PlayType
2, // 43: BattlePVEPlunderReq.format:type_name -> BattleFormation 30, // 43: BattlePVEPlunderReq.ptype:type_name -> PlayType
2, // 44: BattlePVEPlunderReq.defformat:type_name -> BattleFormation 2, // 44: BattlePVEPlunderReq.format:type_name -> BattleFormation
45, // [45:45] is the sub-list for method output_type 2, // 45: BattlePVEPlunderReq.defformat:type_name -> BattleFormation
45, // [45:45] is the sub-list for method input_type 46, // [46:46] is the sub-list for method output_type
45, // [45:45] is the sub-list for extension type_name 46, // [46:46] is the sub-list for method input_type
45, // [45:45] is the sub-list for extension extendee 46, // [46:46] is the sub-list for extension type_name
0, // [0:45] is the sub-list for field type_name 46, // [46:46] is the sub-list for extension extendee
0, // [0:46] is the sub-list for field type_name
} }
func init() { file_battle_battle_msg_proto_init() } func init() { file_battle_battle_msg_proto_init() }

8
services/cmd/main.go
View File

@ -281,15 +281,15 @@ func syncServer() {
`) `)
case "battle": case "battle":
exesshcomd("10.0.0.9", ` exesshcomd("10.0.0.9", `
cd /home/liwei/dfbattle/output; ./stop.sh; cd /home/liwei/dfbattle/docker_battle; ./stop.sh;
cd /home/liwei/fightdll; svn update; cd /home/liwei/fightdll; svn update;
sudo cp -f /home/liwei/fightdll/FightRunner.dll /home/liwei/dfbattle/lib/FightRunner.dll; sudo cp -f /home/liwei/fightdll/FightRunner.dll /home/liwei/dfbattle/lib/FightRunner.dll;
sudo cp -f /home/liwei/fightdll/GameFight.dll /home/liwei/dfbattle/lib/GameFight.dll; sudo cp -f /home/liwei/fightdll/GameFight.dll /home/liwei/dfbattle/lib/GameFight.dll;
sudo cp -f /home/liwei/fightdll/GameProto.dll /home/liwei/dfbattle/lib/GameProto.dll; sudo cp -f /home/liwei/fightdll/GameProto.dll /home/liwei/dfbattle/lib/GameProto.dll;
sudo cp -r -f /home/liwei/fightdll/GameConfig/* /home/liwei/dfbattle/GameConfig/; sudo cp -r -f /home/liwei/fightdll/GameConfig/* /home/liwei/dfbattle/GameConfig/;
cd /home/liwei/dfbattle; dotnet clean; dotnet build -o output; cd /home/liwei/dfbattle; dotnet clean; dotnet build -o docker_battle;
sudo cp -r -f /home/liwei/dfbattle/GameConfig/* /home/liwei/dfbattle/output/GameConfig/; sudo cp -r -f /home/liwei/dfbattle/GameConfig/* /home/liwei/dfbattle/docker_battle/GameConfig/;
cd /home/liwei/dfbattle/output; ./start.sh ; cd /home/liwei/dfbattle/docker_battle; ./start.sh ;
cd /home/liwei/dfbattle; git add ./lib/* ./GameConfig/*; git commit -m 同步战斗服; git push; cd /home/liwei/dfbattle; git add ./lib/* ./GameConfig/*; git commit -m 同步战斗服; git push;
`) `)
} }