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

上传进机场pve代码

Browse Source
This commit is contained in:
liwei1dao 2022-10-28 11:08:03 +08:00
parent 16f81a664f
commit 27af2b87bd
14 changed files with 1061 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

193
bin/json/game_arenachallengenpc.json
View File

@ -3,7 +3,10 @@
"id": 1,
"open_cond": 1,
"open_value": 10,
"monsterformat_id": 301011,
"monsterformat_id": [
301011,
301027
],
"stroy_id_front": 1001,
"stroy_id_after": 1001,
"name": {
@ -11,20 +14,28 @@
"text": "npc1"
},
"revive_cd": 24,
"revive_monsterformat_id": 301011,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 2,
"open_cond": 1,
"open_value": 11,
"monsterformat_id": 301012,
"monsterformat_id": [
301012
],
"stroy_id_front": 1002,
"stroy_id_after": 1002,
"name": {
@ -32,20 +43,28 @@
"text": "npc2"
},
"revive_cd": 24,
"revive_monsterformat_id": 301012,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 3,
"open_cond": 1,
"open_value": 12,
"monsterformat_id": 301013,
"monsterformat_id": [
301013
],
"stroy_id_front": 1003,
"stroy_id_after": 1003,
"name": {
@ -53,20 +72,28 @@
"text": "npc3"
},
"revive_cd": 24,
"revive_monsterformat_id": 301013,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 4,
"open_cond": 1,
"open_value": 13,
"monsterformat_id": 301014,
"monsterformat_id": [
301014
],
"stroy_id_front": 1004,
"stroy_id_after": 1004,
"name": {
@ -74,20 +101,28 @@
"text": "npc4"
},
"revive_cd": 24,
"revive_monsterformat_id": 301014,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 5,
"open_cond": 1,
"open_value": 14,
"monsterformat_id": 301015,
"monsterformat_id": [
301015
],
"stroy_id_front": 1005,
"stroy_id_after": 1005,
"name": {
@ -95,20 +130,28 @@
"text": "npc5"
},
"revive_cd": 24,
"revive_monsterformat_id": 301015,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 6,
"open_cond": 1,
"open_value": 15,
"monsterformat_id": 301016,
"monsterformat_id": [
301016
],
"stroy_id_front": 1006,
"stroy_id_after": 1006,
"name": {
@ -116,20 +159,28 @@
"text": "npc6"
},
"revive_cd": 24,
"revive_monsterformat_id": 301016,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 7,
"open_cond": 1,
"open_value": 16,
"monsterformat_id": 301017,
"monsterformat_id": [
301017
],
"stroy_id_front": 1007,
"stroy_id_after": 1007,
"name": {
@ -137,20 +188,28 @@
"text": "npc7"
},
"revive_cd": 24,
"revive_monsterformat_id": 301017,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 8,
"open_cond": 1,
"open_value": 17,
"monsterformat_id": 301018,
"monsterformat_id": [
301018
],
"stroy_id_front": 1008,
"stroy_id_after": 1008,
"name": {
@ -158,20 +217,28 @@
"text": "npc8"
},
"revive_cd": 24,
"revive_monsterformat_id": 301018,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 9,
"open_cond": 1,
"open_value": 18,
"monsterformat_id": 301019,
"monsterformat_id": [
301019
],
"stroy_id_front": 1009,
"stroy_id_after": 1009,
"name": {
@ -179,20 +246,28 @@
"text": "npc9"
},
"revive_cd": 24,
"revive_monsterformat_id": 301019,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 10,
"open_cond": 1,
"open_value": 19,
"monsterformat_id": 301020,
"monsterformat_id": [
301020
],
"stroy_id_front": 1010,
"stroy_id_after": 1010,
"name": {
@ -200,20 +275,28 @@
"text": "npc10"
},
"revive_cd": 24,
"revive_monsterformat_id": 301020,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 11,
"open_cond": 1,
"open_value": 20,
"monsterformat_id": 301021,
"monsterformat_id": [
301021
],
"stroy_id_front": 1011,
"stroy_id_after": 1011,
"name": {
@ -221,20 +304,28 @@
"text": "npc11"
},
"revive_cd": 24,
"revive_monsterformat_id": 301021,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 12,
"open_cond": 1,
"open_value": 21,
"monsterformat_id": 301022,
"monsterformat_id": [
301022
],
"stroy_id_front": 1012,
"stroy_id_after": 1012,
"name": {
@ -242,20 +333,28 @@
"text": "npc12"
},
"revive_cd": 24,
"revive_monsterformat_id": 301022,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 13,
"open_cond": 1,
"open_value": 22,
"monsterformat_id": 301023,
"monsterformat_id": [
301023
],
"stroy_id_front": 1013,
"stroy_id_after": 1013,
"name": {
@ -263,20 +362,28 @@
"text": "npc13"
},
"revive_cd": 24,
"revive_monsterformat_id": 301023,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 14,
"open_cond": 1,
"open_value": 23,
"monsterformat_id": 301024,
"monsterformat_id": [
301024
],
"stroy_id_front": 1014,
"stroy_id_after": 1014,
"name": {
@ -284,20 +391,28 @@
"text": "npc14"
},
"revive_cd": 24,
"revive_monsterformat_id": 301024,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 15,
"open_cond": 1,
"open_value": 24,
"monsterformat_id": 301025,
"monsterformat_id": [
301025
],
"stroy_id_front": 1015,
"stroy_id_after": 1015,
"name": {
@ -305,20 +420,28 @@
"text": "npc15"
},
"revive_cd": 24,
"revive_monsterformat_id": 301025,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"id": 16,
"open_cond": 1,
"open_value": 25,
"monsterformat_id": 301026,
"monsterformat_id": [
301026
],
"stroy_id_front": 1016,
"stroy_id_after": 1016,
"name": {
@ -326,13 +449,19 @@
"text": "npc16"
},
"revive_cd": 24,
"revive_monsterformat_id": 301026,
"npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"new_npc_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
}
]

1
modules/arena/api_challenge.go
View File

@ -112,6 +112,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge
}
cd, record = this.module.battle.CreatePvpBattle(session, &pb.BattlePVPReq{
Ptype: pb.PlayType_arena,
Redformat: &pb.PVPFormation{Uid: red.Uid, Leadpos: red.Attack.Leadpos, Format: red.Attack.Formt},
Buleformat: &pb.PVPFormation{Uid: bule.Uid, Leadpos: bule.Defend.Leadpos, Format: bule.Defend.Formt},
})

1
modules/arena/api_challengereward.go
View File

@ -43,6 +43,7 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
code = pb.ErrorCode_BattleValidationFailed
return
}
info.Streak++
if reward, err = this.module.configure.getActiveRewardById(info.Dan); err != nil {
this.module.Errorln(err)
return

2
modules/arena/api_info.go
View File

@ -51,9 +51,11 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (code
Name: user.Name,
Integral: global.ArenaInitiaIntegral,
Ticket: 10,
Streak: 0,
Record: make([]*pb.DBArenaBattleRecord, 0),
Lastrtickettime: 0,
Isdef: false,
Npc: make(map[int32]*pb.DBNpc),
}
if info.Dan, err = this.module.modelArena.computedan(info.Integral); err != nil {
code = pb.ErrorCode_ConfigNoFound

73
modules/arena/api_plot.go Normal file
View File

@ -0,0 +1,73 @@
package arena
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
"time"
"google.golang.org/protobuf/proto"
)
//参数校验
func (this *apiComp) PlotCheck(session comm.IUserSession, req *pb.ArenaPlotReq) (code pb.ErrorCode) {
return
}
///获取自己的排行榜信息
func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (code pb.ErrorCode, data proto.Message) {
var (
npc *cfg.GameArenaChallengeNpcData
info *pb.DBArenaUser
record *pb.DBBattleRecord
index int32
cd pb.ErrorCode
err error
)
defer func() {
if cd == pb.ErrorCode_Success {
session.SendMsg(string(this.module.GetType()), "plot", &pb.ArenaPlotResp{
Code: cd,
Pid: req.Pid,
Info: &pb.BattleInfo{
Id: record.Id,
Title: record.Title,
Btype: record.Btype,
Ptype: record.Ptype,
RedCompId: record.RedCompId,
Redflist: record.Redflist,
BlueCompId: record.BlueCompId,
Buleflist: record.Buleflist,
},
})
} else {
session.SendMsg(string(this.module.GetType()), "plot", &pb.ArenaPlotResp{Code: cd})
}
}()
if cd = this.PlotCheck(session, req); cd != pb.ErrorCode_Success {
return
}
if npc, err = this.module.configure.getChallengenpc(req.Pid); err != nil {
cd = pb.ErrorCode_ConfigNoFound
return
}
if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil {
cd = pb.ErrorCode_DBError
return
}
if info.Npc[req.Pid] != nil {
ndata := info.Npc[req.Pid]
if !time.Now().After(time.Unix(ndata.Cd, 0)) { //已经过了cd时间
code = pb.ErrorCode_ArenaTicketNpcInCd
return
}
index = ndata.Index
}
cd, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
Ptype: pb.PlayType_arena,
Format: req.Battle,
Mformat: []int32{npc.MonsterformatId[index]},
})
return
}

68
modules/arena/api_plotreward.go Normal file
View File

@ -0,0 +1,68 @@
package arena
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
"time"
"google.golang.org/protobuf/proto"
)
//参数校验
func (this *apiComp) PlotRewardCheck(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (code pb.ErrorCode) {
if req.Pid == 0 || req.Report == nil {
code = pb.ErrorCode_ReqParameterError
}
return
}
///领取战斗奖励
func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (code pb.ErrorCode, data proto.Message) {
var (
npc *cfg.GameArenaChallengeNpcData
info *pb.DBArenaUser
iswin bool
err error
)
if code = this.PlotRewardCheck(session, req); code != pb.ErrorCode_Success {
return
}
if npc, err = this.module.configure.getChallengenpc(req.Pid); err != nil {
code = pb.ErrorCode_ConfigNoFound
return
}
if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); code != pb.ErrorCode_Success {
return
}
if !iswin {
code = pb.ErrorCode_MoonfantasyBattleNoWin
return
}
if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
return
}
if info.Npc[req.Pid] == nil {
info.Npc[req.Pid] = &pb.DBNpc{
Id: req.Pid,
Index: 0,
}
}
if len(npc.MonsterformatId) > int(info.Npc[req.Pid].Index+1) {
info.Npc[req.Pid].Index++
}
info.Npc[req.Pid].Cd = time.Now().Add(time.Minute * time.Duration(npc.ReviveCd)).Unix()
if err = this.module.modelArena.Change(info.Uid, map[string]interface{}{
"npc": info.Npc,
}); err != nil {
this.module.Errorln(err)
code = pb.ErrorCode_DBError
return
}
this.module.DispenseRes(session, npc.NpcReward, true)
session.SendMsg(string(this.module.GetType()), "plotreward", &pb.ArenaPlotRewardResp{Issucc: true})
return
}

17
modules/arena/configure.go
View File

@ -169,3 +169,20 @@ func (this *configureComp) getRankReward() (result *cfg.GameArenaRankReward, err
}
return
}
//查询剧情npc系统
func (this *configureComp) getChallengenpc(id int32) (result *cfg.GameArenaChallengeNpcData, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(game_arenachallengenpc); err != nil {
this.module.Errorln(err)
} else {
if result, ok = v.(*cfg.GameArenaChallengeNpc).GetDataMap()[id]; !ok {
err = fmt.Errorf("on found getChallengenpc:%d", id)
this.module.Errorln(err)
}
}
return
}

142
pb/arena_db.pb.go
View File

@ -487,6 +487,7 @@ type DBArenaUser struct {
Defendtotaluum int32 `protobuf:"varint,20,opt,name=defendtotaluum,proto3" json:"defendtotaluum"` //防守总
Loc []float64 `protobuf:"fixed64,21,rep,packed,name=loc,proto3" json:"loc"` //地图索引 匹配系统使用
Isdef bool `protobuf:"varint,22,opt,name=isdef,proto3" json:"isdef"` //是否设置防守
Npc map[int32]*DBNpc `protobuf:"bytes,23,rep,name=npc,proto3" json:"npc" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // npc Cd
}
func (x *DBArenaUser) Reset() {
@ -675,6 +676,77 @@ func (x *DBArenaUser) GetIsdef() bool {
return false
}
func (x *DBArenaUser) GetNpc() map[int32]*DBNpc {
if x != nil {
return x.Npc
}
return nil
}
// npc数据
type DBNpc struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
Cd int64 `protobuf:"varint,2,opt,name=cd,proto3" json:"cd"`
Index int32 `protobuf:"varint,3,opt,name=index,proto3" json:"index"`
}
func (x *DBNpc) Reset() {
*x = DBNpc{}
if protoimpl.UnsafeEnabled {
mi := &file_arena_arena_db_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DBNpc) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DBNpc) ProtoMessage() {}
func (x *DBNpc) ProtoReflect() protoreflect.Message {
mi := &file_arena_arena_db_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 DBNpc.ProtoReflect.Descriptor instead.
func (*DBNpc) Descriptor() ([]byte, []int) {
return file_arena_arena_db_proto_rawDescGZIP(), []int{5}
}
func (x *DBNpc) GetId() int32 {
if x != nil {
return x.Id
}
return 0
}
func (x *DBNpc) GetCd() int64 {
if x != nil {
return x.Cd
}
return 0
}
func (x *DBNpc) GetIndex() int32 {
if x != nil {
return x.Index
}
return 0
}
var File_arena_arena_db_proto protoreflect.FileDescriptor
var file_arena_arena_db_proto_rawDesc = []byte{
@ -728,7 +800,7 @@ var file_arena_arena_db_proto_rawDesc = []byte{
0x28, 0x05, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12,
0x28, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12,
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61,
0x74, 0x65, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x99, 0x05, 0x0a, 0x0b, 0x44, 0x42,
0x74, 0x65, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x82, 0x06, 0x0a, 0x0b, 0x44, 0x42,
0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
0x18, 0x01, 0x20, 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,
@ -770,18 +842,28 @@ var file_arena_arena_db_proto_rawDesc = []byte{
0x65, 0x66, 0x65, 0x6e, 0x64, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x75, 0x75, 0x6d, 0x12, 0x10, 0x0a,
0x03, 0x6c, 0x6f, 0x63, 0x18, 0x15, 0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x12,
0x14, 0x0a, 0x05, 0x69, 0x73, 0x64, 0x65, 0x66, 0x18, 0x16, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
0x69, 0x73, 0x64, 0x65, 0x66, 0x2a, 0x9f, 0x01, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x41,
0x74, 0x74, 0x61, 0x63, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x74,
0x74, 0x61, 0x63, 0x6b, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x65,
0x66, 0x65, 0x6e, 0x64, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x65,
0x66, 0x65, 0x6e, 0x64, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x57, 0x61,
0x69, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x10, 0x04, 0x12, 0x11,
0x0a, 0x0d, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10,
0x05, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x75, 0x63, 0x63,
0x65, 0x65, 0x64, 0x65, 0x64, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x65, 0x76, 0x65, 0x6e,
0x67, 0x65, 0x45, 0x6e, 0x64, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x69, 0x73, 0x64, 0x65, 0x66, 0x12, 0x27, 0x0a, 0x03, 0x6e, 0x70, 0x63, 0x18, 0x17, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72,
0x2e, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x6e, 0x70, 0x63, 0x1a, 0x3e,
0x0a, 0x08, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42,
0x4e, 0x70, 0x63, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3d,
0x0a, 0x05, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x02, 0x20,
0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2a, 0x9f, 0x01,
0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74,
0x61, 0x74, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x57, 0x69, 0x6e,
0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x4c, 0x6f, 0x73, 0x74,
0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x6b, 0x57, 0x69, 0x6e,
0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x4c, 0x6f, 0x73, 0x74,
0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x57, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x76,
0x65, 0x6e, 0x67, 0x65, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67,
0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x65, 0x76,
0x65, 0x6e, 0x67, 0x65, 0x53, 0x75, 0x63, 0x63, 0x65, 0x65, 0x64, 0x65, 0x64, 0x10, 0x06, 0x12,
0x0e, 0x0a, 0x0a, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x64, 0x10, 0x07, 0x42,
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -797,7 +879,7 @@ func file_arena_arena_db_proto_rawDescGZIP() []byte {
}
var file_arena_arena_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_arena_arena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
var file_arena_arena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
var file_arena_arena_db_proto_goTypes = []interface{}{
(BattleRecordState)(0), // 0: BattleRecordState
(*DBPlayerBattleFormt)(nil), // 1: DBPlayerBattleFormt
@ -805,21 +887,25 @@ var file_arena_arena_db_proto_goTypes = []interface{}{
(*DBHeroBase)(nil), // 3: DBHeroBase
(*DBArenaBattleRecord)(nil), // 4: DBArenaBattleRecord
(*DBArenaUser)(nil), // 5: DBArenaUser
(*DBHero)(nil), // 6: DBHero
(*DBNpc)(nil), // 6: DBNpc
nil, // 7: DBArenaUser.NpcEntry
(*DBHero)(nil), // 8: DBHero
}
var file_arena_arena_db_proto_depIdxs = []int32{
6, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero
8, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero
1, // 1: ArenaPlayer.defend:type_name -> DBPlayerBattleFormt
3, // 2: DBArenaBattleRecord.formt:type_name -> DBHeroBase
0, // 3: DBArenaBattleRecord.State:type_name -> BattleRecordState
1, // 4: DBArenaUser.attack:type_name -> DBPlayerBattleFormt
1, // 5: DBArenaUser.defend:type_name -> DBPlayerBattleFormt
4, // 6: DBArenaUser.record:type_name -> DBArenaBattleRecord
7, // [7:7] is the sub-list for method output_type
7, // [7:7] is the sub-list for method input_type
7, // [7:7] is the sub-list for extension type_name
7, // [7:7] is the sub-list for extension extendee
0, // [0:7] is the sub-list for field type_name
7, // 7: DBArenaUser.npc:type_name -> DBArenaUser.NpcEntry
6, // 8: DBArenaUser.NpcEntry.value:type_name -> DBNpc
9, // [9:9] is the sub-list for method output_type
9, // [9:9] is the sub-list for method input_type
9, // [9:9] is the sub-list for extension type_name
9, // [9:9] is the sub-list for extension extendee
0, // [0:9] is the sub-list for field type_name
}
func init() { file_arena_arena_db_proto_init() }
@ -889,6 +975,18 @@ func file_arena_arena_db_proto_init() {
return nil
}
}
file_arena_arena_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBNpc); 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{
@ -896,7 +994,7 @@ func file_arena_arena_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_arena_arena_db_proto_rawDesc,
NumEnums: 1,
NumMessages: 5,
NumMessages: 7,
NumExtensions: 0,
NumServices: 0,
},

291
pb/arena_msg.pb.go
View File

@ -1054,10 +1054,14 @@ func (x *ArenaDelRewardResp) GetBid() string {
return ""
}
//剧情战斗 请求
type ArenaPlotReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Pid int32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid"` //剧情id
Battle *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"` //战斗类型
}
func (x *ArenaPlotReq) Reset() {
@ -1092,6 +1096,186 @@ func (*ArenaPlotReq) Descriptor() ([]byte, []int) {
return file_arena_arena_msg_proto_rawDescGZIP(), []int{20}
}
func (x *ArenaPlotReq) GetPid() int32 {
if x != nil {
return x.Pid
}
return 0
}
func (x *ArenaPlotReq) GetBattle() *BattleFormation {
if x != nil {
return x.Battle
}
return nil
}
type ArenaPlotResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` //是否成功
Pid int32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid"` //剧情id
Info *BattleInfo `protobuf:"bytes,3,opt,name=info,proto3" json:"info"`
}
func (x *ArenaPlotResp) Reset() {
*x = ArenaPlotResp{}
if protoimpl.UnsafeEnabled {
mi := &file_arena_arena_msg_proto_msgTypes[21]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ArenaPlotResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ArenaPlotResp) ProtoMessage() {}
func (x *ArenaPlotResp) ProtoReflect() protoreflect.Message {
mi := &file_arena_arena_msg_proto_msgTypes[21]
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 ArenaPlotResp.ProtoReflect.Descriptor instead.
func (*ArenaPlotResp) Descriptor() ([]byte, []int) {
return file_arena_arena_msg_proto_rawDescGZIP(), []int{21}
}
func (x *ArenaPlotResp) GetCode() ErrorCode {
if x != nil {
return x.Code
}
return ErrorCode_Success
}
func (x *ArenaPlotResp) GetPid() int32 {
if x != nil {
return x.Pid
}
return 0
}
func (x *ArenaPlotResp) GetInfo() *BattleInfo {
if x != nil {
return x.Info
}
return nil
}
//剧情战斗奖励领取 请求
type ArenaPlotRewardReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Pid int32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid"` //剧情id
Report *BattleReport `protobuf:"bytes,2,opt,name=report,proto3" json:"report"` //战报
}
func (x *ArenaPlotRewardReq) Reset() {
*x = ArenaPlotRewardReq{}
if protoimpl.UnsafeEnabled {
mi := &file_arena_arena_msg_proto_msgTypes[22]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ArenaPlotRewardReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ArenaPlotRewardReq) ProtoMessage() {}
func (x *ArenaPlotRewardReq) ProtoReflect() protoreflect.Message {
mi := &file_arena_arena_msg_proto_msgTypes[22]
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 ArenaPlotRewardReq.ProtoReflect.Descriptor instead.
func (*ArenaPlotRewardReq) Descriptor() ([]byte, []int) {
return file_arena_arena_msg_proto_rawDescGZIP(), []int{22}
}
func (x *ArenaPlotRewardReq) GetPid() int32 {
if x != nil {
return x.Pid
}
return 0
}
func (x *ArenaPlotRewardReq) GetReport() *BattleReport {
if x != nil {
return x.Report
}
return nil
}
type ArenaPlotRewardResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Issucc bool `protobuf:"varint,1,opt,name=issucc,proto3" json:"issucc"`
}
func (x *ArenaPlotRewardResp) Reset() {
*x = ArenaPlotRewardResp{}
if protoimpl.UnsafeEnabled {
mi := &file_arena_arena_msg_proto_msgTypes[23]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ArenaPlotRewardResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ArenaPlotRewardResp) ProtoMessage() {}
func (x *ArenaPlotRewardResp) ProtoReflect() protoreflect.Message {
mi := &file_arena_arena_msg_proto_msgTypes[23]
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 ArenaPlotRewardResp.ProtoReflect.Descriptor instead.
func (*ArenaPlotRewardResp) Descriptor() ([]byte, []int) {
return file_arena_arena_msg_proto_rawDescGZIP(), []int{23}
}
func (x *ArenaPlotRewardResp) GetIssucc() bool {
if x != nil {
return x.Issucc
}
return false
}
var File_arena_arena_msg_proto protoreflect.FileDescriptor
var file_arena_arena_msg_proto_rawDesc = []byte{
@ -1178,8 +1362,26 @@ var file_arena_arena_msg_proto_rawDesc = []byte{
0x64, 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, 0x10, 0x0a,
0x03, 0x62, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x22,
0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x42,
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x4a, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x12,
0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69,
0x64, 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, 0x62, 0x0a, 0x0d, 0x41,
0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04,
0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72,
0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03,
0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x1f,
0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
0x4d, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x77, 0x61,
0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
0x74, 0x18, 0x02, 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, 0x2d,
0x0a, 0x13, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72,
0x64, 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, 0x42, 0x06, 0x5a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -1194,7 +1396,7 @@ func file_arena_arena_msg_proto_rawDescGZIP() []byte {
return file_arena_arena_msg_proto_rawDescData
}
var file_arena_arena_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21)
var file_arena_arena_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
var file_arena_arena_msg_proto_goTypes = []interface{}{
(*ArenaInfoReq)(nil), // 0: ArenaInfoReq
(*ArenaInfoResp)(nil), // 1: ArenaInfoResp
@ -1217,27 +1419,34 @@ var file_arena_arena_msg_proto_goTypes = []interface{}{
(*ArenaDelRewardReq)(nil), // 18: ArenaDelRewardReq
(*ArenaDelRewardResp)(nil), // 19: ArenaDelRewardResp
(*ArenaPlotReq)(nil), // 20: ArenaPlotReq
(*DBArenaUser)(nil), // 21: DBArenaUser
(*ArenaPlayer)(nil), // 22: ArenaPlayer
(*BattleFormation)(nil), // 23: BattleFormation
(ErrorCode)(0), // 24: ErrorCode
(*BattleInfo)(nil), // 25: BattleInfo
(*BattleReport)(nil), // 26: BattleReport
(*ArenaPlotResp)(nil), // 21: ArenaPlotResp
(*ArenaPlotRewardReq)(nil), // 22: ArenaPlotRewardReq
(*ArenaPlotRewardResp)(nil), // 23: ArenaPlotRewardResp
(*DBArenaUser)(nil), // 24: DBArenaUser
(*ArenaPlayer)(nil), // 25: ArenaPlayer
(*BattleFormation)(nil), // 26: BattleFormation
(ErrorCode)(0), // 27: ErrorCode
(*BattleInfo)(nil), // 28: BattleInfo
(*BattleReport)(nil), // 29: BattleReport
}
var file_arena_arena_msg_proto_depIdxs = []int32{
21, // 0: ArenaInfoResp.info:type_name -> DBArenaUser
21, // 1: ArenaOtherInfoResp.info:type_name -> DBArenaUser
22, // 2: ArenaMatcheResp.players:type_name -> ArenaPlayer
23, // 3: ArenaChallengeReq.battle:type_name -> BattleFormation
24, // 4: ArenaChallengeResp.code:type_name -> ErrorCode
25, // 5: ArenaChallengeResp.info:type_name -> BattleInfo
26, // 6: ArenaChallengeRewardReq.report:type_name -> BattleReport
22, // 7: ArenaRankResp.players:type_name -> ArenaPlayer
8, // [8:8] is the sub-list for method output_type
8, // [8:8] is the sub-list for method input_type
8, // [8:8] is the sub-list for extension type_name
8, // [8:8] is the sub-list for extension extendee
0, // [0:8] is the sub-list for field type_name
24, // 0: ArenaInfoResp.info:type_name -> DBArenaUser
24, // 1: ArenaOtherInfoResp.info:type_name -> DBArenaUser
25, // 2: ArenaMatcheResp.players:type_name -> ArenaPlayer
26, // 3: ArenaChallengeReq.battle:type_name -> BattleFormation
27, // 4: ArenaChallengeResp.code:type_name -> ErrorCode
28, // 5: ArenaChallengeResp.info:type_name -> BattleInfo
29, // 6: ArenaChallengeRewardReq.report:type_name -> BattleReport
25, // 7: ArenaRankResp.players:type_name -> ArenaPlayer
26, // 8: ArenaPlotReq.battle:type_name -> BattleFormation
27, // 9: ArenaPlotResp.code:type_name -> ErrorCode
28, // 10: ArenaPlotResp.info:type_name -> BattleInfo
29, // 11: ArenaPlotRewardReq.report:type_name -> BattleReport
12, // [12:12] is the sub-list for method output_type
12, // [12:12] is the sub-list for method input_type
12, // [12:12] is the sub-list for extension type_name
12, // [12:12] is the sub-list for extension extendee
0, // [0:12] is the sub-list for field type_name
}
func init() { file_arena_arena_msg_proto_init() }
@ -1501,6 +1710,42 @@ func file_arena_arena_msg_proto_init() {
return nil
}
}
file_arena_arena_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ArenaPlotResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_arena_arena_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ArenaPlotRewardReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_arena_arena_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ArenaPlotRewardResp); 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{
@ -1508,7 +1753,7 @@ func file_arena_arena_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_arena_arena_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 21,
NumMessages: 24,
NumExtensions: 0,
NumServices: 0,
},

18
pb/battle_db.pb.go
View File

@ -83,6 +83,7 @@ const (
PlayType_hunting PlayType = 4 //狩猎
PlayType_viking PlayType = 5 //维京远征
PlayType_moonfantasy PlayType = 6 //月之秘境
PlayType_arena PlayType = 7 //竞技场
)
// Enum value maps for PlayType.
@ -95,6 +96,7 @@ var (
4: "hunting",
5: "viking",
6: "moonfantasy",
7: "arena",
}
PlayType_value = map[string]int32{
"null": 0,
@ -104,6 +106,7 @@ var (
"hunting": 4,
"viking": 5,
"moonfantasy": 6,
"arena": 7,
}
)
@ -624,19 +627,20 @@ var file_battle_battle_db_proto_rawDesc = []byte{
0x6f, 0x6d, 0x70, 0x52, 0x06, 0x72, 0x65, 0x73, 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, 0x63, 0x0a,
0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x2a, 0x6e, 0x0a,
0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, 0x6c,
0x6c, 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, 0x12, 0x09, 0x0a,
0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, 0x74,
0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x10,
0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79,
0x10, 0x06, 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,
0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07, 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 (

78
pb/errorcode.pb.go
View File

@ -208,9 +208,21 @@ const (
ErrorCode_SociatyQuit ErrorCode = 3007 //退会失败
ErrorCode_SociatyAgree ErrorCode = 3008 //申请-同意失败
ErrorCode_SociatyRefuse ErrorCode = 3009 //申请-拒绝失败
ErrorCode_SociatyAssign ErrorCode = 30010 //公会转让失败
ErrorCode_SociatyDischarge ErrorCode = 30011 //踢出失败
ErrorCode_SociatySettingJob ErrorCode = 30012 //设置职位失败
ErrorCode_SociatySetting ErrorCode = 30013 //公会修改失败
ErrorCode_SociatyAccuse ErrorCode = 30014 //弹劾失败
ErrorCode_SociatySign ErrorCode = 30015 //签到失败
ErrorCode_SociatySigned ErrorCode = 30016 //已签到
ErrorCode_SociatyCDLimit ErrorCode = 30017 // CD时间限制
ErrorCode_SociatyApplyMax ErrorCode = 30018 //最大申请该公会人数
ErrorCode_SociatySelfSetting ErrorCode = 30019 // 不能设置自己
ErrorCode_SociatyMemberCountLimit ErrorCode = 30020 //超出人数限制
// arena
ErrorCode_ArenaTicketBuyUp ErrorCode = 3101 //票据上限
ErrorCode_ArenaTicketNotEnough ErrorCode = 3102 //票据不足
ErrorCode_ArenaTicketNpcInCd ErrorCode = 3103 // cd中
// talent
ErrorCode_TalentRepeatLearn ErrorCode = 3201 // 天赋已学习
ErrorCode_TalentErrData ErrorCode = 3202 /// 天赋不存在
@ -387,8 +399,20 @@ var (
3007: "SociatyQuit",
3008: "SociatyAgree",
3009: "SociatyRefuse",
30010: "SociatyAssign",
30011: "SociatyDischarge",
30012: "SociatySettingJob",
30013: "SociatySetting",
30014: "SociatyAccuse",
30015: "SociatySign",
30016: "SociatySigned",
30017: "SociatyCDLimit",
30018: "SociatyApplyMax",
30019: "SociatySelfSetting",
30020: "SociatyMemberCountLimit",
3101: "ArenaTicketBuyUp",
3102: "ArenaTicketNotEnough",
3103: "ArenaTicketNpcInCd",
3201: "TalentRepeatLearn",
3202: "TalentErrData",
3203: "TalentUnLockerBefore",
@ -561,8 +585,20 @@ var (
"SociatyQuit": 3007,
"SociatyAgree": 3008,
"SociatyRefuse": 3009,
"SociatyAssign": 30010,
"SociatyDischarge": 30011,
"SociatySettingJob": 30012,
"SociatySetting": 30013,
"SociatyAccuse": 30014,
"SociatySign": 30015,
"SociatySigned": 30016,
"SociatyCDLimit": 30017,
"SociatyApplyMax": 30018,
"SociatySelfSetting": 30019,
"SociatyMemberCountLimit": 30020,
"ArenaTicketBuyUp": 3101,
"ArenaTicketNotEnough": 3102,
"ArenaTicketNpcInCd": 3103,
"TalentRepeatLearn": 3201,
"TalentErrData": 3202,
"TalentUnLockerBefore": 3203,
@ -601,7 +637,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
var file_errorcode_proto_rawDesc = []byte{
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x2a, 0xf6, 0x1d, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
0x6f, 0x2a, 0x8e, 0x20, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
@ -831,17 +867,35 @@ var file_errorcode_proto_rawDesc = []byte{
0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74,
0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67,
0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72,
0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d,
0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74,
0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, 0x12, 0x16, 0x0a, 0x11,
0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72,
0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72,
0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65,
0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65,
0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73,
0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x13, 0x0a, 0x0d, 0x53, 0x6f,
0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x10, 0xba, 0xea, 0x01, 0x12,
0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x63, 0x68, 0x61,
0x72, 0x67, 0x65, 0x10, 0xbb, 0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61,
0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xbc, 0xea, 0x01,
0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69,
0x6e, 0x67, 0x10, 0xbd, 0xea, 0x01, 0x12, 0x13, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
0x79, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, 0xbe, 0xea, 0x01, 0x12, 0x11, 0x0a, 0x0b, 0x53,
0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x10, 0xbf, 0xea, 0x01, 0x12, 0x13,
0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10,
0xc0, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x44,
0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63,
0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xc2, 0xea, 0x01,
0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, 0x66, 0x53,
0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc3, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f,
0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74,
0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc4, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65,
0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18,
0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e,
0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41,
0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43,
0x64, 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65,
0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d,
0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19,
0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b,
0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54,
0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10,
0x84, 0x19, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x33,
}
var (

46
pb/userexpand.pb.go
View File

@ -45,7 +45,10 @@ type DBUserExpand struct {
CompletePagoda bool `protobuf:"varint,21,opt,name=completePagoda,proto3" json:"completePagoda" bson:"completePagoda"` //通关普通塔
RtaskId int32 `protobuf:"varint,22,opt,name=rtaskId,proto3" json:"rtaskId" bson:"rtaskId"` // 当前完成的随机任务ID
TeamHeroIds []string `protobuf:"bytes,23,rep,name=teamHeroIds,proto3" json:"teamHeroIds" bson:"teamHeroIds"` //阵容英雄IDs
SociatyId string `protobuf:"bytes,24,opt,name=sociatyId,proto3" json:"sociatyId"` //@go_tags(`bson:"sociatyId") 公会ID
SociatyId string `protobuf:"bytes,24,opt,name=sociatyId,proto3" json:"sociatyId" bson:"sociatyId"` //公会ID
SociatyContri int32 `protobuf:"varint,25,opt,name=sociatyContri,proto3" json:"sociatyContri" bson:"sociatyContri"` //个人贡献
SociatyCd int64 `protobuf:"varint,26,opt,name=sociatyCd,proto3" json:"sociatyCd" bson:"sociatyCd"` //主动退出CD
SociatyCoin int32 `protobuf:"varint,27,opt,name=sociatyCoin,proto3" json:"sociatyCoin" bson:"sociatyCoin"` //公会币
}
func (x *DBUserExpand) Reset() {
@ -220,11 +223,32 @@ func (x *DBUserExpand) GetSociatyId() string {
return ""
}
func (x *DBUserExpand) GetSociatyContri() int32 {
if x != nil {
return x.SociatyContri
}
return 0
}
func (x *DBUserExpand) GetSociatyCd() int64 {
if x != nil {
return x.SociatyCd
}
return 0
}
func (x *DBUserExpand) GetSociatyCoin() int32 {
if x != nil {
return x.SociatyCoin
}
return 0
}
var File_userexpand_proto protoreflect.FileDescriptor
var file_userexpand_proto_rawDesc = []byte{
0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x22, 0x82, 0x06, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
0x74, 0x6f, 0x22, 0xe8, 0x06, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
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, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61,
@ -268,12 +292,18 @@ var file_userexpand_proto_rawDesc = []byte{
0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x17, 0x20, 0x03, 0x28,
0x09, 0x52, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x12, 0x1c,
0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28,
0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x1a, 0x39, 0x0a, 0x0b,
0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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,
0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d,
0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x18, 0x19, 0x20,
0x01, 0x28, 0x05, 0x52, 0x0d, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x6f, 0x6e, 0x74,
0x72, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x64, 0x18,
0x1a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x64,
0x12, 0x20, 0x0a, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x6f, 0x69, 0x6e, 0x18,
0x1b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x6f,
0x69, 0x6e, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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 (

34
sys/configure/structs/Game.ArenaChallengeNpcData.go
View File

@ -14,13 +14,13 @@ type GameArenaChallengeNpcData struct {
Id int32
OpenCond int32
OpenValue int32
MonsterformatId int32
MonsterformatId []int32
StroyIdFront int32
StroyIdAfter int32
Name string
ReviveCd int32
ReviveMonsterformatId int32
NpcReward []*Gameatn
NewNpcReward []*Gameatn
}
const TypeId_GameArenaChallengeNpcData = 362128499
@ -33,12 +33,24 @@ func (_v *GameArenaChallengeNpcData)Deserialize(_buf map[string]interface{}) (er
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["open_cond"].(float64); !_ok_ { err = errors.New("open_cond error"); return }; _v.OpenCond = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["open_value"].(float64); !_ok_ { err = errors.New("open_value error"); return }; _v.OpenValue = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monsterformat_id"].(float64); !_ok_ { err = errors.New("monsterformat_id error"); return }; _v.MonsterformatId = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["monsterformat_id"].([]interface{}); !_ok_ { err = errors.New("monsterformat_id error"); return }
_v.MonsterformatId = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.MonsterformatId = append(_v.MonsterformatId, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stroy_id_front"].(float64); !_ok_ { err = errors.New("stroy_id_front error"); return }; _v.StroyIdFront = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stroy_id_after"].(float64); !_ok_ { err = errors.New("stroy_id_after error"); return }; _v.StroyIdAfter = int32(_tempNum_) }
{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 _tempNum_ float64; if _tempNum_, _ok_ = _buf["revive_cd"].(float64); !_ok_ { err = errors.New("revive_cd error"); return }; _v.ReviveCd = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["revive_monsterformat_id"].(float64); !_ok_ { err = errors.New("revive_monsterformat_id error"); return }; _v.ReviveMonsterformatId = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
@ -53,6 +65,20 @@ func (_v *GameArenaChallengeNpcData)Deserialize(_buf map[string]interface{}) (er
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["new_npc_reward"].([]interface{}); !_ok_ { err = errors.New("new_npc_reward error"); return }
_v.NewNpcReward = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.NewNpcReward = append(_v.NewNpcReward, _list_v_)
}
}
return
}

2
sys/db/init_test.go
View File

@ -35,7 +35,7 @@ func Test_Id(t *testing.T) {
func Test_2D(t *testing.T) {
if sys, err := mgo.NewSys(
mgo.SetMongodbUrl("mongodb://10.0.0.9:10013"),
mgo.SetMongodbDatabase("dreamfactory4"),
mgo.SetMongodbDatabase("dreamfactory2"),
); err != nil {
fmt.Printf("err:%v", err)
return