Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
1bb9439b8f
@ -60781,7 +60781,7 @@
|
|||||||
"Argu": [
|
"Argu": [
|
||||||
391000075,
|
391000075,
|
||||||
1000,
|
1000,
|
||||||
1,
|
-1,
|
||||||
-1
|
-1
|
||||||
],
|
],
|
||||||
"FollowSK": [],
|
"FollowSK": [],
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
机器人总数: 1
|
|
||||||
成功数量: 1
|
|
||||||
失败数量: 0
|
|
||||||
消息总吞吐量: 46
|
|
||||||
---消息压测详情----------------------------------------------------------------------------------------------------
|
|
||||||
消息名:wtask.accept 请求次数:12 耗时最小:1 ms 耗时最大:5 ms 平均耗时:2.83 ms 中位耗时:3.00 ms
|
|
||||||
消息名:wtask.completecondi 请求次数:3 耗时最小:1 ms 耗时最大:5 ms 平均耗时:3.67 ms 中位耗时:5.00 ms
|
|
||||||
消息名:wtask.finish 请求次数:10 耗时最小:2 ms 耗时最大:19 ms 平均耗时:8.40 ms 中位耗时:9.00 ms
|
|
||||||
消息名:practice.practice 请求次数:1 耗时最小:6 ms 耗时最大:6 ms 平均耗时:6.00 ms 中位耗时:6.00 ms
|
|
||||||
消息名:mainline.info 请求次数:1 耗时最小:5 ms 耗时最大:5 ms 平均耗时:5.00 ms 中位耗时:5.00 ms
|
|
||||||
消息名:sys.funcgetlist 请求次数:1 耗时最小:21 ms 耗时最大:21 ms 平均耗时:21.00ms 中位耗时:21.00ms
|
|
||||||
消息名:equipment.getlist 请求次数:1 耗时最小:0 ms 耗时最大:0 ms 平均耗时:0.00 ms 中位耗时:0.00 ms
|
|
||||||
消息名:wtask.info 请求次数:1 耗时最小:0 ms 耗时最大:0 ms 平均耗时:0.00 ms 中位耗时:0.00 ms
|
|
||||||
消息名:wtask.battlefinish 请求次数:4 耗时最小:1 ms 耗时最大:9 ms 平均耗时:3.50 ms 中位耗时:2.00 ms
|
|
||||||
消息名:practice.info 请求次数:1 耗时最小:8 ms 耗时最大:8 ms 平均耗时:8.00 ms 中位耗时:8.00 ms
|
|
||||||
消息名:user.login 请求次数:1 耗时最小:586 ms 耗时最大:586 ms 平均耗时:586.00ms 中位耗时:586.00ms
|
|
||||||
消息名:user.create 请求次数:1 耗时最小:16 ms 耗时最大:16 ms 平均耗时:16.00ms 中位耗时:16.00ms
|
|
||||||
消息名:items.getlist 请求次数:1 耗时最小:0 ms 耗时最大:0 ms 平均耗时:0.00 ms 中位耗时:0.00 ms
|
|
||||||
消息名:sys.funcactivate 请求次数:1 耗时最小:3 ms 耗时最大:3 ms 平均耗时:3.00 ms 中位耗时:3.00 ms
|
|
||||||
消息名:hero.list 请求次数:1 耗时最小:1 ms 耗时最大:1 ms 平均耗时:1.00 ms 中位耗时:1.00 ms
|
|
||||||
消息名:hero.talentlist 请求次数:1 耗时最小:0 ms 耗时最大:0 ms 平均耗时:0.00 ms 中位耗时:0.00 ms
|
|
||||||
消息名:wtask.battlestart 请求次数:4 耗时最小:1 ms 耗时最大:4 ms 平均耗时:2.25 ms 中位耗时:2.00 ms
|
|
||||||
消息名:hero.drawcard 请求次数:1 耗时最小:15 ms 耗时最大:15 ms 平均耗时:15.00ms 中位耗时:15.00ms
|
|
22
bin/robot001.txt
Normal file
22
bin/robot001.txt
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
机器人总数: 100
|
||||||
|
成功数量: 100
|
||||||
|
失败数量: 0
|
||||||
|
消息总吞吐量: 4209
|
||||||
|
---消息压测详情----------------------------------------------------------------------------------------------------
|
||||||
|
消息名:sys.funcgetlist 请求次数:99 耗时最小:225 ms 耗时最大:2054 ms 平均耗时:1159.22ms 中位耗时:1067.00ms
|
||||||
|
消息名:user.create 请求次数:100 耗时最小:15 ms 耗时最大:590 ms 平均耗时:227.31ms 中位耗时:193.00ms
|
||||||
|
消息名:hero.list 请求次数:99 耗时最小:26 ms 耗时最大:215 ms 平均耗时:65.18ms 中位耗时:53.00ms
|
||||||
|
消息名:equipment.getlist 请求次数:99 耗时最小:15 ms 耗时最大:53 ms 平均耗时:27.45ms 中位耗时:25.00ms
|
||||||
|
消息名:wtask.info 请求次数:99 耗时最小:22 ms 耗时最大:178 ms 平均耗时:70.98ms 中位耗时:64.00ms
|
||||||
|
消息名:wtask.battlestart 请求次数:396 耗时最小:15 ms 耗时最大:97 ms 平均耗时:34.66ms 中位耗时:29.00ms
|
||||||
|
消息名:wtask.battlefinish 请求次数:396 耗时最小:15 ms 耗时最大:482 ms 平均耗时:102.37ms 中位耗时:82.00ms
|
||||||
|
消息名:hero.drawcard 请求次数:99 耗时最小:66 ms 耗时最大:728 ms 平均耗时:328.85ms 中位耗时:295.00ms
|
||||||
|
消息名:practice.practice 请求次数:99 耗时最小:15 ms 耗时最大:43 ms 平均耗时:22.32ms 中位耗时:22.00ms
|
||||||
|
消息名:user.login 请求次数:100 耗时最小:177 ms 耗时最大:7431 ms 平均耗时:2092.23ms 中位耗时:1376.50ms
|
||||||
|
消息名:items.getlist 请求次数:99 耗时最小:22 ms 耗时最大:119 ms 平均耗时:53.21ms 中位耗时:50.00ms
|
||||||
|
消息名:wtask.completecondi 请求次数:297 耗时最小:23 ms 耗时最大:517 ms 平均耗时:63.37ms 中位耗时:39.00ms
|
||||||
|
消息名:wtask.finish 请求次数:792 耗时最小:34 ms 耗时最大:777 ms 平均耗时:174.03ms 中位耗时:142.00ms
|
||||||
|
消息名:practice.info 请求次数:99 耗时最小:19 ms 耗时最大:473 ms 平均耗时:57.72ms 中位耗时:36.00ms
|
||||||
|
消息名:hero.talentlist 请求次数:99 耗时最小:18 ms 耗时最大:66 ms 平均耗时:27.80ms 中位耗时:26.00ms
|
||||||
|
消息名:wtask.accept 请求次数:940 耗时最小:21 ms 耗时最大:314 ms 平均耗时:78.23ms 中位耗时:75.00ms
|
||||||
|
消息名:sys.funcactivate 请求次数:297 耗时最小:14 ms 耗时最大:470 ms 平均耗时:24.28ms 中位耗时:21.00ms
|
@ -26,6 +26,18 @@ func (this *apiComp) Matche(session comm.IUserSession, req *pb.CapturesheepMatch
|
|||||||
if errdata = this.MatcheCheck(session, req); errdata != nil {
|
if errdata = this.MatcheCheck(session, req); errdata != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if req.Rtype == pb.CaptureSheepRaceType_ranked {
|
||||||
|
if !this.module.configure.isopen() {
|
||||||
|
errdata = &pb.ErrorData{
|
||||||
|
Code: pb.ErrorCode_CapturesheepRankCloseed,
|
||||||
|
Title: pb.ErrorCode_CapturesheepRankCloseed.ToString(),
|
||||||
|
Message: "currTime is rank close",
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if info, err = this.module.modelCaptureSheep.queryInfo(session.GetUserId()); err != nil {
|
if info, err = this.module.modelCaptureSheep.queryInfo(session.GetUserId()); err != nil {
|
||||||
errdata = &pb.ErrorData{
|
errdata = &pb.ErrorData{
|
||||||
Code: pb.ErrorCode_DBError,
|
Code: pb.ErrorCode_DBError,
|
||||||
|
@ -4,6 +4,7 @@ import (
|
|||||||
"go_dreamfactory/comm"
|
"go_dreamfactory/comm"
|
||||||
"go_dreamfactory/lego/sys/mgo"
|
"go_dreamfactory/lego/sys/mgo"
|
||||||
"go_dreamfactory/pb"
|
"go_dreamfactory/pb"
|
||||||
|
cfg "go_dreamfactory/sys/configure/structs"
|
||||||
)
|
)
|
||||||
|
|
||||||
// 参数校验
|
// 参数校验
|
||||||
@ -17,8 +18,11 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq
|
|||||||
var (
|
var (
|
||||||
redScores, blueScores int32
|
redScores, blueScores int32
|
||||||
info *pb.DBCaptureSheep
|
info *pb.DBCaptureSheep
|
||||||
selfMenber *pb.CaptureSheepRaceMember
|
conf *cfg.GameQualifyingData
|
||||||
otherMenber *pb.CaptureSheepRaceMember
|
isred bool
|
||||||
|
iswin bool
|
||||||
|
awards []*cfg.Gameatn
|
||||||
|
award []*pb.UserAtno
|
||||||
err error
|
err error
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -33,25 +37,54 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if conf, err = this.module.configure.getActiveRewardById(info.Dan); err != nil {
|
||||||
|
errdata = &pb.ErrorData{
|
||||||
|
Code: pb.ErrorCode_ConfigNoFound,
|
||||||
|
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||||
|
Message: err.Error(),
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
for _, v := range req.Race.Redmember {
|
for _, v := range req.Race.Redmember {
|
||||||
redScores += v.Scores
|
redScores += v.Scores
|
||||||
if v.Uid == session.GetUserId() {
|
if v.Uid == session.GetUserId() {
|
||||||
selfMenber = v
|
isred = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for _, v := range req.Race.Bulemember {
|
for _, v := range req.Race.Bulemember {
|
||||||
blueScores += v.Scores
|
blueScores += v.Scores
|
||||||
if v.Uid == session.GetUserId() {
|
if v.Uid == session.GetUserId() {
|
||||||
selfMenber = v
|
isred = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if redScores > blueScores { //红方胜利
|
if redScores > blueScores && isred { //红方胜利
|
||||||
this.module.modelCaptureSheep.integralCompute(selfMenber, otherMenber, true)
|
info.Integral += conf.WinValue
|
||||||
|
iswin = true
|
||||||
|
if req.Race.Rtype == pb.CaptureSheepRaceType_train {
|
||||||
|
awards = conf.MatewinReward
|
||||||
|
} else {
|
||||||
|
awards = conf.RankwinReward
|
||||||
|
}
|
||||||
|
|
||||||
|
} else if redScores < blueScores && !isred {
|
||||||
|
info.Integral += conf.WinValue
|
||||||
|
iswin = true
|
||||||
|
if req.Race.Rtype == pb.CaptureSheepRaceType_train {
|
||||||
|
awards = conf.MatewinReward
|
||||||
|
} else {
|
||||||
|
awards = conf.RankwinReward
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
this.module.modelCaptureSheep.integralCompute(selfMenber, otherMenber, false)
|
info.Integral += conf.FailValue
|
||||||
|
if req.Race.Rtype == pb.CaptureSheepRaceType_train {
|
||||||
|
awards = conf.MatefailReward
|
||||||
|
} else {
|
||||||
|
awards = conf.RankfailReward
|
||||||
|
}
|
||||||
}
|
}
|
||||||
info.Integral = selfMenber.Integral
|
|
||||||
if info.Dan, err = this.module.modelCaptureSheep.computedan(info.Integral); err != nil {
|
if info.Dan, err = this.module.modelCaptureSheep.computedan(info.Integral); err != nil {
|
||||||
errdata = &pb.ErrorData{
|
errdata = &pb.ErrorData{
|
||||||
Code: pb.ErrorCode_ConfigNoFound,
|
Code: pb.ErrorCode_ConfigNoFound,
|
||||||
@ -60,6 +93,11 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if errdata, award = this.module.DispenseAtno(session, awards, true); errdata != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if err = this.module.modelCaptureSheep.Change(session.GetUserId(), map[string]interface{}{
|
if err = this.module.modelCaptureSheep.Change(session.GetUserId(), map[string]interface{}{
|
||||||
"integral": info.Integral,
|
"integral": info.Integral,
|
||||||
"dan": info.Dan,
|
"dan": info.Dan,
|
||||||
@ -71,6 +109,11 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
session.SendMsg(string(this.module.GetType()), "info", &pb.CapturesheepOverResp{})
|
session.SendMsg(string(this.module.GetType()), "over", &pb.CapturesheepOverResp{
|
||||||
|
Iswin: iswin,
|
||||||
|
Integral: info.Integral,
|
||||||
|
Dan: info.Dan,
|
||||||
|
Award: award,
|
||||||
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -5,13 +5,14 @@ import (
|
|||||||
"go_dreamfactory/comm"
|
"go_dreamfactory/comm"
|
||||||
"go_dreamfactory/lego/core"
|
"go_dreamfactory/lego/core"
|
||||||
"go_dreamfactory/modules"
|
"go_dreamfactory/modules"
|
||||||
|
"go_dreamfactory/sys/configure"
|
||||||
cfg "go_dreamfactory/sys/configure/structs"
|
cfg "go_dreamfactory/sys/configure/structs"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
game_arenarobot = "game_arenarobot.json" //ai配置表
|
game_buzkashiopen = "game_buzkashiopen.json"
|
||||||
game_qualifying = "game_qualifying.json" //段位
|
game_arenarobot = "game_arenarobot.json" //ai配置表
|
||||||
game_arenarankreward = "game_arenarankreward.json" //比赛奖励配置
|
game_qualifying = "game_qualifying.json" //段位
|
||||||
)
|
)
|
||||||
|
|
||||||
type configureComp struct {
|
type configureComp struct {
|
||||||
@ -23,11 +24,41 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
|
|||||||
err = this.MCompConfigure.Init(service, module, comp, options)
|
err = this.MCompConfigure.Init(service, module, comp, options)
|
||||||
this.module = module.(*CaptureSheep)
|
this.module = module.(*CaptureSheep)
|
||||||
err = this.LoadMultiConfigure(map[string]interface{}{
|
err = this.LoadMultiConfigure(map[string]interface{}{
|
||||||
game_arenarobot: cfg.NewGameArenaRobot,
|
game_arenarobot: cfg.NewGameArenaRobot,
|
||||||
|
game_buzkashiopen: cfg.NewGameBuzkashiOpen,
|
||||||
|
game_qualifying: cfg.NewGameQualifying,
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 查询开启表
|
||||||
|
func (this *configureComp) isopen() (open bool) {
|
||||||
|
var (
|
||||||
|
v interface{}
|
||||||
|
config *cfg.GameBuzkashiOpen
|
||||||
|
currtime string = configure.Now().Format("15:04")
|
||||||
|
err error
|
||||||
|
ok bool
|
||||||
|
)
|
||||||
|
if v, err = this.GetConfigure(game_buzkashiopen); err != nil {
|
||||||
|
this.module.Errorln(err)
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
if config, ok = v.(*cfg.GameBuzkashiOpen); !ok {
|
||||||
|
err = fmt.Errorf("config type err:%T", v)
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
for _, v := range config.GetDataList() {
|
||||||
|
if currtime >= fmt.Sprintf("%d:%d", v.Shtime, v.Smtime) && currtime < fmt.Sprintf("%d:%d", v.Ehtime, v.Emtime) {
|
||||||
|
open = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
//查询积分段位信息
|
//查询积分段位信息
|
||||||
func (this *configureComp) getActiveReward(integral int32) (result *cfg.GameQualifyingData, err error) {
|
func (this *configureComp) getActiveReward(integral int32) (result *cfg.GameQualifyingData, err error) {
|
||||||
var (
|
var (
|
||||||
@ -48,7 +79,7 @@ func (this *configureComp) getActiveReward(integral int32) (result *cfg.GameQual
|
|||||||
}
|
}
|
||||||
|
|
||||||
//查询积分段位信息
|
//查询积分段位信息
|
||||||
func (this *configureComp) getActiveRewardById(lv int32) (result *cfg.GameArenaActiveRewardData, err error) {
|
func (this *configureComp) getActiveRewardById(lv int32) (result *cfg.GameQualifyingData, err error) {
|
||||||
var (
|
var (
|
||||||
v interface{}
|
v interface{}
|
||||||
ok bool
|
ok bool
|
||||||
@ -56,23 +87,10 @@ func (this *configureComp) getActiveRewardById(lv int32) (result *cfg.GameArenaA
|
|||||||
if v, err = this.GetConfigure(game_qualifying); err != nil {
|
if v, err = this.GetConfigure(game_qualifying); err != nil {
|
||||||
this.module.Errorln(err)
|
this.module.Errorln(err)
|
||||||
} else {
|
} else {
|
||||||
if result, ok = v.(*cfg.GameArenaActiveReward).GetDataMap()[lv]; !ok {
|
if result, ok = v.(*cfg.GameQualifying).GetDataMap()[lv]; !ok {
|
||||||
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_qualifying, lv)
|
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_qualifying, lv)
|
||||||
this.module.Errorln(err)
|
this.module.Errorln(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
//查询比赛奖励
|
|
||||||
func (this *configureComp) getRankReward() (result *cfg.GameArenaRankReward, err error) {
|
|
||||||
var (
|
|
||||||
v interface{}
|
|
||||||
)
|
|
||||||
if v, err = this.GetConfigure(game_arenarankreward); err != nil {
|
|
||||||
this.module.Errorln(err)
|
|
||||||
} else {
|
|
||||||
result = v.(*cfg.GameArenaRankReward)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
@ -45,6 +45,9 @@ func (this *ModelCaptureSheep) queryInfo(uid string) (results *pb.DBCaptureSheep
|
|||||||
results = &pb.DBCaptureSheep{
|
results = &pb.DBCaptureSheep{
|
||||||
Uid: uid,
|
Uid: uid,
|
||||||
}
|
}
|
||||||
|
if results.Dan, err = this.computedan(results.Integral); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
err = this.Add(uid, results)
|
err = this.Add(uid, results)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
@ -116,27 +119,6 @@ func (this *ModelCaptureSheep) matcheAI(dan, num int32) (results []*pb.CaptureSh
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *ModelCaptureSheep) modifyIntegral(uid string, integral int32) (err error) {
|
|
||||||
var (
|
|
||||||
dan int32
|
|
||||||
player *pb.ArenaPlayer
|
|
||||||
)
|
|
||||||
if dan, err = this.computedan(integral); err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
player = &pb.ArenaPlayer{Uid: uid, Integral: integral}
|
|
||||||
if err = this.module.modelRank.updateArenaRank(player); err != nil {
|
|
||||||
this.module.Errorln(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
this.Change(uid, map[string]interface{}{
|
|
||||||
"integral": integral,
|
|
||||||
"dan": dan,
|
|
||||||
"rank": player.Rank,
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *ModelCaptureSheep) computedan(integral int32) (dan int32, err error) {
|
func (this *ModelCaptureSheep) computedan(integral int32) (dan int32, err error) {
|
||||||
var (
|
var (
|
||||||
active *cfg.GameQualifyingData
|
active *cfg.GameQualifyingData
|
||||||
@ -149,31 +131,3 @@ func (this *ModelCaptureSheep) computedan(integral int32) (dan int32, err error)
|
|||||||
dan = active.LvId
|
dan = active.LvId
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 积分计算
|
|
||||||
func (this *ModelCaptureSheep) integralCompute(red, bule *pb.CaptureSheepRaceMember, iswin bool) {
|
|
||||||
var (
|
|
||||||
redactive *cfg.GameArenaActiveRewardData
|
|
||||||
buleactive *cfg.GameArenaActiveRewardData
|
|
||||||
err error
|
|
||||||
)
|
|
||||||
if redactive, err = this.module.configure.getActiveRewardById(red.Dan); err != nil {
|
|
||||||
this.module.Errorln(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if buleactive, err = this.module.configure.getActiveRewardById(bule.Dan); err != nil {
|
|
||||||
this.module.Errorln(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if iswin {
|
|
||||||
red.Changeintegral = int32(redactive.KValue * float32(1-1/float32(1+10^(bule.Integral-red.Integral)/400)))
|
|
||||||
red.Integral = red.Integral + red.Changeintegral
|
|
||||||
bule.Changeintegral = int32(buleactive.KValue * float32(0-1/float32(1+10^(red.Integral-bule.Integral)/400)))
|
|
||||||
bule.Integral = bule.Integral + bule.Changeintegral
|
|
||||||
} else {
|
|
||||||
red.Changeintegral = int32(redactive.KValue * float32(0-1/float32(1+10^(bule.Integral-red.Integral)/400)))
|
|
||||||
red.Integral = red.Integral + red.Changeintegral
|
|
||||||
bule.Changeintegral = int32(redactive.KValue * float32(1-1/float32(1+10^(red.Integral-bule.Integral)/400)))
|
|
||||||
bule.Integral = bule.Integral + bule.Changeintegral
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -1,125 +0,0 @@
|
|||||||
package capturesheep
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"go_dreamfactory/comm"
|
|
||||||
"go_dreamfactory/lego/core"
|
|
||||||
"go_dreamfactory/lego/sys/redis/pipe"
|
|
||||||
"go_dreamfactory/modules"
|
|
||||||
"go_dreamfactory/pb"
|
|
||||||
"go_dreamfactory/sys/configure"
|
|
||||||
cfg "go_dreamfactory/sys/configure/structs"
|
|
||||||
|
|
||||||
"github.com/go-redis/redis/v8"
|
|
||||||
)
|
|
||||||
|
|
||||||
// /竞技场 数据组件
|
|
||||||
type modelRank struct {
|
|
||||||
modules.MCompModel
|
|
||||||
module *CaptureSheep
|
|
||||||
}
|
|
||||||
|
|
||||||
// 组件初始化接口
|
|
||||||
func (this *modelRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) {
|
|
||||||
this.TableName = comm.TableCapturesheepRank
|
|
||||||
this.MCompModel.Init(service, module, comp, opt)
|
|
||||||
this.module = module.(*CaptureSheep)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 更新排名
|
|
||||||
func (this *modelRank) updateArenaRank(users ...*pb.ArenaPlayer) (err error) {
|
|
||||||
var (
|
|
||||||
pipe *pipe.RedisPipe = this.DBModel.Redis.RedisPipe(context.TODO())
|
|
||||||
menbers []*redis.Z
|
|
||||||
cmd *redis.IntCmd
|
|
||||||
menbersCmd []*redis.IntCmd = make([]*redis.IntCmd, len(users))
|
|
||||||
rank int64
|
|
||||||
)
|
|
||||||
menbers = make([]*redis.Z, len(users))
|
|
||||||
for i, v := range users {
|
|
||||||
menbers[i] = &redis.Z{Score: float64(v.Integral), Member: v.Uid}
|
|
||||||
}
|
|
||||||
if cmd = pipe.ZAdd(this.TableName, menbers...); err != nil {
|
|
||||||
this.module.Errorln(err)
|
|
||||||
}
|
|
||||||
for i, v := range users {
|
|
||||||
menbersCmd[i] = pipe.ZRevRank(this.TableName, v.Uid)
|
|
||||||
}
|
|
||||||
if _, err = pipe.Exec(); err != nil {
|
|
||||||
this.module.Errorln(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if _, err = cmd.Result(); err != nil {
|
|
||||||
this.module.Errorln(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for i, v := range menbersCmd {
|
|
||||||
if rank, err = v.Result(); err != nil {
|
|
||||||
this.module.Errorln(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
users[i].Rank = int32(rank + 1)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取排行榜前50的用户名单
|
|
||||||
func (this *modelRank) queryRankUser() (ranks []string, err error) {
|
|
||||||
var (
|
|
||||||
result []string
|
|
||||||
)
|
|
||||||
if result, err = this.DBModel.Redis.ZRevRange(this.TableName, 0, 50).Result(); err != nil {
|
|
||||||
this.module.Errorln(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
ranks = make([]string, 0)
|
|
||||||
for i := 0; i < len(result); i += 1 {
|
|
||||||
ranks = append(ranks, result[i])
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 比赛结算
|
|
||||||
func (this *modelRank) raceSettlement() {
|
|
||||||
var (
|
|
||||||
reward *cfg.GameArenaRankReward
|
|
||||||
result []string
|
|
||||||
uids []string
|
|
||||||
Items []*pb.UserAssets
|
|
||||||
err error
|
|
||||||
)
|
|
||||||
if reward, err = this.module.configure.getRankReward(); err != nil {
|
|
||||||
this.module.Errorln(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, v := range reward.GetDataList() {
|
|
||||||
if result, err = this.DBModel.Redis.ZRevRange(this.TableName, int64(v.RankLow-1), int64(v.RankUp)).Result(); err != nil {
|
|
||||||
this.module.Errorln(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
this.module.Debugf("uid:%v", uids)
|
|
||||||
|
|
||||||
Items = make([]*pb.UserAssets, len(v.RankReward))
|
|
||||||
for i, v := range v.RankReward {
|
|
||||||
Items[i] = &pb.UserAssets{
|
|
||||||
A: v.A,
|
|
||||||
T: v.T,
|
|
||||||
N: v.N,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for i := 0; i < len(result); i += 2 {
|
|
||||||
// uids = append(uids, result[i])
|
|
||||||
//发邮件
|
|
||||||
this.module.mail.SendNewMail(&pb.DBMailData{
|
|
||||||
Cid: "ArenaRankingReward",
|
|
||||||
Param: []string{fmt.Sprintf("%d", v.RankLow+int32(i))},
|
|
||||||
CreateTime: uint64(configure.Now().Unix()),
|
|
||||||
Items: Items,
|
|
||||||
}, result[i])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -20,7 +20,6 @@ type CaptureSheep struct {
|
|||||||
api *apiComp
|
api *apiComp
|
||||||
configure *configureComp
|
configure *configureComp
|
||||||
modelCaptureSheep *ModelCaptureSheep
|
modelCaptureSheep *ModelCaptureSheep
|
||||||
modelRank *modelRank
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewModule() core.IModule {
|
func NewModule() core.IModule {
|
||||||
@ -55,7 +54,6 @@ func (this *CaptureSheep) OnInstallComp() {
|
|||||||
this.ModuleBase.OnInstallComp()
|
this.ModuleBase.OnInstallComp()
|
||||||
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
|
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
|
||||||
this.modelCaptureSheep = this.RegisterComp(new(ModelCaptureSheep)).(*ModelCaptureSheep)
|
this.modelCaptureSheep = this.RegisterComp(new(ModelCaptureSheep)).(*ModelCaptureSheep)
|
||||||
this.modelRank = this.RegisterComp(new(modelRank)).(*modelRank)
|
|
||||||
this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
|
this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -79,9 +79,8 @@ type DBCaptureSheep struct {
|
|||||||
Skin string `protobuf:"bytes,5,opt,name=skin,proto3" json:"skin"` //时装
|
Skin string `protobuf:"bytes,5,opt,name=skin,proto3" json:"skin"` //时装
|
||||||
Dan int32 `protobuf:"varint,6,opt,name=dan,proto3" json:"dan"` //段位
|
Dan int32 `protobuf:"varint,6,opt,name=dan,proto3" json:"dan"` //段位
|
||||||
Integral int32 `protobuf:"varint,7,opt,name=integral,proto3" json:"integral"` //当前积分
|
Integral int32 `protobuf:"varint,7,opt,name=integral,proto3" json:"integral"` //当前积分
|
||||||
Rank int32 `protobuf:"varint,8,opt,name=rank,proto3" json:"rank"` //排名
|
Defmts string `protobuf:"bytes,8,opt,name=defmts,proto3" json:"defmts"` //默认坐骑
|
||||||
Defmts string `protobuf:"bytes,9,opt,name=defmts,proto3" json:"defmts"` //默认坐骑
|
Loc []float64 `protobuf:"fixed64,9,rep,packed,name=loc,proto3" json:"loc"` //地图索引 匹配系统使用
|
||||||
Loc []float64 `protobuf:"fixed64,13,rep,packed,name=loc,proto3" json:"loc"` //地图索引 匹配系统使用
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *DBCaptureSheep) Reset() {
|
func (x *DBCaptureSheep) Reset() {
|
||||||
@ -165,13 +164,6 @@ func (x *DBCaptureSheep) GetIntegral() int32 {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *DBCaptureSheep) GetRank() int32 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Rank
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *DBCaptureSheep) GetDefmts() string {
|
func (x *DBCaptureSheep) GetDefmts() string {
|
||||||
if x != nil {
|
if x != nil {
|
||||||
return x.Defmts
|
return x.Defmts
|
||||||
@ -203,6 +195,8 @@ type CaptureSheepRaceMember struct {
|
|||||||
Maxhp int32 `protobuf:"varint,10,opt,name=maxhp,proto3" json:"maxhp"` //初始血量
|
Maxhp int32 `protobuf:"varint,10,opt,name=maxhp,proto3" json:"maxhp"` //初始血量
|
||||||
Currhp int32 `protobuf:"varint,11,opt,name=currhp,proto3" json:"currhp"` //当前血量
|
Currhp int32 `protobuf:"varint,11,opt,name=currhp,proto3" json:"currhp"` //当前血量
|
||||||
Scores int32 `protobuf:"varint,12,opt,name=scores,proto3" json:"scores"` //当前分数
|
Scores int32 `protobuf:"varint,12,opt,name=scores,proto3" json:"scores"` //当前分数
|
||||||
|
Showscores int32 `protobuf:"varint,13,opt,name=showscores,proto3" json:"showscores"` //表现分数
|
||||||
|
Dodge int32 `protobuf:"varint,14,opt,name=dodge,proto3" json:"dodge"` //闪避次数
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *CaptureSheepRaceMember) Reset() {
|
func (x *CaptureSheepRaceMember) Reset() {
|
||||||
@ -321,6 +315,20 @@ func (x *CaptureSheepRaceMember) GetScores() int32 {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *CaptureSheepRaceMember) GetShowscores() int32 {
|
||||||
|
if x != nil {
|
||||||
|
return x.Showscores
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *CaptureSheepRaceMember) GetDodge() int32 {
|
||||||
|
if x != nil {
|
||||||
|
return x.Dodge
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
//捕养比赛
|
//捕养比赛
|
||||||
type DBCaptureSheepRace struct {
|
type DBCaptureSheepRace struct {
|
||||||
state protoimpl.MessageState
|
state protoimpl.MessageState
|
||||||
@ -406,7 +414,7 @@ var File_capturesheep_capturesheep_db_proto protoreflect.FileDescriptor
|
|||||||
var file_capturesheep_capturesheep_db_proto_rawDesc = []byte{
|
var file_capturesheep_capturesheep_db_proto_rawDesc = []byte{
|
||||||
0x0a, 0x22, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x2f, 0x63,
|
0x0a, 0x22, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x2f, 0x63,
|
||||||
0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x5f, 0x64, 0x62, 0x2e, 0x70,
|
0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x5f, 0x64, 0x62, 0x2e, 0x70,
|
||||||
0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd8, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75,
|
0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc4, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75,
|
||||||
0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
|
0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 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,
|
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, 0x0e, 0x0a,
|
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a,
|
||||||
@ -416,47 +424,49 @@ var file_capturesheep_capturesheep_db_proto_rawDesc = []byte{
|
|||||||
0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05,
|
0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05,
|
||||||
0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
||||||
0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
||||||
0x6c, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52,
|
0x6c, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28,
|
||||||
0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x18,
|
0x09, 0x52, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x63,
|
||||||
0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x12, 0x10, 0x0a,
|
0x18, 0x09, 0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x22, 0xe0, 0x02, 0x0a, 0x16,
|
||||||
0x03, 0x6c, 0x6f, 0x63, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x22,
|
|
||||||
0xaa, 0x02, 0x0a, 0x16, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70,
|
|
||||||
0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 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, 0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
|
|
||||||
0x73, 0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28,
|
|
||||||
0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x05, 0x20,
|
|
||||||
0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65,
|
|
||||||
0x67, 0x72, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65,
|
|
||||||
0x67, 0x72, 0x61, 0x6c, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e,
|
|
||||||
0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63, 0x68,
|
|
||||||
0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x12, 0x0a, 0x04,
|
|
||||||
0x69, 0x73, 0x61, 0x69, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69,
|
|
||||||
0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52,
|
|
||||||
0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x18,
|
|
||||||
0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06,
|
|
||||||
0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x75,
|
|
||||||
0x72, 0x72, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x0c,
|
|
||||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x22, 0xdb, 0x01, 0x0a,
|
|
||||||
0x12, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52,
|
|
||||||
0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
|
||||||
0x02, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01,
|
|
||||||
0x28, 0x0e, 0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65,
|
|
||||||
0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65,
|
|
||||||
0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28,
|
|
||||||
0x05, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x09, 0x72, 0x65,
|
|
||||||
0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e,
|
|
||||||
0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65,
|
0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65,
|
||||||
0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65,
|
0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||||
0x72, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18,
|
0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
|
||||||
0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53,
|
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04,
|
||||||
0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x0a,
|
0x73, 0x6b, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6b, 0x69, 0x6e,
|
||||||
0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x2a, 0x2d, 0x0a, 0x14, 0x43, 0x61,
|
0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73,
|
||||||
0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79,
|
0x65, 0x78, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||||
0x70, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x0a, 0x0a,
|
0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
|
||||||
0x06, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x64, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
|
0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
|
||||||
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
|
||||||
|
0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
|
||||||
|
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69,
|
||||||
|
0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05,
|
||||||
|
0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75,
|
||||||
|
0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x18, 0x0a, 0x20, 0x01, 0x28,
|
||||||
|
0x05, 0x52, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x72,
|
||||||
|
0x68, 0x70, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70,
|
||||||
|
0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05,
|
||||||
|
0x52, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68, 0x6f, 0x77,
|
||||||
|
0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x68,
|
||||||
|
0x6f, 0x77, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x6f, 0x64, 0x67,
|
||||||
|
0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x6f, 0x64, 0x67, 0x65, 0x22, 0xdb,
|
||||||
|
0x01, 0x0a, 0x12, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65,
|
||||||
|
0x70, 0x52, 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||||
|
0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03,
|
||||||
|
0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68,
|
||||||
|
0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79,
|
||||||
|
0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x04, 0x20,
|
||||||
|
0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x09,
|
||||||
|
0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||||
|
0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61,
|
||||||
|
0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d,
|
||||||
|
0x62, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65,
|
||||||
|
0x72, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72,
|
||||||
|
0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72,
|
||||||
|
0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x2a, 0x2d, 0x0a, 0x14,
|
||||||
|
0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65,
|
||||||
|
0x54, 0x79, 0x70, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x10, 0x00, 0x12,
|
||||||
|
0x0a, 0x0a, 0x06, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x64, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e,
|
||||||
|
0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -454,6 +454,11 @@ type CapturesheepOverResp struct {
|
|||||||
state protoimpl.MessageState
|
state protoimpl.MessageState
|
||||||
sizeCache protoimpl.SizeCache
|
sizeCache protoimpl.SizeCache
|
||||||
unknownFields protoimpl.UnknownFields
|
unknownFields protoimpl.UnknownFields
|
||||||
|
|
||||||
|
Iswin bool `protobuf:"varint,1,opt,name=iswin,proto3" json:"iswin"`
|
||||||
|
Dan int32 `protobuf:"varint,2,opt,name=dan,proto3" json:"dan"` //段位
|
||||||
|
Integral int32 `protobuf:"varint,4,opt,name=integral,proto3" json:"integral"` //当前积分
|
||||||
|
Award []*UserAtno `protobuf:"bytes,5,rep,name=award,proto3" json:"award"` //奖励
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *CapturesheepOverResp) Reset() {
|
func (x *CapturesheepOverResp) Reset() {
|
||||||
@ -488,6 +493,34 @@ func (*CapturesheepOverResp) Descriptor() ([]byte, []int) {
|
|||||||
return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{9}
|
return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{9}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *CapturesheepOverResp) GetIswin() bool {
|
||||||
|
if x != nil {
|
||||||
|
return x.Iswin
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *CapturesheepOverResp) GetDan() int32 {
|
||||||
|
if x != nil {
|
||||||
|
return x.Dan
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *CapturesheepOverResp) GetIntegral() int32 {
|
||||||
|
if x != nil {
|
||||||
|
return x.Integral
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *CapturesheepOverResp) GetAward() []*UserAtno {
|
||||||
|
if x != nil {
|
||||||
|
return x.Award
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
var File_capturesheep_capturesheep_msg_proto protoreflect.FileDescriptor
|
var File_capturesheep_capturesheep_msg_proto protoreflect.FileDescriptor
|
||||||
|
|
||||||
var file_capturesheep_capturesheep_msg_proto_rawDesc = []byte{
|
var file_capturesheep_capturesheep_msg_proto_rawDesc = []byte{
|
||||||
@ -495,41 +528,48 @@ var file_capturesheep_capturesheep_msg_proto_rawDesc = []byte{
|
|||||||
0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x5f, 0x6d, 0x73, 0x67, 0x2e,
|
0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x5f, 0x6d, 0x73, 0x67, 0x2e,
|
||||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68,
|
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68,
|
||||||
0x65, 0x65, 0x70, 0x2f, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70,
|
0x65, 0x65, 0x70, 0x2f, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70,
|
||||||
0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x61, 0x70,
|
0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e,
|
||||||
0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71,
|
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65,
|
||||||
0x22, 0x3b, 0x0a, 0x14, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70,
|
0x73, 0x68, 0x65, 0x65, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3b, 0x0a, 0x14,
|
||||||
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
|
0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x49, 0x6e, 0x66, 0x6f,
|
||||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75,
|
0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01,
|
||||||
0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2c, 0x0a,
|
0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68,
|
||||||
0x18, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x43, 0x68, 0x61,
|
0x65, 0x65, 0x70, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2c, 0x0a, 0x18, 0x43, 0x61, 0x70,
|
||||||
0x6e, 0x67, 0x65, 0x4d, 0x74, 0x73, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64,
|
0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4d,
|
||||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x2d, 0x0a, 0x19, 0x43,
|
0x74, 0x73, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||||
0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67,
|
0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x2d, 0x0a, 0x19, 0x43, 0x61, 0x70, 0x74, 0x75,
|
||||||
0x65, 0x4d, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18,
|
0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x74, 0x73,
|
||||||
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x5e, 0x0a, 0x15, 0x43, 0x61,
|
0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||||
0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
|
0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x5e, 0x0a, 0x15, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72,
|
||||||
0x52, 0x65, 0x71, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
|
0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65, 0x71, 0x12,
|
||||||
0x28, 0x0e, 0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65,
|
0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15,
|
||||||
0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65,
|
0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63,
|
||||||
0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
|
0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07,
|
||||||
0x05, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x22, 0x61, 0x0a, 0x16, 0x43, 0x61,
|
0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74,
|
||||||
0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
|
0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x22, 0x61, 0x0a, 0x16, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72,
|
||||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x74, 0x69,
|
0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65, 0x73, 0x70,
|
||||||
0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
|
0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01,
|
||||||
0x74, 0x69, 0x6d, 0x65, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01,
|
0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x74, 0x69, 0x6d, 0x65,
|
||||||
0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68,
|
0x12, 0x27, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13,
|
||||||
0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x28, 0x0a,
|
0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52,
|
||||||
0x16, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x55, 0x73, 0x65,
|
0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x28, 0x0a, 0x16, 0x43, 0x61, 0x70,
|
||||||
0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
|
0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d,
|
||||||
0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x43, 0x61, 0x70, 0x74, 0x75,
|
0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||||
0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65,
|
0x02, 0x69, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68,
|
||||||
0x73, 0x70, 0x22, 0x3e, 0x0a, 0x13, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65,
|
0x65, 0x65, 0x70, 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3e,
|
||||||
0x65, 0x70, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x61, 0x63,
|
0x0a, 0x13, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4f, 0x76,
|
||||||
0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74,
|
0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20,
|
||||||
0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61,
|
0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53,
|
||||||
0x63, 0x65, 0x22, 0x16, 0x0a, 0x14, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65,
|
0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x7b,
|
||||||
0x65, 0x70, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
|
0x0a, 0x14, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4f, 0x76,
|
||||||
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18,
|
||||||
|
0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03,
|
||||||
|
0x64, 0x61, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a,
|
||||||
|
0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
|
||||||
|
0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77,
|
||||||
|
0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
|
||||||
|
0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e,
|
||||||
|
0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -559,17 +599,19 @@ var file_capturesheep_capturesheep_msg_proto_goTypes = []interface{}{
|
|||||||
(*DBCaptureSheep)(nil), // 10: DBCaptureSheep
|
(*DBCaptureSheep)(nil), // 10: DBCaptureSheep
|
||||||
(CaptureSheepRaceType)(0), // 11: CaptureSheepRaceType
|
(CaptureSheepRaceType)(0), // 11: CaptureSheepRaceType
|
||||||
(*DBCaptureSheepRace)(nil), // 12: DBCaptureSheepRace
|
(*DBCaptureSheepRace)(nil), // 12: DBCaptureSheepRace
|
||||||
|
(*UserAtno)(nil), // 13: UserAtno
|
||||||
}
|
}
|
||||||
var file_capturesheep_capturesheep_msg_proto_depIdxs = []int32{
|
var file_capturesheep_capturesheep_msg_proto_depIdxs = []int32{
|
||||||
10, // 0: CapturesheepInfoResp.info:type_name -> DBCaptureSheep
|
10, // 0: CapturesheepInfoResp.info:type_name -> DBCaptureSheep
|
||||||
11, // 1: CapturesheepMatcheReq.rtype:type_name -> CaptureSheepRaceType
|
11, // 1: CapturesheepMatcheReq.rtype:type_name -> CaptureSheepRaceType
|
||||||
12, // 2: CapturesheepMatcheResp.race:type_name -> DBCaptureSheepRace
|
12, // 2: CapturesheepMatcheResp.race:type_name -> DBCaptureSheepRace
|
||||||
12, // 3: CapturesheepOverReq.race:type_name -> DBCaptureSheepRace
|
12, // 3: CapturesheepOverReq.race:type_name -> DBCaptureSheepRace
|
||||||
4, // [4:4] is the sub-list for method output_type
|
13, // 4: CapturesheepOverResp.award:type_name -> UserAtno
|
||||||
4, // [4:4] is the sub-list for method input_type
|
5, // [5:5] is the sub-list for method output_type
|
||||||
4, // [4:4] is the sub-list for extension type_name
|
5, // [5:5] is the sub-list for method input_type
|
||||||
4, // [4:4] is the sub-list for extension extendee
|
5, // [5:5] is the sub-list for extension type_name
|
||||||
0, // [0:4] is the sub-list for field type_name
|
5, // [5:5] is the sub-list for extension extendee
|
||||||
|
0, // [0:5] is the sub-list for field type_name
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() { file_capturesheep_capturesheep_msg_proto_init() }
|
func init() { file_capturesheep_capturesheep_msg_proto_init() }
|
||||||
@ -578,6 +620,7 @@ func file_capturesheep_capturesheep_msg_proto_init() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
file_capturesheep_capturesheep_db_proto_init()
|
file_capturesheep_capturesheep_db_proto_init()
|
||||||
|
file_comm_proto_init()
|
||||||
if !protoimpl.UnsafeEnabled {
|
if !protoimpl.UnsafeEnabled {
|
||||||
file_capturesheep_capturesheep_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
|
file_capturesheep_capturesheep_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
|
||||||
switch v := v.(*CapturesheepInfoReq); i {
|
switch v := v.(*CapturesheepInfoReq); i {
|
||||||
|
@ -443,6 +443,8 @@ const (
|
|||||||
ErrorCode_ActivityNotIntime ErrorCode = 5004 // 不在活动时间范围
|
ErrorCode_ActivityNotIntime ErrorCode = 5004 // 不在活动时间范围
|
||||||
ErrorCode_ActivityInvalid ErrorCode = 5005 // 不存在的活动
|
ErrorCode_ActivityInvalid ErrorCode = 5005 // 不存在的活动
|
||||||
ErrorCode_ActivityCantReward ErrorCode = 5006 // 还不能领奖
|
ErrorCode_ActivityCantReward ErrorCode = 5006 // 还不能领奖
|
||||||
|
//捕羊大赛的
|
||||||
|
ErrorCode_CapturesheepRankCloseed ErrorCode = 5101 //排位比赛不在开启时间内
|
||||||
)
|
)
|
||||||
|
|
||||||
// Enum value maps for ErrorCode.
|
// Enum value maps for ErrorCode.
|
||||||
@ -825,6 +827,7 @@ var (
|
|||||||
5004: "ActivityNotIntime",
|
5004: "ActivityNotIntime",
|
||||||
5005: "ActivityInvalid",
|
5005: "ActivityInvalid",
|
||||||
5006: "ActivityCantReward",
|
5006: "ActivityCantReward",
|
||||||
|
5101: "CapturesheepRankCloseed",
|
||||||
}
|
}
|
||||||
ErrorCode_value = map[string]int32{
|
ErrorCode_value = map[string]int32{
|
||||||
"Success": 0,
|
"Success": 0,
|
||||||
@ -1204,6 +1207,7 @@ var (
|
|||||||
"ActivityNotIntime": 5004,
|
"ActivityNotIntime": 5004,
|
||||||
"ActivityInvalid": 5005,
|
"ActivityInvalid": 5005,
|
||||||
"ActivityCantReward": 5006,
|
"ActivityCantReward": 5006,
|
||||||
|
"CapturesheepRankCloseed": 5101,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -1238,7 +1242,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
|
|||||||
|
|
||||||
var file_errorcode_proto_rawDesc = []byte{
|
var file_errorcode_proto_rawDesc = []byte{
|
||||||
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
|
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
|
||||||
0x6f, 0x2a, 0xf3, 0x45, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
|
0x6f, 0x2a, 0x91, 0x46, 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, 0x14, 0x0a, 0x10,
|
0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
|
||||||
0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
|
0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
|
||||||
0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
|
0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
|
||||||
@ -1797,8 +1801,10 @@ var file_errorcode_proto_rawDesc = []byte{
|
|||||||
0x6e, 0x74, 0x69, 0x6d, 0x65, 0x10, 0x8c, 0x27, 0x12, 0x14, 0x0a, 0x0f, 0x41, 0x63, 0x74, 0x69,
|
0x6e, 0x74, 0x69, 0x6d, 0x65, 0x10, 0x8c, 0x27, 0x12, 0x14, 0x0a, 0x0f, 0x41, 0x63, 0x74, 0x69,
|
||||||
0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x8d, 0x27, 0x12, 0x17,
|
0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x8d, 0x27, 0x12, 0x17,
|
||||||
0x0a, 0x12, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x43, 0x61, 0x6e, 0x74, 0x52, 0x65,
|
0x0a, 0x12, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x43, 0x61, 0x6e, 0x74, 0x52, 0x65,
|
||||||
0x77, 0x61, 0x72, 0x64, 0x10, 0x8e, 0x27, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
|
0x77, 0x61, 0x72, 0x64, 0x10, 0x8e, 0x27, 0x12, 0x1c, 0x0a, 0x17, 0x43, 0x61, 0x70, 0x74, 0x75,
|
||||||
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6c, 0x6f, 0x73, 0x65,
|
||||||
|
0x65, 0x64, 0x10, 0xed, 0x27, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
|
||||||
|
0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
Loading…
Reference in New Issue
Block a user