Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
194aa30ccd
@ -34,7 +34,7 @@
|
||||
"main": [
|
||||
{
|
||||
"key": "platlv",
|
||||
"param": 1
|
||||
"param": 5
|
||||
},
|
||||
{
|
||||
"key": "maxmapid",
|
||||
@ -224,7 +224,7 @@
|
||||
}
|
||||
],
|
||||
"optional": "",
|
||||
"wkqbx": 1,
|
||||
"wkqbx": 2,
|
||||
"kqbx": 0,
|
||||
"img": "zc_icon_01",
|
||||
"prompt": {
|
||||
@ -1126,7 +1126,7 @@
|
||||
"main": [
|
||||
{
|
||||
"key": "platlv",
|
||||
"param": 2
|
||||
"param": 20
|
||||
},
|
||||
{
|
||||
"key": "maxmapid",
|
||||
@ -1204,7 +1204,7 @@
|
||||
"main": [
|
||||
{
|
||||
"key": "platlv",
|
||||
"param": 1
|
||||
"param": 10
|
||||
},
|
||||
{
|
||||
"key": "maxmapid",
|
||||
@ -1212,7 +1212,7 @@
|
||||
}
|
||||
],
|
||||
"optional": "",
|
||||
"wkqbx": 1,
|
||||
"wkqbx": 2,
|
||||
"kqbx": 0,
|
||||
"img": "zc_icon_01",
|
||||
"prompt": {
|
||||
@ -1400,7 +1400,7 @@
|
||||
"main": [
|
||||
{
|
||||
"key": "platlv",
|
||||
"param": 1
|
||||
"param": 5
|
||||
},
|
||||
{
|
||||
"key": "maxmapid",
|
||||
@ -1582,7 +1582,7 @@
|
||||
"main": [
|
||||
{
|
||||
"key": "worldtaskid",
|
||||
"param": 20010
|
||||
"param": 20060
|
||||
}
|
||||
],
|
||||
"optional": "",
|
||||
@ -1604,7 +1604,7 @@
|
||||
"main": [
|
||||
{
|
||||
"key": "worldtaskid",
|
||||
"param": 20010
|
||||
"param": 20060
|
||||
}
|
||||
],
|
||||
"optional": "",
|
||||
@ -1626,7 +1626,7 @@
|
||||
"main": [
|
||||
{
|
||||
"key": "worldtaskid",
|
||||
"param": 20010
|
||||
"param": 20060
|
||||
}
|
||||
],
|
||||
"optional": "",
|
||||
|
||||
@ -10,6 +10,7 @@ import (
|
||||
"go_dreamfactory/modules/hero"
|
||||
"go_dreamfactory/modules/sociaty"
|
||||
"go_dreamfactory/pb"
|
||||
"time"
|
||||
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/container"
|
||||
@ -25,13 +26,24 @@ type SociatyBossView struct {
|
||||
itemList common.ItemList
|
||||
heroListFlag bool
|
||||
teamFlag bool
|
||||
bossFlag bool
|
||||
heroList func()
|
||||
sociatyId string
|
||||
teams map[int32]*pb.ChallengeTeam
|
||||
endTimeLabel *widget.Label // 赛季结束时间
|
||||
settleTimeLabel *widget.Label // 赛季结算时间
|
||||
sociatyRankingLabel *widget.Label // 公会排名
|
||||
personRankingLabel *widget.Label // 个人排名
|
||||
ticketLabel *widget.Label //挑战券
|
||||
}
|
||||
|
||||
func (s *SociatyBossView) CreateView(t *model.TestCase) fyne.CanvasObject {
|
||||
s.teams = make(map[int32]*pb.ChallengeTeam)
|
||||
s.endTimeLabel = widget.NewLabel("")
|
||||
s.settleTimeLabel = widget.NewLabel("")
|
||||
s.sociatyRankingLabel = widget.NewLabel("")
|
||||
s.personRankingLabel = widget.NewLabel("")
|
||||
s.ticketLabel = widget.NewLabel("")
|
||||
|
||||
loadSociaty := func() {
|
||||
if err := service.GetPttService().SendToClient(
|
||||
@ -45,14 +57,30 @@ func (s *SociatyBossView) CreateView(t *model.TestCase) fyne.CanvasObject {
|
||||
}
|
||||
defer loadSociaty()
|
||||
|
||||
loadSociatyBoss := func() {
|
||||
if err := service.GetPttService().SendToClient(
|
||||
t.MainType,
|
||||
sociaty.SociatySubTypeBossmain,
|
||||
&pb.SociatyBMainReq{},
|
||||
); err != nil {
|
||||
logrus.Error(err)
|
||||
return
|
||||
}
|
||||
}
|
||||
defer loadSociatyBoss()
|
||||
|
||||
buzhenBtn := widget.NewButton("布阵", s.buzhen)
|
||||
challengestartBtn := widget.NewButton("开始挑战", s.challengestart)
|
||||
challengefinishBtn := widget.NewButton("挑战结束", s.challengefinish)
|
||||
ticketBuyBtn := widget.NewButton("挑战券", s.buy)
|
||||
btns := container.NewHBox(buzhenBtn, challengestartBtn, challengefinishBtn, ticketBuyBtn)
|
||||
c := container.NewBorder(btns, nil, nil, nil)
|
||||
bottomLabels := container.NewHBox(
|
||||
s.ticketLabel, s.settleTimeLabel, s.endTimeLabel,
|
||||
)
|
||||
c := container.NewBorder(btns, bottomLabels, nil, nil)
|
||||
|
||||
s.listenTeams()
|
||||
s.listenBossmain()
|
||||
return c
|
||||
}
|
||||
|
||||
@ -77,7 +105,7 @@ func (s *SociatyBossView) listenTeams() {
|
||||
|
||||
if rsp.Sociaty != nil {
|
||||
s.sociatyId = rsp.Sociaty.Id
|
||||
s.teams = rsp.Teams
|
||||
// s.teams = rsp.Teams
|
||||
}
|
||||
|
||||
},
|
||||
@ -85,6 +113,44 @@ func (s *SociatyBossView) listenTeams() {
|
||||
s.teamFlag = true
|
||||
}
|
||||
|
||||
func (s *SociatyBossView) listenBossmain() {
|
||||
if s.bossFlag {
|
||||
return
|
||||
}
|
||||
|
||||
s.obs.AddListener(observer.EVENT_REQ_RSP, observer.Listener{
|
||||
OnNotify: func(d interface{}, args ...interface{}) {
|
||||
data := d.(*pb.UserMessage)
|
||||
if !(data.MainType == string(comm.ModuleSociaty) &&
|
||||
data.SubType == sociaty.SociatySubTypeBossmain) {
|
||||
return
|
||||
}
|
||||
rsp := &pb.SociatyBMainResp{}
|
||||
|
||||
if !comm.ProtoUnmarshal(data, rsp) {
|
||||
logrus.Error("unmarshal err")
|
||||
return
|
||||
}
|
||||
|
||||
s.teams = rsp.Teams
|
||||
s.endTimeLabel.SetText(
|
||||
fmt.Sprintf("结束:%s", time.Unix(int64(rsp.EndTime), 0).Format("01-02 15:04:05")),
|
||||
)
|
||||
s.endTimeLabel.Refresh()
|
||||
s.settleTimeLabel.SetText(
|
||||
fmt.Sprintf("结算:%s", time.Unix(int64(rsp.SettlementTime), 0).Format("01-02 15:04:05")),
|
||||
)
|
||||
s.settleTimeLabel.Refresh()
|
||||
|
||||
s.ticketLabel.SetText(
|
||||
fmt.Sprintf("挑战券:%d", rsp.Ticket),
|
||||
)
|
||||
s.ticketLabel.Refresh()
|
||||
},
|
||||
})
|
||||
s.bossFlag = true
|
||||
}
|
||||
|
||||
// 挑战开始
|
||||
func (s *SociatyBossView) challengestart() {
|
||||
if err := service.GetPttService().SendToClient(
|
||||
@ -107,8 +173,8 @@ func (s *SociatyBossView) challengefinish() {
|
||||
&pb.SociatyBChallengeFinishReq{
|
||||
Ptype: pb.PlayType_sociaty,
|
||||
Report: &pb.BattleReport{
|
||||
Costtime: 180,
|
||||
Harm: 180300,
|
||||
Costtime: 180, //游戏耗时
|
||||
Harm: 180300, //伤害值
|
||||
},
|
||||
},
|
||||
); err != nil {
|
||||
|
||||
@ -304,7 +304,7 @@ func (this *SociatyMineView) dataListener(item *entryItem) {
|
||||
|
||||
this.sociaty = rsp.Sociaty
|
||||
this.master = rsp.Master
|
||||
this.ticket = rsp.Ticket
|
||||
// this.ticket = rsp.Ticket
|
||||
|
||||
//设置成员职位
|
||||
for _, m := range rsp.Sociaty.Members {
|
||||
|
||||
@ -34,6 +34,7 @@ const (
|
||||
SociatySubTypeLog = "log"
|
||||
SociatySubTypeAgreePush = "agree"
|
||||
SociatySubTypeRecord = "record"
|
||||
SociatySubTypeBossmain = "bossmain"
|
||||
SociatySubTypeFormation = "formation"
|
||||
SociatySubTypeChallengestart = "challengestart"
|
||||
SociatySubTypeChallengefinish = "challengefinish"
|
||||
|
||||
@ -19,6 +19,35 @@ func (this *apiComp) Formation(session comm.IUserSession, req *pb.SociatyBFormat
|
||||
}
|
||||
|
||||
uid := session.GetUserId()
|
||||
user := this.module.ModuleUser.GetUser(uid)
|
||||
if user == nil {
|
||||
this.module.Error("GetRemoteUser",
|
||||
log.Field{Key: "uid", Value: uid},
|
||||
)
|
||||
code = pb.ErrorCode_UserSessionNobeing
|
||||
return
|
||||
}
|
||||
|
||||
ggd := this.module.configure.GetGlobalConf()
|
||||
if ggd == nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
}
|
||||
|
||||
//检验第二队或第三队是否达到解锁条件
|
||||
if _, ok := req.Teams[2]; ok {
|
||||
if user.Lv < ggd.GuildBossTroop2 {
|
||||
code = pb.ErrorCode_SociatyTeamUnlock
|
||||
return
|
||||
}
|
||||
}
|
||||
if _, ok := req.Teams[3]; ok {
|
||||
if user.Lv < ggd.GuildBossTroop3 {
|
||||
code = pb.ErrorCode_SociatyTeamUnlock
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
sociaty := this.module.modelSociaty.getUserSociaty(uid)
|
||||
if sociaty != nil && sociaty.Id == "" {
|
||||
code = pb.ErrorCode_SociatyNoFound
|
||||
|
||||
77
modules/sociaty/api_cross_bossmain.go
Normal file
77
modules/sociaty/api_cross_bossmain.go
Normal file
@ -0,0 +1,77 @@
|
||||
package sociaty
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/pb"
|
||||
|
||||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
|
||||
// 公会BOSS入口
|
||||
|
||||
func (this *apiComp) BossmainCheck(session comm.IUserSession, req *pb.SociatyBMainReq) (code pb.ErrorCode) {
|
||||
return
|
||||
}
|
||||
|
||||
func (this *apiComp) Bossmain(session comm.IUserSession, req *pb.SociatyBMainReq) (code pb.ErrorCode, data proto.Message) {
|
||||
uid := session.GetUserId()
|
||||
|
||||
ggd := this.module.configure.GetGlobalConf()
|
||||
if ggd == nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
}
|
||||
userEx, err := this.module.ModuleUser.GetUserExpand(uid)
|
||||
if err != nil {
|
||||
this.module.Error("GetRemoteUserExpand",
|
||||
log.Field{Key: "uid", Value: uid},
|
||||
log.Field{Key: "err", Value: err.Error()},
|
||||
)
|
||||
code = pb.ErrorCode_UserSessionNobeing
|
||||
return
|
||||
}
|
||||
|
||||
rsp := &pb.SociatyBMainResp{
|
||||
Ticket: userEx.SociatyTicket,
|
||||
}
|
||||
|
||||
// 未开始
|
||||
if !this.module.modelSociatyBoss.sportsIsStarted() {
|
||||
if userEx.SociatyTicket != ggd.GuildBossInitialNum {
|
||||
userEx.SociatyTicket = ggd.GuildBossInitialNum
|
||||
update := map[string]interface{}{
|
||||
"sociatyTicket": userEx.SociatyTicket,
|
||||
}
|
||||
if err := this.module.ModuleUser.ChangeUserExpand(uid, update); err != nil {
|
||||
code = pb.ErrorCode_DBError
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sociaty := this.module.modelSociaty.getUserSociaty(uid)
|
||||
if sociaty != nil && sociaty.Id == "" {
|
||||
code = pb.ErrorCode_SociatyNoFound
|
||||
this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid})
|
||||
return
|
||||
}
|
||||
|
||||
// 赛季信息
|
||||
dbs := this.module.modelSociatyBoss.getSociatyBossSports()
|
||||
if dbs == nil {
|
||||
code = pb.ErrorCode_SociatySportsNoinit
|
||||
return
|
||||
}
|
||||
rsp.EndTime = dbs.EndTime
|
||||
rsp.SettlementTime = dbs.SettlementTime
|
||||
|
||||
if sm := this.module.modelSociaty.getMemberInfo(sociaty, uid); sm != nil {
|
||||
rsp.Teams = sm.Teams
|
||||
}
|
||||
|
||||
if err := session.SendMsg(string(this.module.GetType()), SociatySubTypeBossmain, rsp); err != nil {
|
||||
code = pb.ErrorCode_SystemError
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -24,9 +24,29 @@ func (this *apiComp) Challengefinish(session comm.IUserSession, req *pb.SociatyB
|
||||
this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid})
|
||||
return
|
||||
}
|
||||
|
||||
userEx, err := this.module.ModuleUser.GetUserExpand(uid)
|
||||
if err != nil {
|
||||
this.module.Error("GetRemoteUserExpand",
|
||||
log.Field{Key: "uid", Value: uid},
|
||||
log.Field{Key: "err", Value: err.Error()},
|
||||
)
|
||||
code = pb.ErrorCode_UserSessionNobeing
|
||||
return
|
||||
}
|
||||
|
||||
this.module.modelSociatyBoss.challengefinish(sociaty, uid, req.Report)
|
||||
|
||||
//TODO 扣除挑战券
|
||||
//扣除挑战券
|
||||
userEx.SociatyTicket -= 1
|
||||
updateEx := map[string]interface{}{
|
||||
"sociatyTicket": userEx.SociatyTicket,
|
||||
}
|
||||
if err := this.module.ModuleUser.ChangeUserExpand(uid, updateEx); err != nil {
|
||||
this.module.Error("更新扣除挑战券失败",
|
||||
log.Field{Key: "uid", Value: uid},
|
||||
log.Field{Key: "err", Value: err.Error()})
|
||||
}
|
||||
|
||||
rsp := &pb.SociatyBChallengeFinishResp{
|
||||
Integral: this.module.modelSociatyBoss.transIntegral(req.Report.Harm),
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package sociaty
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/pb"
|
||||
@ -25,9 +26,38 @@ func (this *apiComp) Challengestart(session comm.IUserSession, req *pb.SociatyBC
|
||||
this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid})
|
||||
return
|
||||
}
|
||||
//校验挑战券
|
||||
userEx, err := this.module.ModuleUser.GetUserExpand(uid)
|
||||
if err != nil {
|
||||
this.module.Error("GetRemoteUserExpand",
|
||||
log.Field{Key: "uid", Value: uid},
|
||||
log.Field{Key: "err", Value: err.Error()},
|
||||
)
|
||||
code = pb.ErrorCode_UserSessionNobeing
|
||||
return
|
||||
}
|
||||
if userEx.SociatyTicket <= 0 {
|
||||
code = pb.ErrorCode_SociatyTicketsNoEnough
|
||||
return
|
||||
}
|
||||
|
||||
//TODO 校验挑战券
|
||||
this.module.modelSociatyBoss.challengestart(session, sociaty)
|
||||
//校验赛季时间
|
||||
if this.module.modelSociatyBoss.sportsIsFinished() {
|
||||
code = pb.ErrorCode_SociatySportsEnd
|
||||
return
|
||||
}
|
||||
|
||||
// 开始挑战
|
||||
if err := this.module.modelSociatyBoss.challengestart(session, sociaty); err != nil {
|
||||
var customErr = new(comm.CustomError)
|
||||
if errors.As(err, &customErr) {
|
||||
code = customErr.Code
|
||||
// if code == pb.ErrorCode_SociatyNoFormation {
|
||||
// return
|
||||
// }
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
rsp := &pb.SociatyBChallengeStartResp{
|
||||
SociatyId: sociaty.Id,
|
||||
|
||||
@ -30,9 +30,7 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (co
|
||||
return
|
||||
}
|
||||
|
||||
rsp := &pb.SociatyMineResp{
|
||||
Ticket: userEx.SociatyTicket,
|
||||
}
|
||||
rsp := &pb.SociatyMineResp{}
|
||||
|
||||
// 未加入公会
|
||||
if userEx.SociatyId == "" {
|
||||
@ -93,10 +91,6 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (co
|
||||
}
|
||||
}
|
||||
|
||||
if sm := this.module.modelSociaty.getMemberInfo(sociaty, uid); sm != nil {
|
||||
rsp.Teams = sm.Teams
|
||||
}
|
||||
|
||||
rsp.Sociaty = sociaty
|
||||
rsp.Master = master
|
||||
|
||||
|
||||
@ -970,3 +970,5 @@ func (s *ModelSociaty) clearSigned(sociaty *pb.DBSociaty) error {
|
||||
}
|
||||
return s.updateSociaty(sociaty.Id, update)
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -4,13 +4,24 @@ import (
|
||||
"context"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/core"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
rn "go_dreamfactory/lego/sys/redis"
|
||||
"go_dreamfactory/lego/sys/redis/pipe"
|
||||
"go_dreamfactory/modules"
|
||||
"go_dreamfactory/pb"
|
||||
|
||||
"go_dreamfactory/lego/sys/redis/pipe"
|
||||
"go_dreamfactory/sys/configure"
|
||||
"go_dreamfactory/utils"
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
"github.com/go-redis/redis/v8"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
)
|
||||
|
||||
var (
|
||||
BOSS_SPORTS = "sports"
|
||||
BOSS_PLAYERS = "players"
|
||||
SPORTS_HOUR = 3 * 24 //赛季周期
|
||||
)
|
||||
|
||||
type ModelSociatyBoss struct {
|
||||
@ -27,6 +38,109 @@ func (this *ModelSociatyBoss) Init(service core.IService, module core.IModule, c
|
||||
return
|
||||
}
|
||||
|
||||
// 初始化赛季
|
||||
func (s *ModelSociatyBoss) initSports() error {
|
||||
ticker := time.NewTicker(time.Second)
|
||||
sports := &pb.DBSociatyBossSports{}
|
||||
if err := s.Get(BOSS_SPORTS, sports); err != nil {
|
||||
if err == rn.RedisNil || err == mongo.ErrNoDocuments {
|
||||
sports.EndTime, sports.SettlementTime = s.sportsTime()
|
||||
if err2 := s.Add(BOSS_SPORTS, sports); err2 != nil {
|
||||
return err2
|
||||
}
|
||||
} else {
|
||||
s.moduleSociaty.Errorln(err)
|
||||
return err
|
||||
}
|
||||
}
|
||||
go func() {
|
||||
for {
|
||||
select {
|
||||
case <-ticker.C:
|
||||
now := configure.Now()
|
||||
//触发结算
|
||||
if now.Unix() >= sports.SettlementTime {
|
||||
_, sports.SettlementTime = s.sportsTime()
|
||||
s.settlement()
|
||||
s.moduleSociaty.Debugln("更新赛季结算时间:" + utils.FormatStr(sports.SettlementTime, ""))
|
||||
}
|
||||
if now.Unix() >= sports.EndTime {
|
||||
// 更新下一赛季周期结束时间
|
||||
sports.EndTime, sports.SettlementTime = s.sportsTime()
|
||||
update := map[string]interface{}{
|
||||
"endTime": sports.EndTime,
|
||||
"settlementTime": sports.SettlementTime,
|
||||
}
|
||||
if err := s.Change(BOSS_SPORTS, update); err != nil {
|
||||
s.moduleSociaty.Errorln("Failed to change")
|
||||
return
|
||||
}
|
||||
//归档前赛季数据、清理前赛季玩家
|
||||
s.reset()
|
||||
s.moduleSociaty.Debugln("更新赛季周期时间:" + utils.FormatStr(sports.EndTime, ""))
|
||||
}
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// 获取赛季数据
|
||||
func (s *ModelSociatyBoss) getSociatyBossSports() *pb.DBSociatyBossSports {
|
||||
sports := &pb.DBSociatyBossSports{}
|
||||
if err := s.Get(BOSS_SPORTS, sports); err != nil {
|
||||
s.moduleSociaty.Errorln(err)
|
||||
return nil
|
||||
}
|
||||
return sports
|
||||
}
|
||||
|
||||
// 赛季时间
|
||||
func (s *ModelSociatyBoss) sportsTime() (t1, t2 int64) {
|
||||
now := configure.Now()
|
||||
end1 := now.Add(time.Duration(SPORTS_HOUR) * time.Hour) //测试时单位分钟 else Hour
|
||||
h, _ := time.ParseDuration("-1h") //测试时2m else -1h
|
||||
end2 := end1.Add(h)
|
||||
return end1.Unix(), end2.Unix()
|
||||
}
|
||||
|
||||
// 公会BOSS是否开始
|
||||
func (s *ModelSociatyBoss) sportsIsStarted() bool {
|
||||
sports := s.getSociatyBossSports()
|
||||
if sports == nil {
|
||||
return false
|
||||
}
|
||||
if sports.EndTime == 0 {
|
||||
return false
|
||||
} else {
|
||||
now := configure.Now().Unix()
|
||||
end := sports.SettlementTime
|
||||
if now < end {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// 公会BOSS是否结束
|
||||
func (s *ModelSociatyBoss) sportsIsFinished() bool {
|
||||
sports := s.getSociatyBossSports()
|
||||
if sports == nil {
|
||||
return false
|
||||
}
|
||||
if sports.EndTime == 0 {
|
||||
return true
|
||||
} else {
|
||||
now := configure.Now().Unix()
|
||||
end := sports.SettlementTime
|
||||
if now > end && now < sports.EndTime {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// 设置阵容
|
||||
func (s *ModelSociatyBoss) setFormation(sociaty *pb.DBSociaty, uid string, teams map[int32]*pb.ChallengeTeam) error {
|
||||
if !s.moduleSociaty.modelSociaty.isMember(uid, sociaty) {
|
||||
@ -46,7 +160,7 @@ func (s *ModelSociatyBoss) setFormation(sociaty *pb.DBSociaty, uid string, teams
|
||||
|
||||
//挑战开始
|
||||
func (s *ModelSociatyBoss) challengestart(session comm.IUserSession, sociaty *pb.DBSociaty) error {
|
||||
//阵容
|
||||
//组装阵容数据
|
||||
var formations []*pb.BattleFormation
|
||||
m := s.moduleSociaty.modelSociaty.getMemberInfo(sociaty, session.GetUserId())
|
||||
for _, v := range m.Teams {
|
||||
@ -63,11 +177,13 @@ func (s *ModelSociatyBoss) challengestart(session comm.IUserSession, sociaty *pb
|
||||
}
|
||||
|
||||
if b, y := iBattle.(comm.IBattle); y {
|
||||
b.CreatePvbBattle(session, &pb.BattlePVBReq{
|
||||
if code, _ := b.CreatePvbBattle(session, &pb.BattlePVBReq{
|
||||
Ptype: pb.PlayType_sociaty,
|
||||
Title: "公会BOSS",
|
||||
Format: formations,
|
||||
})
|
||||
}); code != pb.ErrorCode_Success {
|
||||
return comm.NewCustomError(code)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@ -80,11 +196,12 @@ func (s *ModelSociatyBoss) challengefinish(sociaty *pb.DBSociaty, uid string, re
|
||||
}
|
||||
|
||||
//保存挑战记录
|
||||
if err := s.addChallengeRecord(uid, &pb.DBSociatyBossRecord{
|
||||
if err := s.addChallengeRecord(uid, sociaty.Id, &pb.DBSociatyBossRecord{
|
||||
Uid: uid,
|
||||
SociatyId: sociaty.Id,
|
||||
Integral: s.transIntegral(report.Harm),
|
||||
Duration: report.Costtime,
|
||||
Rtime: configure.Now().Unix(),
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
@ -92,17 +209,25 @@ func (s *ModelSociatyBoss) challengefinish(sociaty *pb.DBSociaty, uid string, re
|
||||
}
|
||||
|
||||
// 挑战记录 作为阵容推荐的依据；
|
||||
func (s *ModelSociatyBoss) addChallengeRecord(uid string, record *pb.DBSociatyBossRecord) error {
|
||||
id := primitive.NewObjectID().Hex()
|
||||
if err := s.AddList(uid, id, record); err != nil {
|
||||
func (s *ModelSociatyBoss) addChallengeRecord(uid, sociatyId string, record *pb.DBSociatyBossRecord) error {
|
||||
if err := s.AddList(uid, sociatyId, record); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
return s.addUserWithSports(uid, sociatyId)
|
||||
}
|
||||
|
||||
// 记录参赛的玩家
|
||||
func (s *ModelSociatyBoss) addUserWithSports(uid, sociatyId string) error {
|
||||
record := &pb.DBSociatyBossUser{
|
||||
Uid: uid,
|
||||
SociatyId: sociatyId,
|
||||
}
|
||||
return s.moduleSociaty.modelSociatyBoss.AddList(BOSS_PLAYERS, uid, record)
|
||||
}
|
||||
|
||||
// 记入排行
|
||||
func (s *ModelSociatyBoss) addRank(uid string, integral int32) error {
|
||||
func (s *ModelSociatyBoss) addRank(uid string, integral int64) error {
|
||||
var (
|
||||
pipe *pipe.RedisPipe = s.Redis.RedisPipe(context.TODO())
|
||||
m *redis.Z
|
||||
@ -197,3 +322,80 @@ func (s *ModelSociatyBoss) rank(sociatyName string, rankType int32) (res []*pb.S
|
||||
return nil
|
||||
}
|
||||
|
||||
// 公会BOSS重置数据
|
||||
func (s *ModelSociatyBoss) reset() error {
|
||||
s.moduleSociaty.Debugln("赛季重置")
|
||||
|
||||
// 清理前赛季玩家
|
||||
var players []*pb.DBSociatyBossUser
|
||||
if err := s.GetList(BOSS_PLAYERS, &players); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, v := range players {
|
||||
if err := s.DelListlds(BOSS_PLAYERS, v.Uid); err != nil {
|
||||
s.moduleSociaty.Error("清理玩家赛事记录", log.Field{Key: "uid", Value: v.Uid}, log.Field{Key: "err", Value: err.Error()})
|
||||
}
|
||||
|
||||
// 归档前赛季数据
|
||||
update := map[string]interface{}{
|
||||
"status": 1, //归档
|
||||
}
|
||||
if err := s.ChangeList(v.Uid, v.SociatyId, update); err != nil {
|
||||
s.moduleSociaty.Error("归档玩家赛事记录", log.Field{Key: "uid", Value: v.Uid}, log.Field{Key: "err", Value: err.Error()})
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// 赛季结算
|
||||
func (s *ModelSociatyBoss) settlement() error {
|
||||
s.moduleSociaty.Debugln("赛季结算")
|
||||
start := time.Now()
|
||||
var players []*pb.DBSociatyBossUser
|
||||
|
||||
// 查询所有参赛玩家
|
||||
if err := s.GetList(BOSS_PLAYERS, &players); err != nil {
|
||||
return err
|
||||
}
|
||||
// 计算玩家的赛季积分
|
||||
for _, r := range players {
|
||||
s.moduleSociaty.Debugln(r.Uid)
|
||||
var record []*pb.DBSociatyBossRecord
|
||||
if err := s.GetListObj(r.Uid, r.SociatyId, &record); err != nil {
|
||||
s.moduleSociaty.Error("查询玩家赛事记录", log.Field{Key: "uid", Value: r.Uid}, log.Field{Key: "err", Value: err.Error()})
|
||||
continue
|
||||
}
|
||||
//排序-倒叙
|
||||
sort.SliceStable(record, func(i, j int) bool {
|
||||
return record[i].Integral > record[j].Integral
|
||||
})
|
||||
|
||||
var total int64 //当前赛季总积分
|
||||
var highScore []int64 //暂存玩家积分
|
||||
for i, v := range record {
|
||||
highScore = append(highScore, v.Integral)
|
||||
total += v.Integral
|
||||
if i > 2 {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// 更新玩家赛季信息
|
||||
update := map[string]interface{}{
|
||||
"total": total,
|
||||
"integrals": highScore,
|
||||
}
|
||||
if err := s.ChangeList(BOSS_PLAYERS, r.Uid, update); err != nil {
|
||||
s.moduleSociaty.Error("更新玩家赛事信息", log.Field{Key: "uid", Value: r.Uid}, log.Field{Key: "err", Value: err.Error()})
|
||||
continue
|
||||
}
|
||||
|
||||
//将玩家积分加入排行榜
|
||||
s.addRank(r.Uid, total)
|
||||
|
||||
s.moduleSociaty.Debugln("耗时:", time.Since(start))
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -85,6 +85,9 @@ func (this *Sociaty) Start() (err error) {
|
||||
if this.sociatySignConf, err = this.configure.getSociatySignCfg(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 初始化公会BOSS赛季开始时间
|
||||
this.modelSociatyBoss.initSports()
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -45,7 +45,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
|
||||
}
|
||||
|
||||
if curTaskConf.Group != req.GroupId {
|
||||
code = pb.ErrorCode_ReqParameterError
|
||||
code = pb.ErrorCode_WorldtaskGroupIdNosame
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -254,6 +254,9 @@ const (
|
||||
ErrorCode_SociatyNoMaster ErrorCode = 30034 //无会长
|
||||
ErrorCode_SociatyNoFormation ErrorCode = 30035 //无阵容
|
||||
ErrorCode_SociatyTicketsNoEnough ErrorCode = 30036 //挑战券不足
|
||||
ErrorCode_SociatySportsNoinit ErrorCode = 30037 //赛季未初始
|
||||
ErrorCode_SociatySportsEnd ErrorCode = 30038 //赛季已结束
|
||||
ErrorCode_SociatyTeamUnlock ErrorCode = 30039 //队伍解锁条件不满足
|
||||
// arena
|
||||
ErrorCode_ArenaTicketBuyUp ErrorCode = 3101 //票据上限
|
||||
ErrorCode_ArenaTicketNotEnough ErrorCode = 3102 //票据不足
|
||||
@ -292,6 +295,7 @@ const (
|
||||
ErrorCode_WorldtaskNoComplete ErrorCode = 3804 //任务条件未完成
|
||||
ErrorCode_WorldtaskFinihed ErrorCode = 3805 //任务已完成
|
||||
ErrorCode_WorldtaskLastUnFinished ErrorCode = 3806 //上个任务未完成
|
||||
ErrorCode_WorldtaskGroupIdNosame ErrorCode = 3807 //组ID不一致
|
||||
// academy
|
||||
ErrorCode_AcademyTaskNoCompleteTask ErrorCode = 3901 //未完成任务
|
||||
// AutoBattle
|
||||
@ -512,6 +516,9 @@ var (
|
||||
30034: "SociatyNoMaster",
|
||||
30035: "SociatyNoFormation",
|
||||
30036: "SociatyTicketsNoEnough",
|
||||
30037: "SociatySportsNoinit",
|
||||
30038: "SociatySportsEnd",
|
||||
30039: "SociatyTeamUnlock",
|
||||
3101: "ArenaTicketBuyUp",
|
||||
3102: "ArenaTicketNotEnough",
|
||||
3103: "ArenaTicketNpcInCd",
|
||||
@ -542,6 +549,7 @@ var (
|
||||
3804: "WorldtaskNoComplete",
|
||||
3805: "WorldtaskFinihed",
|
||||
3806: "WorldtaskLastUnFinished",
|
||||
3807: "WorldtaskGroupIdNosame",
|
||||
3901: "AcademyTaskNoCompleteTask",
|
||||
4001: "AutoBattleNoData",
|
||||
4002: "AutoBattleStatesErr",
|
||||
@ -757,6 +765,9 @@ var (
|
||||
"SociatyNoMaster": 30034,
|
||||
"SociatyNoFormation": 30035,
|
||||
"SociatyTicketsNoEnough": 30036,
|
||||
"SociatySportsNoinit": 30037,
|
||||
"SociatySportsEnd": 30038,
|
||||
"SociatyTeamUnlock": 30039,
|
||||
"ArenaTicketBuyUp": 3101,
|
||||
"ArenaTicketNotEnough": 3102,
|
||||
"ArenaTicketNpcInCd": 3103,
|
||||
@ -787,6 +798,7 @@ var (
|
||||
"WorldtaskNoComplete": 3804,
|
||||
"WorldtaskFinihed": 3805,
|
||||
"WorldtaskLastUnFinished": 3806,
|
||||
"WorldtaskGroupIdNosame": 3807,
|
||||
"AcademyTaskNoCompleteTask": 3901,
|
||||
"AutoBattleNoData": 4001,
|
||||
"AutoBattleStatesErr": 4002,
|
||||
@ -824,7 +836,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, 0xd0, 0x2b, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
|
||||
0x6f, 0x2a, 0xb9, 0x2c, 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,
|
||||
@ -1124,57 +1136,63 @@ var file_errorcode_proto_rawDesc = []byte{
|
||||
0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xd3, 0xea,
|
||||
0x01, 0x12, 0x1c, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b,
|
||||
0x65, 0x74, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xd4, 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, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c,
|
||||
0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72,
|
||||
0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a,
|
||||
0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75,
|
||||
0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61,
|
||||
0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a,
|
||||
0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65,
|
||||
0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73,
|
||||
0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10,
|
||||
0xc9, 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52,
|
||||
0x65, 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a,
|
||||
0x11, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75,
|
||||
0x6e, 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
|
||||
0x67, 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x0f,
|
||||
0x0a, 0x0a, 0x56, 0x69, 0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xaf, 0x1b, 0x12,
|
||||
0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10,
|
||||
0xb0, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x70, 0x65,
|
||||
0x61, 0x74, 0x10, 0xb1, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73,
|
||||
0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47,
|
||||
0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
|
||||
0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75,
|
||||
0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a,
|
||||
0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72,
|
||||
0x10, 0xf6, 0x1c, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43,
|
||||
0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57,
|
||||
0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9,
|
||||
0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76,
|
||||
0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11,
|
||||
0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70,
|
||||
0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73,
|
||||
0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15,
|
||||
0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68,
|
||||
0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61,
|
||||
0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64,
|
||||
0x10, 0xde, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61,
|
||||
0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b,
|
||||
0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
||||
0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75,
|
||||
0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72,
|
||||
0x72, 0x10, 0xa2, 0x1f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
|
||||
0x6f, 0x74, 0x6f, 0x33,
|
||||
0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73,
|
||||
0x4e, 0x6f, 0x69, 0x6e, 0x69, 0x74, 0x10, 0xd5, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f,
|
||||
0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x45, 0x6e, 0x64, 0x10, 0xd6,
|
||||
0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x65, 0x61,
|
||||
0x6d, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xd7, 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, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x42, 0x75, 0x79,
|
||||
0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x53,
|
||||
0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f,
|
||||
0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe7,
|
||||
0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74, 0x65,
|
||||
0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f,
|
||||
0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
|
||||
0x10, 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65,
|
||||
0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12, 0x19,
|
||||
0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x73, 0x74, 0x43,
|
||||
0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x69,
|
||||
0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xad,
|
||||
0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x65,
|
||||
0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x0f, 0x0a, 0x0a, 0x56, 0x69,
|
||||
0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xaf, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56,
|
||||
0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xb0, 0x1b, 0x12, 0x11,
|
||||
0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x10, 0xb1,
|
||||
0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63,
|
||||
0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74,
|
||||
0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c,
|
||||
0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74,
|
||||
0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79,
|
||||
0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12,
|
||||
0x16, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c,
|
||||
0x65, 0x74, 0x65, 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64,
|
||||
0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a,
|
||||
0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45,
|
||||
0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c,
|
||||
0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d,
|
||||
0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43,
|
||||
0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f,
|
||||
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd,
|
||||
0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61,
|
||||
0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12,
|
||||
0x1b, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75,
|
||||
0x70, 0x49, 0x64, 0x4e, 0x6f, 0x73, 0x61, 0x6d, 0x65, 0x10, 0xdf, 0x1d, 0x12, 0x1e, 0x0a, 0x19,
|
||||
0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d,
|
||||
0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10,
|
||||
0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61,
|
||||
0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
||||
0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x42, 0x06, 0x5a,
|
||||
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@ -786,7 +786,7 @@ func (x *DBSociatyRank) GetCtime() int64 {
|
||||
return 0
|
||||
}
|
||||
|
||||
// 挑战队伍
|
||||
// 阵容明细
|
||||
type ChallengeTeamInfo struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
@ -834,6 +834,7 @@ func (x *ChallengeTeamInfo) GetHeroId() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
// 阵容
|
||||
type ChallengeTeam struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
@ -881,6 +882,134 @@ func (x *ChallengeTeam) GetFormation() *BattleFormation {
|
||||
return nil
|
||||
}
|
||||
|
||||
// 赛季信息
|
||||
type DBSociatyBossSports struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
EndTime int64 `protobuf:"varint,1,opt,name=endTime,proto3" json:"endTime" bson:"endTime"` //公会BOSS赛季结束时间
|
||||
SettlementTime int64 `protobuf:"varint,2,opt,name=settlementTime,proto3" json:"settlementTime" bson:"settlementTime"` //赛季结算时间
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossSports) Reset() {
|
||||
*x = DBSociatyBossSports{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_sociaty_sociaty_db_proto_msgTypes[11]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossSports) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*DBSociatyBossSports) ProtoMessage() {}
|
||||
|
||||
func (x *DBSociatyBossSports) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_sociaty_sociaty_db_proto_msgTypes[11]
|
||||
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 DBSociatyBossSports.ProtoReflect.Descriptor instead.
|
||||
func (*DBSociatyBossSports) Descriptor() ([]byte, []int) {
|
||||
return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{11}
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossSports) GetEndTime() int64 {
|
||||
if x != nil {
|
||||
return x.EndTime
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossSports) GetSettlementTime() int64 {
|
||||
if x != nil {
|
||||
return x.SettlementTime
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// 赛季玩家信息
|
||||
type DBSociatyBossUser struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`
|
||||
SociatyId string `protobuf:"bytes,2,opt,name=sociatyId,proto3" json:"sociatyId" bson:"sociatyId"`
|
||||
Total int64 `protobuf:"varint,3,opt,name=total,proto3" json:"total" bson:"total"` //赛季总积分
|
||||
Integrals []int64 `protobuf:"varint,4,rep,packed,name=integrals,proto3" json:"integrals" bson:"integrals"` //赛季中最高积分
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossUser) Reset() {
|
||||
*x = DBSociatyBossUser{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_sociaty_sociaty_db_proto_msgTypes[12]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossUser) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*DBSociatyBossUser) ProtoMessage() {}
|
||||
|
||||
func (x *DBSociatyBossUser) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_sociaty_sociaty_db_proto_msgTypes[12]
|
||||
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 DBSociatyBossUser.ProtoReflect.Descriptor instead.
|
||||
func (*DBSociatyBossUser) Descriptor() ([]byte, []int) {
|
||||
return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{12}
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossUser) GetUid() string {
|
||||
if x != nil {
|
||||
return x.Uid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossUser) GetSociatyId() string {
|
||||
if x != nil {
|
||||
return x.SociatyId
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossUser) GetTotal() int64 {
|
||||
if x != nil {
|
||||
return x.Total
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossUser) GetIntegrals() []int64 {
|
||||
if x != nil {
|
||||
return x.Integrals
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// 成员公会BOSS历史记录
|
||||
type DBSociatyBossRecord struct {
|
||||
state protoimpl.MessageState
|
||||
@ -893,12 +1022,13 @@ type DBSociatyBossRecord struct {
|
||||
Teams map[int32]*ChallengeTeam `protobuf:"bytes,4,rep,name=teams,proto3" json:"teams" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"teams"` //挑战队伍
|
||||
Duration int32 `protobuf:"varint,5,opt,name=duration,proto3" json:"duration" bson:"duration"` //战斗耗时
|
||||
Rtime int64 `protobuf:"varint,6,opt,name=rtime,proto3" json:"rtime" bson:"rtime"` //记录时间
|
||||
Status int32 `protobuf:"varint,7,opt,name=status,proto3" json:"status"` //@go_tags(`bson:"status"`)0当前赛季记录 1归档赛季记录
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossRecord) Reset() {
|
||||
*x = DBSociatyBossRecord{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_sociaty_sociaty_db_proto_msgTypes[11]
|
||||
mi := &file_sociaty_sociaty_db_proto_msgTypes[13]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -911,7 +1041,7 @@ func (x *DBSociatyBossRecord) String() string {
|
||||
func (*DBSociatyBossRecord) ProtoMessage() {}
|
||||
|
||||
func (x *DBSociatyBossRecord) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_sociaty_sociaty_db_proto_msgTypes[11]
|
||||
mi := &file_sociaty_sociaty_db_proto_msgTypes[13]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -924,7 +1054,7 @@ func (x *DBSociatyBossRecord) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DBSociatyBossRecord.ProtoReflect.Descriptor instead.
|
||||
func (*DBSociatyBossRecord) Descriptor() ([]byte, []int) {
|
||||
return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{11}
|
||||
return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{13}
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossRecord) GetSociatyId() string {
|
||||
@ -969,6 +1099,13 @@ func (x *DBSociatyBossRecord) GetRtime() int64 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBSociatyBossRecord) GetStatus() int32 {
|
||||
if x != nil {
|
||||
return x.Status
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
var File_sociaty_sociaty_db_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_sociaty_sociaty_db_proto_rawDesc = []byte{
|
||||
@ -1072,30 +1209,45 @@ var file_sociaty_sociaty_db_proto_rawDesc = []byte{
|
||||
0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x12, 0x2e, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74,
|
||||
0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x66, 0x6f,
|
||||
0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x94, 0x02, 0x0a, 0x13, 0x44, 0x42, 0x53, 0x6f,
|
||||
0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12,
|
||||
0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
|
||||
0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28,
|
||||
0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x35, 0x0a, 0x05, 0x74,
|
||||
0x65, 0x61, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x44, 0x42, 0x53,
|
||||
0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
|
||||
0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65, 0x61,
|
||||
0x6d, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14,
|
||||
0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72,
|
||||
0x74, 0x69, 0x6d, 0x65, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74,
|
||||
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54,
|
||||
0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x50,
|
||||
0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x12, 0x09, 0x0a, 0x05,
|
||||
0x4e, 0x4f, 0x4a, 0x4f, 0x42, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x45, 0x4d, 0x42, 0x45,
|
||||
0x52, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x11,
|
||||
0x0a, 0x0d, 0x56, 0x49, 0x43, 0x45, 0x50, 0x52, 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10,
|
||||
0x03, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x52, 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x04,
|
||||
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x57, 0x0a, 0x13, 0x44, 0x42, 0x53, 0x6f, 0x63,
|
||||
0x69, 0x61, 0x74, 0x79, 0x42, 0x6f, 0x73, 0x73, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x18,
|
||||
0x0a, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
|
||||
0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x73, 0x65, 0x74, 0x74,
|
||||
0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03,
|
||||
0x52, 0x0e, 0x73, 0x65, 0x74, 0x74, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65,
|
||||
0x22, 0x77, 0x0a, 0x11, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x6f, 0x73,
|
||||
0x73, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61,
|
||||
0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69,
|
||||
0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x03,
|
||||
0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x69,
|
||||
0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x03, 0x52, 0x09,
|
||||
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x73, 0x22, 0xac, 0x02, 0x0a, 0x13, 0x44, 0x42,
|
||||
0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72,
|
||||
0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12,
|
||||
0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
|
||||
0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20,
|
||||
0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x35, 0x0a,
|
||||
0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x44,
|
||||
0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x65, 0x63, 0x6f,
|
||||
0x72, 0x64, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74,
|
||||
0x65, 0x61, 0x6d, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52,
|
||||
0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
|
||||
0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x1a, 0x48,
|
||||
0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
|
||||
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24,
|
||||
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
|
||||
0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x50, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69,
|
||||
0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x4f, 0x4a, 0x4f, 0x42, 0x10,
|
||||
0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x09, 0x0a,
|
||||
0x05, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x56, 0x49, 0x43, 0x45,
|
||||
0x50, 0x52, 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x50,
|
||||
0x52, 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
|
||||
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -1111,7 +1263,7 @@ func file_sociaty_sociaty_db_proto_rawDescGZIP() []byte {
|
||||
}
|
||||
|
||||
var file_sociaty_sociaty_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
|
||||
var file_sociaty_sociaty_db_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
|
||||
var file_sociaty_sociaty_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
|
||||
var file_sociaty_sociaty_db_proto_goTypes = []interface{}{
|
||||
(SociatyJob)(0), // 0: SociatyJob
|
||||
(*DBSociaty)(nil), // 1: DBSociaty
|
||||
@ -1125,21 +1277,23 @@ var file_sociaty_sociaty_db_proto_goTypes = []interface{}{
|
||||
(*DBSociatyRank)(nil), // 9: DBSociatyRank
|
||||
(*ChallengeTeamInfo)(nil), // 10: ChallengeTeamInfo
|
||||
(*ChallengeTeam)(nil), // 11: ChallengeTeam
|
||||
(*DBSociatyBossRecord)(nil), // 12: DBSociatyBossRecord
|
||||
nil, // 13: SociatyMember.TeamsEntry
|
||||
nil, // 14: DBSociatyBossRecord.TeamsEntry
|
||||
(*BattleFormation)(nil), // 15: BattleFormation
|
||||
(*DBSociatyBossSports)(nil), // 12: DBSociatyBossSports
|
||||
(*DBSociatyBossUser)(nil), // 13: DBSociatyBossUser
|
||||
(*DBSociatyBossRecord)(nil), // 14: DBSociatyBossRecord
|
||||
nil, // 15: SociatyMember.TeamsEntry
|
||||
nil, // 16: DBSociatyBossRecord.TeamsEntry
|
||||
(*BattleFormation)(nil), // 17: BattleFormation
|
||||
}
|
||||
var file_sociaty_sociaty_db_proto_depIdxs = []int32{
|
||||
2, // 0: DBSociaty.applyRecord:type_name -> ApplyRecord
|
||||
3, // 1: DBSociaty.members:type_name -> SociatyMember
|
||||
0, // 2: SociatyMember.job:type_name -> SociatyJob
|
||||
13, // 3: SociatyMember.teams:type_name -> SociatyMember.TeamsEntry
|
||||
15, // 3: SociatyMember.teams:type_name -> SociatyMember.TeamsEntry
|
||||
4, // 4: DBSociatyLog.list:type_name -> SociatyLog
|
||||
7, // 5: DBSociatyTask.taskList:type_name -> SociatyTask
|
||||
8, // 6: DBSociatyTask.activityList:type_name -> SociatyActivity
|
||||
15, // 7: ChallengeTeam.formation:type_name -> BattleFormation
|
||||
14, // 8: DBSociatyBossRecord.teams:type_name -> DBSociatyBossRecord.TeamsEntry
|
||||
17, // 7: ChallengeTeam.formation:type_name -> BattleFormation
|
||||
16, // 8: DBSociatyBossRecord.teams:type_name -> DBSociatyBossRecord.TeamsEntry
|
||||
11, // 9: SociatyMember.TeamsEntry.value:type_name -> ChallengeTeam
|
||||
11, // 10: DBSociatyBossRecord.TeamsEntry.value:type_name -> ChallengeTeam
|
||||
11, // [11:11] is the sub-list for method output_type
|
||||
@ -1289,6 +1443,30 @@ func file_sociaty_sociaty_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_sociaty_sociaty_db_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBSociatyBossSports); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_sociaty_sociaty_db_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBSociatyBossUser); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_sociaty_sociaty_db_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBSociatyBossRecord); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -1307,7 +1485,7 @@ func file_sociaty_sociaty_db_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_sociaty_sociaty_db_proto_rawDesc,
|
||||
NumEnums: 1,
|
||||
NumMessages: 14,
|
||||
NumMessages: 16,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -84,6 +84,14 @@ func MatrixingHour(beginTime string) (t time.Time) {
|
||||
return
|
||||
}
|
||||
|
||||
// 时间戳格式化字符串日期
|
||||
func FormatStr(timestamp int64, format string) string {
|
||||
if format == "" {
|
||||
format = "2006-01-02 15:04:05"
|
||||
}
|
||||
return time.Unix(timestamp, 0).Format(format)
|
||||
}
|
||||
|
||||
func AddHour(hour int) time.Time {
|
||||
return configure.Now().Add(time.Duration(hour) * time.Hour)
|
||||
}
|
||||
@ -118,28 +126,28 @@ func GetTodayZeroTime(curTime int64) int64 {
|
||||
}
|
||||
|
||||
// 计算自然天数
|
||||
func DiffDays(t1,t2 int64) int{
|
||||
func DiffDays(t1, t2 int64) int {
|
||||
if t1 == t2 {
|
||||
return -1
|
||||
}
|
||||
|
||||
if t1> t2 {
|
||||
t1,t2 = t2,t1
|
||||
if t1 > t2 {
|
||||
t1, t2 = t2, t1
|
||||
}
|
||||
|
||||
secOfDay:= 3600*24
|
||||
diffDays:=0
|
||||
secDiff:= t2 - t1
|
||||
secOfDay := 3600 * 24
|
||||
diffDays := 0
|
||||
secDiff := t2 - t1
|
||||
if secDiff > int64(secOfDay) {
|
||||
tmpDays:=int(secDiff / int64(secOfDay))
|
||||
t1+=int64(tmpDays) * int64(secOfDay)
|
||||
diffDays +=tmpDays
|
||||
tmpDays := int(secDiff / int64(secOfDay))
|
||||
t1 += int64(tmpDays) * int64(secOfDay)
|
||||
diffDays += tmpDays
|
||||
}
|
||||
st:= time.Unix(t1,0)
|
||||
et:= time.Unix(t2,0)
|
||||
dateformat:="20060102"
|
||||
if st.Format(dateformat)!= et.Format(dateformat){
|
||||
diffDays+=1
|
||||
st := time.Unix(t1, 0)
|
||||
et := time.Unix(t2, 0)
|
||||
dateformat := "20060102"
|
||||
if st.Format(dateformat) != et.Format(dateformat) {
|
||||
diffDays += 1
|
||||
}
|
||||
return diffDays
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user