Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
liwei1dao
commit
8362017a99
@ -529,7 +529,6 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "c-"
|
||||
@ -541,7 +540,6 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "c"
|
||||
@ -553,7 +551,6 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "c+"
|
||||
@ -565,7 +562,6 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "b"
|
||||
@ -577,7 +573,6 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "b+"
|
||||
@ -589,7 +584,6 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "a"
|
||||
@ -601,7 +595,6 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "a+"
|
||||
@ -613,7 +606,6 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "s"
|
||||
@ -625,7 +617,6 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "ss"
|
||||
@ -637,7 +628,6 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "sss"
|
||||
@ -649,7 +639,6 @@
|
||||
},
|
||||
{
|
||||
"id": 301,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_1",
|
||||
"text": "sss+"
|
||||
@ -661,7 +650,6 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "c-"
|
||||
@ -673,7 +661,6 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "c"
|
||||
@ -685,7 +672,6 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "c+"
|
||||
@ -697,7 +683,6 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "b"
|
||||
@ -709,7 +694,6 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "b+"
|
||||
@ -721,7 +705,6 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "a"
|
||||
@ -733,7 +716,6 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "a+"
|
||||
@ -745,7 +727,6 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "s"
|
||||
@ -757,7 +738,6 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "ss"
|
||||
@ -769,7 +749,6 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "sss"
|
||||
@ -781,7 +760,6 @@
|
||||
},
|
||||
{
|
||||
"id": 302,
|
||||
"iType": 1,
|
||||
"score_name": {
|
||||
"key": "Integralboss_boss_name_7",
|
||||
"text": "sss+"
|
||||
|
||||
@ -24803,21 +24803,9 @@
|
||||
],
|
||||
"helphero": [],
|
||||
"banhero": [],
|
||||
"star": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"star_type": [
|
||||
1,
|
||||
2,
|
||||
2
|
||||
],
|
||||
"star_value": [
|
||||
0,
|
||||
2,
|
||||
1
|
||||
],
|
||||
"star": [],
|
||||
"star_type": [],
|
||||
"star_value": [],
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
@ -25843,21 +25831,9 @@
|
||||
],
|
||||
"helphero": [],
|
||||
"banhero": [],
|
||||
"star": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"star_type": [
|
||||
1,
|
||||
2,
|
||||
2
|
||||
],
|
||||
"star_value": [
|
||||
0,
|
||||
2,
|
||||
1
|
||||
],
|
||||
"star": [],
|
||||
"star_type": [],
|
||||
"star_value": [],
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
@ -25871,7 +25847,7 @@
|
||||
"buried_type": 0,
|
||||
"buried": 0,
|
||||
"grouptype": [],
|
||||
"Episodetype": 3,
|
||||
"Episodetype": 1,
|
||||
"stage_param": 0,
|
||||
"inherit": 0,
|
||||
"battle_fail": 0,
|
||||
|
||||
@ -134,6 +134,7 @@ func (this *modelHdList) loadHdInfo() (err error) {
|
||||
if _, err = this.DB.InsertMany(core.SqlTable(this.TableName), data); err != nil {
|
||||
return
|
||||
}
|
||||
this.module.ReloadActivity()
|
||||
return
|
||||
}
|
||||
return
|
||||
|
||||
@ -97,35 +97,39 @@ func (this *Activity) Start() (err error) {
|
||||
}
|
||||
this.uigame = module.(comm.IUiGame)
|
||||
if !db.IsCross() {
|
||||
this.modelhdList.LoadActivityData()
|
||||
for k, v := range this.modelhdList.activity {
|
||||
switch k {
|
||||
case pb.HdType_HdTypeWarorder, pb.HdType_SupplyWarOrder, pb.HdType_MoondreamWarOrder:
|
||||
this.warorder.ActivityOpenNotice(v)
|
||||
break
|
||||
case pb.HdType_HdTypePay, pb.HdType_ShopCenterPayPakcge:
|
||||
this.pay.ActivityOpenNotice(v)
|
||||
break
|
||||
case pb.HdType_XSFundPhysical, pb.HdType_XSFundRecruit, pb.HdType_XSFundExp:
|
||||
this.shopcenter.ActivityOpenNotice(v)
|
||||
break
|
||||
case pb.HdType_AddUpRecharge:
|
||||
this.addrecharge.ActivityOpenNotice(v)
|
||||
break
|
||||
case pb.HdType_KFSevenTask:
|
||||
this.kftask.ActivityOpenNotice(v)
|
||||
break
|
||||
case pb.HdType_HdPuzzle, pb.HdType_HdLattice, pb.HdType_HdMiner:
|
||||
this.uigame.ActivityOpenNotice(v)
|
||||
break
|
||||
}
|
||||
}
|
||||
this.ReloadActivity()
|
||||
}
|
||||
this.service.RegisterFunctionName(string(comm.Rpc_ActivityOver), this.Rpc_ActivityOver)
|
||||
this.service.RegisterFunctionName(string(comm.Rpc_ActivityStart), this.Rpc_ActivityStart)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (this *Activity) ReloadActivity() {
|
||||
this.modelhdList.LoadActivityData()
|
||||
for k, v := range this.modelhdList.activity {
|
||||
switch k {
|
||||
case pb.HdType_HdTypeWarorder, pb.HdType_SupplyWarOrder, pb.HdType_MoondreamWarOrder:
|
||||
this.warorder.ActivityOpenNotice(v)
|
||||
break
|
||||
case pb.HdType_HdTypePay, pb.HdType_ShopCenterPayPakcge:
|
||||
this.pay.ActivityOpenNotice(v)
|
||||
break
|
||||
case pb.HdType_XSFundPhysical, pb.HdType_XSFundRecruit, pb.HdType_XSFundExp:
|
||||
this.shopcenter.ActivityOpenNotice(v)
|
||||
break
|
||||
case pb.HdType_AddUpRecharge:
|
||||
this.addrecharge.ActivityOpenNotice(v)
|
||||
break
|
||||
case pb.HdType_KFSevenTask:
|
||||
this.kftask.ActivityOpenNotice(v)
|
||||
break
|
||||
case pb.HdType_HdPuzzle, pb.HdType_HdLattice, pb.HdType_HdMiner:
|
||||
this.uigame.ActivityOpenNotice(v)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
func (this *Activity) OnInstallComp() {
|
||||
this.ModuleBase.OnInstallComp()
|
||||
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
|
||||
@ -134,50 +138,6 @@ func (this *Activity) OnInstallComp() {
|
||||
this.modelhdList = this.RegisterComp(new(modelHdList)).(*modelHdList)
|
||||
}
|
||||
|
||||
// 创建一条活动数据
|
||||
// func (this *Activity) CreateHdData() (err error) {
|
||||
// var db *pb.DBHuodong
|
||||
// db = &pb.DBHuodong{
|
||||
// Id: primitive.NewObjectID().Hex(),
|
||||
// Hdid: 10001,
|
||||
// Rtime: 1680105599,
|
||||
// Itype: 0,
|
||||
// Name: "累计充值活动",
|
||||
// Img: "",
|
||||
// Showtime: "03月15日00:00-03月20日23:59",
|
||||
// PressImg: "huodong_btn4_1.png",
|
||||
// Intr: "累计充值，限时福利",
|
||||
// Etime: 1680105599,
|
||||
// NormalImg: "huodong_btn4.png",
|
||||
// Stime: 1679414400,
|
||||
// Tab: 2,
|
||||
// Ttype: 0,
|
||||
// Icon: "ico_event_yxjl",
|
||||
// Open: 1,
|
||||
// Order: 102,
|
||||
// Stype: 10009,
|
||||
// Htype: 9,
|
||||
// Data: &pb.ActivityInfo{},
|
||||
// }
|
||||
// for i := 0; i < 6; i++ {
|
||||
// var p []*pb.UserAssets
|
||||
// p = append(p, &pb.UserAssets{
|
||||
// A: "item",
|
||||
// T: "10000001",
|
||||
// N: 1,
|
||||
// })
|
||||
// db.Data.Prize = append(db.Data.Prize, &pb.Arr{
|
||||
// Prize: p,
|
||||
// Val: int32(i) + 1,
|
||||
// })
|
||||
|
||||
// }
|
||||
|
||||
// this.modelhdList.addHdInfo(db)
|
||||
// fmt.Printf("%v", db)
|
||||
// return
|
||||
// }
|
||||
|
||||
func (this *Activity) CreateHdData() (err error) {
|
||||
this.modelhdList.getHdInfo()
|
||||
return
|
||||
|
||||
@ -29,14 +29,6 @@ func (this *ModelRank) Init(service core.IService, module core.IModule, comp cor
|
||||
return
|
||||
}
|
||||
|
||||
func (this *ModelRank) AddRankList(uId string, objId string, data *pb.DBEnchantRank) (err error) {
|
||||
|
||||
if err = this.AddList(uId, objId, data); err != nil {
|
||||
return
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (this *ModelRank) getEnchantRankList(uid string) []*pb.DBEnchantRank {
|
||||
ranks := make([]*pb.DBEnchantRank, 0)
|
||||
err := this.GetList(uid, &ranks)
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
package hero
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"fmt"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
"go_dreamfactory/sys/configure"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
"math/big"
|
||||
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
)
|
||||
@ -272,15 +274,9 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
|
||||
rsp.Wish.N += tmp5.N
|
||||
}
|
||||
reward = append(reward, tmp5)
|
||||
if req.DrawType == comm.DrawCardType5 { // 限时招募
|
||||
if heroRecord.LimitHero == "" {
|
||||
if conf := this.module.configure.GetApportHeroReplaceConfig(); conf != nil {
|
||||
heroRecord.LimitHero = conf.InitHero
|
||||
update["limitHero"] = heroRecord.LimitHero
|
||||
}
|
||||
}
|
||||
heroId = heroRecord.LimitHero // 替换成心愿英雄
|
||||
szCards[i] = heroId
|
||||
|
||||
if card := this.drawLimitHero(req.DrawType, heroRecord, drawConf, update); card != "" {
|
||||
szCards[i] = card
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -358,6 +354,48 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
|
||||
return
|
||||
}
|
||||
|
||||
func (this *apiComp) drawLimitHero(dtype int32, heroRecord *pb.DBHeroRecord, drawConf *cfg.GameDrawPoolData, update map[string]interface{}) (card string) {
|
||||
if dtype != comm.DrawCardType5 { // 限时招募
|
||||
return
|
||||
}
|
||||
if heroRecord.LimitHero == "" { // 选默认的
|
||||
if conf := this.module.configure.GetApportHeroReplaceConfig(); conf != nil {
|
||||
heroRecord.LimitHero = conf.InitHero
|
||||
}
|
||||
}
|
||||
// 新账号 一定替换
|
||||
if !heroRecord.Uphero {
|
||||
heroRecord.Uphero = true
|
||||
update["uphero"] = heroRecord.Uphero
|
||||
update["limitHero"] = heroRecord.LimitHero
|
||||
card = heroRecord.LimitHero // 替换成心愿英雄
|
||||
} else {
|
||||
bingo := false
|
||||
if heroRecord.Upherocount == 0 { // 概率替换
|
||||
if drawConf.Upweight >= 1000 {
|
||||
bingo = true
|
||||
} else {
|
||||
n, _ := rand.Int(rand.Reader, big.NewInt(1000))
|
||||
if int32(n.Int64()) <= drawConf.Upweight {
|
||||
bingo = true
|
||||
} else {
|
||||
heroRecord.Upherocount++
|
||||
update["upherocount"] = heroRecord.Upherocount
|
||||
}
|
||||
}
|
||||
} else {
|
||||
bingo = true
|
||||
heroRecord.Upherocount = 0 // 清理保底
|
||||
update["upherocount"] = heroRecord.Upherocount
|
||||
}
|
||||
if bingo {
|
||||
update["limitHero"] = heroRecord.LimitHero
|
||||
card = heroRecord.LimitHero // 替换成心愿英雄
|
||||
}
|
||||
}
|
||||
|
||||
return card
|
||||
}
|
||||
func (this *apiComp) wishDrawCard(session comm.IUserSession, heroRecord *pb.DBHeroRecord) (errdata *pb.ErrorData) {
|
||||
|
||||
var (
|
||||
|
||||
@ -45,7 +45,7 @@ func (this *modelDrawRecode) getDrawCardRecord(uid string) (results []*pb.DBHero
|
||||
cursor *mongo.Cursor
|
||||
)
|
||||
results = make([]*pb.DBHeroDrawRecord, 0)
|
||||
if cursor, err = this.DBModel.DB.Find(comm.TableEntertainRecode, bson.M{"uid": uid}, options.Find().SetSort(bson.M{"ctime": -1}),
|
||||
if cursor, err = this.DBModel.DB.Find(comm.TableDrawRecode, bson.M{"uid": uid}, options.Find().SetSort(bson.M{"ctime": -1}),
|
||||
options.Find().SetLimit(int64(comm.MaxRankList))); err != nil {
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
|
||||
@ -29,14 +29,6 @@ func (this *ModelRank) Init(service core.IService, module core.IModule, comp cor
|
||||
return
|
||||
}
|
||||
|
||||
func (this *ModelRank) AddRankList(uId string, objId string, data *pb.DBHuntingRank) (err error) {
|
||||
|
||||
if err = this.AddList(uId, objId, data); err != nil {
|
||||
return
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (this *ModelRank) getHuntingRankList(uid string) []*pb.DBHuntingRank {
|
||||
ranks := make([]*pb.DBHuntingRank, 0)
|
||||
err := this.GetList(uid, &ranks)
|
||||
|
||||
@ -76,7 +76,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.IntegralChalle
|
||||
Redflist: record.Redflist,
|
||||
BlueCompId: record.BlueCompId,
|
||||
Buleflist: record.Buleflist,
|
||||
Tasks: record.Tasks},
|
||||
Tasks: record.Tasks,
|
||||
Params: []float32{cfgData.Coefficient}, // 伤害系数
|
||||
},
|
||||
Nandu: req.Nandu,
|
||||
})
|
||||
|
||||
|
||||
@ -21,10 +21,17 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Integ
|
||||
///挑战主线关卡
|
||||
func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralChallengeOverReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
update map[string]interface{}
|
||||
res []*cfg.Gameatn
|
||||
first bool // 是否是首通
|
||||
update map[string]interface{}
|
||||
res []*cfg.Gameatn
|
||||
first bool // 是否是首通
|
||||
line []*pb.LineUp // 阵容数据
|
||||
harm int32
|
||||
changExp map[string]int32
|
||||
atno []*pb.UserAtno // atno 类型
|
||||
curAddExp []int32
|
||||
)
|
||||
changExp = make(map[string]int32)
|
||||
harm = req.Report.Harm
|
||||
update = make(map[string]interface{}, 0)
|
||||
if errdata = this.ChallengeOverCheck(session, req); errdata != nil {
|
||||
return // 参数校验失败直接返回
|
||||
@ -40,7 +47,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
|
||||
}
|
||||
|
||||
if _, ok := list.Score[req.Nandu]; !ok {
|
||||
list.Score[req.Nandu] = req.Score
|
||||
list.Score[req.Nandu] = harm
|
||||
update["score"] = list.Score
|
||||
first = true
|
||||
}
|
||||
@ -72,15 +79,16 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
|
||||
list.Count++
|
||||
update["count"] = list.Count
|
||||
// 更新积分数据
|
||||
if list.Score[req.Nandu] < req.Score {
|
||||
list.Score[req.Nandu] = req.Score
|
||||
if list.Score[req.Nandu] < harm {
|
||||
list.Score[req.Nandu] = harm
|
||||
update["score"] = list.Score
|
||||
}
|
||||
if list.Maxscore < req.Score { // 更新最大积分数据
|
||||
list.Maxscore = req.Score
|
||||
if list.Maxscore < harm { // 更新最大积分数据
|
||||
list.Maxscore = harm
|
||||
update["maxscore"] = list.Maxscore
|
||||
}
|
||||
list.Totalscore += req.Score
|
||||
|
||||
list.Totalscore += harm
|
||||
update["totalscore"] = list.Totalscore
|
||||
if first {
|
||||
for _, v := range cfgData.Firstprize { // 发放通关随机奖励
|
||||
@ -88,6 +96,19 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
|
||||
}
|
||||
}
|
||||
|
||||
for _, v := range req.Report.Info.Redflist[0].Team {
|
||||
line = append(line, &pb.LineUp{
|
||||
Cid: v.HeroID,
|
||||
Star: v.Star,
|
||||
Lv: v.Lv,
|
||||
})
|
||||
}
|
||||
|
||||
list.Line[req.Nandu] = &pb.LineData{
|
||||
Leadpos: req.Report.Info.Redflist[0].Leadpos,
|
||||
Line: line,
|
||||
}
|
||||
update["line"] = list.Line
|
||||
reward := this.module.ModuleTools.GetGroupDataByLottery(cfgData.Drop, userinfo.Vip, userinfo.Lv)
|
||||
res = append(res, reward...)
|
||||
|
||||
@ -99,11 +120,45 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
|
||||
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "IntegralChallengeOverReq", res)
|
||||
})
|
||||
}
|
||||
if first {
|
||||
res = append(res, cfgData.Firstprize...)
|
||||
}
|
||||
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil {
|
||||
reward = this.module.ModuleTools.GetGroupDataByLottery(cfgData.Drop, user.Vip, user.Lv)
|
||||
res = append(res, reward...)
|
||||
}
|
||||
|
||||
if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
// 加经验
|
||||
if cfgData.Heroexp > 0 {
|
||||
var heroObjs []string
|
||||
if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 {
|
||||
for _, v := range req.Report.Info.Redflist[0].Team {
|
||||
if v.HeroID != "" {
|
||||
if !v.Ishelp { // 助战英雄不加经验
|
||||
heroObjs = append(heroObjs, v.Oid)
|
||||
changExp[v.Oid] = 0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if curAddExp, errdata = this.module.ModuleHero.AddHerosExp(session, heroObjs, cfgData.Heroexp); errdata != nil {
|
||||
return
|
||||
}
|
||||
for pos, v := range heroObjs {
|
||||
changExp[v] = curAddExp[pos]
|
||||
}
|
||||
}
|
||||
|
||||
err = this.module.modelIntegral.modifyIntegralData(session.GetUserId(), update)
|
||||
|
||||
this.module.modelRank.updateRank(harm, session.GetUserId(), int(req.Nandu))
|
||||
session.SendMsg(string(this.module.GetType()), "challengeover", &pb.IntegralChallengeOverResp{
|
||||
Data: list,
|
||||
Data: list,
|
||||
Atno: atno,
|
||||
Heroexp: changExp,
|
||||
})
|
||||
|
||||
return
|
||||
|
||||
@ -16,7 +16,9 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.IntegralRankLis
|
||||
var (
|
||||
uids []string
|
||||
ranks []*pb.DBIntegralBoss
|
||||
franks []*pb.DBIntegralBoss
|
||||
players []*pb.DBIntegralRank
|
||||
friends []*pb.DBIntegralRank
|
||||
err error
|
||||
)
|
||||
|
||||
@ -24,7 +26,7 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.IntegralRankLis
|
||||
return
|
||||
}
|
||||
|
||||
if uids, err = this.module.modelRank.queryRankUser(); err != nil {
|
||||
if uids, err = this.module.modelRank.queryIntegralRankUser(int(req.Nandu)); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
@ -47,11 +49,33 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.IntegralRankLis
|
||||
Id: v.Uid,
|
||||
Uinfo: v.Uinfo,
|
||||
Nandu: v.Nandu,
|
||||
Score: v.Maxscore,
|
||||
Score: v.Score[req.Nandu],
|
||||
Line: v.Line[req.Nandu],
|
||||
}
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "rank", &pb.IntegralRankListResp{
|
||||
Ranks: players,
|
||||
// 获取好友
|
||||
fids := this.module.ModuleFriend.GetFriendList(session.GetUserId())
|
||||
if franks, err = this.module.modelIntegral.queryPlayers(fids); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
friends = make([]*pb.DBIntegralRank, len(franks))
|
||||
for i, v := range franks {
|
||||
friends[i] = &pb.DBIntegralRank{
|
||||
Id: v.Uid,
|
||||
Uinfo: v.Uinfo,
|
||||
Nandu: v.Nandu,
|
||||
Score: v.Score[req.Nandu],
|
||||
Line: v.Line[req.Nandu],
|
||||
}
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "ranklist", &pb.IntegralRankListResp{
|
||||
Ranks: players,
|
||||
Friends: friends,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -52,19 +52,20 @@ func (this *modelIntegral) getIntegralList(uid string) (result *pb.DBIntegralBos
|
||||
result.Uid = uid
|
||||
result.Buff = make(map[int32]int32)
|
||||
result.Score = make(map[int32]int32)
|
||||
|
||||
result.Line = make(map[int32]*pb.LineData, 0)
|
||||
// 获取当前的hid
|
||||
curTime := configure.Now().Unix()
|
||||
szConf := this.module.configure.GetIntegralITime()
|
||||
// 当前开服时间
|
||||
openTime := this.module.service.GetOpentime().Unix()
|
||||
openTime = configure.Now().Unix() // 临时校验
|
||||
for _, v := range szConf {
|
||||
if curTime >= int64(v.Openday)+openTime && curTime <= int64(v.Endday)+openTime {
|
||||
result.Hid = v.Hdid
|
||||
result.Etime = int64(v.Endday) + openTime
|
||||
result.CTime = curTime
|
||||
break
|
||||
}
|
||||
//if curTime >= int64(v.Openday)+openTime && curTime <= int64(v.Endday)+openTime {
|
||||
result.Hid = v.Hdid
|
||||
result.Etime = int64(v.Endday) + openTime
|
||||
result.CTime = curTime
|
||||
break
|
||||
//}
|
||||
}
|
||||
|
||||
var conf *cfg.GameIntegralBossData
|
||||
|
||||
@ -6,7 +6,7 @@ import (
|
||||
"go_dreamfactory/lego/core"
|
||||
"go_dreamfactory/lego/sys/redis/pipe"
|
||||
"go_dreamfactory/modules"
|
||||
"go_dreamfactory/pb"
|
||||
"strconv"
|
||||
|
||||
"github.com/go-redis/redis/v8"
|
||||
)
|
||||
@ -26,16 +26,16 @@ func (this *modelRank) Init(service core.IService, module core.IModule, comp cor
|
||||
}
|
||||
|
||||
// 更新排名
|
||||
func (this *modelRank) updateRank(data *pb.DBIntegralRank) (err error) {
|
||||
func (this *modelRank) updateRank(Score int32, uid string, nandu int) (err error) {
|
||||
var (
|
||||
pipe *pipe.RedisPipe = this.DBModel.Redis.RedisPipe(context.TODO())
|
||||
menbers *redis.Z
|
||||
cmd *redis.IntCmd
|
||||
)
|
||||
|
||||
menbers = &redis.Z{Score: float64(data.Score), Member: data.Uinfo.Uid}
|
||||
menbers = &redis.Z{Score: float64(Score), Member: uid}
|
||||
|
||||
if cmd = pipe.ZAdd(this.TableName, menbers); err != nil {
|
||||
if cmd = pipe.ZAdd(this.TableName+strconv.Itoa(nandu), menbers); err != nil {
|
||||
this.module.Errorln(err)
|
||||
}
|
||||
|
||||
@ -52,11 +52,11 @@ func (this *modelRank) updateRank(data *pb.DBIntegralRank) (err error) {
|
||||
}
|
||||
|
||||
// 获取排行榜前50的用户名单
|
||||
func (this *modelRank) queryRankUser() (ranks []string, err error) {
|
||||
func (this *modelRank) queryIntegralRankUser(nandu int) (ranks []string, err error) {
|
||||
var (
|
||||
result []string
|
||||
)
|
||||
if result, err = this.DBModel.Redis.ZRevRange(this.TableName, 0, 50).Result(); err != nil {
|
||||
if result, err = this.DBModel.Redis.ZRevRange(this.TableName+strconv.Itoa(nandu), 0, 50).Result(); err != nil {
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
}
|
||||
|
||||
@ -50,6 +50,15 @@ func (this *modelLibrary) createLibrary(uid string, fetter *pb.DBLibrary) (err e
|
||||
return
|
||||
}
|
||||
|
||||
// 通过objid 找对应的数据
|
||||
func (this *modelLibrary) getLibrarysByOid(uid string, oids []string) (fetters []*pb.DBLibrary) {
|
||||
|
||||
if err := this.GetListObjs(uid, oids, fetters); err != nil {
|
||||
return nil
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// 通过objid 找对应的数据
|
||||
func (this *modelLibrary) getOneLibrary(uid, oid string) *pb.DBLibrary {
|
||||
fetter := &pb.DBLibrary{}
|
||||
|
||||
@ -98,15 +98,22 @@ func (this *Library) GetLibraryListByHid(uid string, hid string) *pb.DBLibrary {
|
||||
return nil
|
||||
}
|
||||
|
||||
//
|
||||
func (this *Library) CheckFetter(uid string, hid string) (dbLibrary []*pb.DBLibrary, fetter []*pb.DBHeroFetter) {
|
||||
var (
|
||||
oid *pb.DBHeroFetter
|
||||
oid *pb.DBHeroFetter
|
||||
list []*pb.DBLibrary
|
||||
lib *pb.DBLibrary
|
||||
)
|
||||
oid = this.CheckHeroFetter(uid, hid) // 校验羁绊数据
|
||||
szFid := this.configure.GetHeroFetterID(hid)
|
||||
list = this.modelLibrary.getLibraryList(uid)
|
||||
for fid := range szFid {
|
||||
if list := this.GetLibraryListByFid(uid, fid); list == nil { // 没有这条羁绊数据
|
||||
for _, v := range list {
|
||||
if v.Fid == fid {
|
||||
lib = v
|
||||
}
|
||||
}
|
||||
if lib == nil {
|
||||
tmp := &pb.DBLibrary{ // 创建一条羁绊数据
|
||||
Id: primitive.NewObjectID().Hex(),
|
||||
Uid: uid,
|
||||
@ -125,16 +132,17 @@ func (this *Library) CheckFetter(uid string, hid string) (dbLibrary []*pb.DBLibr
|
||||
continue
|
||||
}
|
||||
dbLibrary = append(dbLibrary, tmp)
|
||||
list = append(list, tmp)
|
||||
} else { // 有这条羁绊数据
|
||||
if _, ok := list.Herofetter[hid]; !ok {
|
||||
if _, ok := lib.Herofetter[hid]; !ok {
|
||||
if oid != nil {
|
||||
list.Herofetter[hid] = oid.Id
|
||||
lib.Herofetter[hid] = oid.Id
|
||||
fetter = append(fetter, oid)
|
||||
}
|
||||
mapData := make(map[string]interface{}, 0)
|
||||
mapData["herofetter"] = list.Herofetter
|
||||
this.modelLibrary.modifyLibraryDataByObjId(uid, list.Id, mapData) // 更新新的羁绊信息
|
||||
dbLibrary = append(dbLibrary, list)
|
||||
mapData["herofetter"] = lib.Herofetter
|
||||
this.modelLibrary.modifyLibraryDataByObjId(uid, lib.Id, mapData) // 更新新的羁绊信息
|
||||
dbLibrary = append(dbLibrary, lib)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -26,12 +26,6 @@ func (this *ModelRank) Init(service core.IService, module core.IModule, comp cor
|
||||
})
|
||||
return
|
||||
}
|
||||
func (this *ModelRank) AddRankList(uId string, id string, data *pb.DBVikingRank) (err error) {
|
||||
if err = this.AddList(uId, id, data); err != nil {
|
||||
return
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// 获取排行榜数据
|
||||
func (this *ModelRank) getVikingRankList(uid string) []*pb.DBVikingRank {
|
||||
|
||||
@ -25,21 +25,22 @@ type DBIntegralBoss struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
|
||||
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
|
||||
Itype int32 `protobuf:"varint,3,opt,name=itype,proto3" json:"itype"` // boss 类型 1 难度模式 2 事件模式
|
||||
Count int32 `protobuf:"varint,4,opt,name=count,proto3" json:"count"` // 今日挑战次数
|
||||
CTime int64 `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` //修改时间
|
||||
Etime int64 `protobuf:"varint,6,opt,name=etime,proto3" json:"etime"` // 活动结束时间
|
||||
Hid int32 `protobuf:"varint,7,opt,name=hid,proto3" json:"hid"` // 活动id
|
||||
Maxscore int32 `protobuf:"varint,8,opt,name=maxscore,proto3" json:"maxscore"` // 最大积分
|
||||
Totalscore int32 `protobuf:"varint,9,opt,name=totalscore,proto3" json:"totalscore"` // 累计积分
|
||||
Reward1 int32 `protobuf:"varint,10,opt,name=reward1,proto3" json:"reward1"` // 类型1 奖励( Integralreward )
|
||||
Reward2 int32 `protobuf:"varint,11,opt,name=reward2,proto3" json:"reward2"` // 类型2 奖励( Integralreward )
|
||||
Buff map[int32]int32 `protobuf:"bytes,12,rep,name=buff,proto3" json:"buff" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 激活的buff (key Integralcondition value :0 未激活) 注:事件类型 才有值
|
||||
Nandu int32 `protobuf:"varint,13,opt,name=nandu,proto3" json:"nandu"` // 已经解锁的难度
|
||||
Score map[int32]int32 `protobuf:"bytes,14,rep,name=score,proto3" json:"score" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 难度 value 积分
|
||||
Uinfo *BaseUserInfo `protobuf:"bytes,15,opt,name=uinfo,proto3" json:"uinfo"` //用户基础
|
||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
|
||||
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
|
||||
Itype int32 `protobuf:"varint,3,opt,name=itype,proto3" json:"itype"` // boss 类型 1 难度模式 2 事件模式
|
||||
Count int32 `protobuf:"varint,4,opt,name=count,proto3" json:"count"` // 今日挑战次数
|
||||
CTime int64 `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` //修改时间
|
||||
Etime int64 `protobuf:"varint,6,opt,name=etime,proto3" json:"etime"` // 活动结束时间
|
||||
Hid int32 `protobuf:"varint,7,opt,name=hid,proto3" json:"hid"` // 活动id
|
||||
Maxscore int32 `protobuf:"varint,8,opt,name=maxscore,proto3" json:"maxscore"` // 最大积分
|
||||
Totalscore int32 `protobuf:"varint,9,opt,name=totalscore,proto3" json:"totalscore"` // 累计积分
|
||||
Reward1 int32 `protobuf:"varint,10,opt,name=reward1,proto3" json:"reward1"` // 类型1 奖励( Integralreward )
|
||||
Reward2 int32 `protobuf:"varint,11,opt,name=reward2,proto3" json:"reward2"` // 类型2 奖励( Integralreward )
|
||||
Buff map[int32]int32 `protobuf:"bytes,12,rep,name=buff,proto3" json:"buff" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 激活的buff (key Integralcondition value :0 未激活) 注:事件类型 才有值
|
||||
Nandu int32 `protobuf:"varint,13,opt,name=nandu,proto3" json:"nandu"` // 已经解锁的难度
|
||||
Score map[int32]int32 `protobuf:"bytes,14,rep,name=score,proto3" json:"score" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 难度 value 积分
|
||||
Uinfo *BaseUserInfo `protobuf:"bytes,15,opt,name=uinfo,proto3" json:"uinfo"` //用户基础
|
||||
Line map[int32]*LineData `protobuf:"bytes,16,rep,name=line,proto3" json:"line" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
|
||||
}
|
||||
|
||||
func (x *DBIntegralBoss) Reset() {
|
||||
@ -179,6 +180,68 @@ func (x *DBIntegralBoss) GetUinfo() *BaseUserInfo {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DBIntegralBoss) GetLine() map[int32]*LineData {
|
||||
if x != nil {
|
||||
return x.Line
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type LineData struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Leadpos int32 `protobuf:"varint,1,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
|
||||
Line []*LineUp `protobuf:"bytes,2,rep,name=line,proto3" json:"line"` // 阵容数据
|
||||
}
|
||||
|
||||
func (x *LineData) Reset() {
|
||||
*x = LineData{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_integral_integral_db_proto_msgTypes[1]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *LineData) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*LineData) ProtoMessage() {}
|
||||
|
||||
func (x *LineData) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_integral_integral_db_proto_msgTypes[1]
|
||||
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 LineData.ProtoReflect.Descriptor instead.
|
||||
func (*LineData) Descriptor() ([]byte, []int) {
|
||||
return file_integral_integral_db_proto_rawDescGZIP(), []int{1}
|
||||
}
|
||||
|
||||
func (x *LineData) GetLeadpos() int32 {
|
||||
if x != nil {
|
||||
return x.Leadpos
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *LineData) GetLine() []*LineUp {
|
||||
if x != nil {
|
||||
return x.Line
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// 积分boss 排行
|
||||
type DBIntegralRank struct {
|
||||
state protoimpl.MessageState
|
||||
@ -189,12 +252,13 @@ type DBIntegralRank struct {
|
||||
Uinfo *BaseUserInfo `protobuf:"bytes,2,opt,name=uinfo,proto3" json:"uinfo"` //用户基础
|
||||
Nandu int32 `protobuf:"varint,3,opt,name=nandu,proto3" json:"nandu"`
|
||||
Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"` // 积分
|
||||
Line *LineData `protobuf:"bytes,5,opt,name=line,proto3" json:"line"` // 阵容信息
|
||||
}
|
||||
|
||||
func (x *DBIntegralRank) Reset() {
|
||||
*x = DBIntegralRank{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_integral_integral_db_proto_msgTypes[1]
|
||||
mi := &file_integral_integral_db_proto_msgTypes[2]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -207,7 +271,7 @@ func (x *DBIntegralRank) String() string {
|
||||
func (*DBIntegralRank) ProtoMessage() {}
|
||||
|
||||
func (x *DBIntegralRank) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_integral_integral_db_proto_msgTypes[1]
|
||||
mi := &file_integral_integral_db_proto_msgTypes[2]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -220,7 +284,7 @@ func (x *DBIntegralRank) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DBIntegralRank.ProtoReflect.Descriptor instead.
|
||||
func (*DBIntegralRank) Descriptor() ([]byte, []int) {
|
||||
return file_integral_integral_db_proto_rawDescGZIP(), []int{1}
|
||||
return file_integral_integral_db_proto_rawDescGZIP(), []int{2}
|
||||
}
|
||||
|
||||
func (x *DBIntegralRank) GetId() string {
|
||||
@ -251,54 +315,76 @@ func (x *DBIntegralRank) GetScore() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBIntegralRank) GetLine() *LineData {
|
||||
if x != nil {
|
||||
return x.Line
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
var File_integral_integral_db_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_integral_integral_db_proto_rawDesc = []byte{
|
||||
0x0a, 0x1a, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67,
|
||||
0x72, 0x61, 0x6c, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f,
|
||||
0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9b, 0x04, 0x0a, 0x0e, 0x44, 0x42, 0x49,
|
||||
0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75,
|
||||
0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a,
|
||||
0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74,
|
||||
0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69,
|
||||
0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
|
||||
0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x73, 0x63,
|
||||
0x6f, 0x72, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x73, 0x63,
|
||||
0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x73, 0x63, 0x6f, 0x72,
|
||||
0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x73, 0x63,
|
||||
0x6f, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x31, 0x18, 0x0a,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x31, 0x12, 0x18, 0x0a,
|
||||
0x07, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x32, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
|
||||
0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x32, 0x12, 0x2d, 0x0a, 0x04, 0x62, 0x75, 0x66, 0x66, 0x18,
|
||||
0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72,
|
||||
0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x2e, 0x42, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
||||
0x52, 0x04, 0x62, 0x75, 0x66, 0x66, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18,
|
||||
0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x30, 0x0a, 0x05,
|
||||
0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42,
|
||||
0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x2e, 0x53, 0x63, 0x6f,
|
||||
0x72, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x23,
|
||||
0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
|
||||
0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69,
|
||||
0x6e, 0x66, 0x6f, 0x1a, 0x37, 0x0a, 0x09, 0x42, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
||||
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b,
|
||||
0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a,
|
||||
0x53, 0x63, 0x6f, 0x72, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
|
||||
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
|
||||
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x71, 0x0a, 0x0e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65,
|
||||
0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
||||
0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x22, 0x8e, 0x05, 0x0a, 0x0e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
|
||||
0x42, 0x6f, 0x73, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18,
|
||||
0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75,
|
||||
0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
|
||||
0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d,
|
||||
0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x68, 0x69, 0x64,
|
||||
0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x08, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
|
||||
0x74, 0x6f, 0x74, 0x61, 0x6c, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07,
|
||||
0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x31, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72,
|
||||
0x65, 0x77, 0x61, 0x72, 0x64, 0x31, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64,
|
||||
0x32, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x32,
|
||||
0x12, 0x2d, 0x0a, 0x04, 0x62, 0x75, 0x66, 0x66, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19,
|
||||
0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x2e,
|
||||
0x42, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x75, 0x66, 0x66, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
|
||||
0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x30, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0e,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
||||
0x6c, 0x42, 0x6f, 0x73, 0x73, 0x2e, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
||||
0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f,
|
||||
0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65,
|
||||
0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x2d, 0x0a, 0x04,
|
||||
0x6c, 0x69, 0x6e, 0x65, 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x49,
|
||||
0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x2e, 0x4c, 0x69, 0x6e, 0x65,
|
||||
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x1a, 0x37, 0x0a, 0x09, 0x42,
|
||||
0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
|
||||
0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
||||
0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x45, 0x6e, 0x74,
|
||||
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42,
|
||||
0x0a, 0x09, 0x4c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
|
||||
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a,
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c,
|
||||
0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
|
||||
0x38, 0x01, 0x22, 0x41, 0x0a, 0x08, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18,
|
||||
0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65,
|
||||
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x52,
|
||||
0x04, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x90, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65,
|
||||
0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66,
|
||||
0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73,
|
||||
0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a,
|
||||
0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61,
|
||||
0x6e, 0x64, 0x75, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
|
||||
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1d, 0x0a, 0x04, 0x6c, 0x69, 0x6e,
|
||||
0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61,
|
||||
0x74, 0x61, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
|
||||
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -313,24 +399,31 @@ func file_integral_integral_db_proto_rawDescGZIP() []byte {
|
||||
return file_integral_integral_db_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_integral_integral_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
|
||||
var file_integral_integral_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
|
||||
var file_integral_integral_db_proto_goTypes = []interface{}{
|
||||
(*DBIntegralBoss)(nil), // 0: DBIntegralBoss
|
||||
(*DBIntegralRank)(nil), // 1: DBIntegralRank
|
||||
nil, // 2: DBIntegralBoss.BuffEntry
|
||||
nil, // 3: DBIntegralBoss.ScoreEntry
|
||||
(*BaseUserInfo)(nil), // 4: BaseUserInfo
|
||||
(*LineData)(nil), // 1: LineData
|
||||
(*DBIntegralRank)(nil), // 2: DBIntegralRank
|
||||
nil, // 3: DBIntegralBoss.BuffEntry
|
||||
nil, // 4: DBIntegralBoss.ScoreEntry
|
||||
nil, // 5: DBIntegralBoss.LineEntry
|
||||
(*BaseUserInfo)(nil), // 6: BaseUserInfo
|
||||
(*LineUp)(nil), // 7: LineUp
|
||||
}
|
||||
var file_integral_integral_db_proto_depIdxs = []int32{
|
||||
2, // 0: DBIntegralBoss.buff:type_name -> DBIntegralBoss.BuffEntry
|
||||
3, // 1: DBIntegralBoss.score:type_name -> DBIntegralBoss.ScoreEntry
|
||||
4, // 2: DBIntegralBoss.uinfo:type_name -> BaseUserInfo
|
||||
4, // 3: DBIntegralRank.uinfo:type_name -> BaseUserInfo
|
||||
4, // [4:4] is the sub-list for method output_type
|
||||
4, // [4:4] is the sub-list for method input_type
|
||||
4, // [4:4] is the sub-list for extension type_name
|
||||
4, // [4:4] is the sub-list for extension extendee
|
||||
0, // [0:4] is the sub-list for field type_name
|
||||
3, // 0: DBIntegralBoss.buff:type_name -> DBIntegralBoss.BuffEntry
|
||||
4, // 1: DBIntegralBoss.score:type_name -> DBIntegralBoss.ScoreEntry
|
||||
6, // 2: DBIntegralBoss.uinfo:type_name -> BaseUserInfo
|
||||
5, // 3: DBIntegralBoss.line:type_name -> DBIntegralBoss.LineEntry
|
||||
7, // 4: LineData.line:type_name -> LineUp
|
||||
6, // 5: DBIntegralRank.uinfo:type_name -> BaseUserInfo
|
||||
1, // 6: DBIntegralRank.line:type_name -> LineData
|
||||
1, // 7: DBIntegralBoss.LineEntry.value:type_name -> LineData
|
||||
8, // [8:8] is the sub-list for method output_type
|
||||
8, // [8:8] is the sub-list for method input_type
|
||||
8, // [8:8] is the sub-list for extension type_name
|
||||
8, // [8:8] is the sub-list for extension extendee
|
||||
0, // [0:8] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_integral_integral_db_proto_init() }
|
||||
@ -339,6 +432,7 @@ func file_integral_integral_db_proto_init() {
|
||||
return
|
||||
}
|
||||
file_comm_proto_init()
|
||||
file_battle_battle_msg_proto_init()
|
||||
if !protoimpl.UnsafeEnabled {
|
||||
file_integral_integral_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBIntegralBoss); i {
|
||||
@ -353,6 +447,18 @@ func file_integral_integral_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_integral_integral_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*LineData); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_integral_integral_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBIntegralRank); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -371,7 +477,7 @@ func file_integral_integral_db_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_integral_integral_db_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 4,
|
||||
NumMessages: 6,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
||||
@ -223,7 +223,6 @@ type IntegralChallengeOverReq struct {
|
||||
|
||||
Nandu int32 `protobuf:"varint,1,opt,name=nandu,proto3" json:"nandu"` // boos 难度
|
||||
Report *BattleReport `protobuf:"bytes,2,opt,name=report,proto3" json:"report"` //战报
|
||||
Score int32 `protobuf:"varint,3,opt,name=score,proto3" json:"score"` //获得积分 或伤害
|
||||
}
|
||||
|
||||
func (x *IntegralChallengeOverReq) Reset() {
|
||||
@ -272,20 +271,15 @@ func (x *IntegralChallengeOverReq) GetReport() *BattleReport {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *IntegralChallengeOverReq) GetScore() int32 {
|
||||
if x != nil {
|
||||
return x.Score
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// 客户端通知服务器打赢了
|
||||
type IntegralChallengeOverResp struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Data *DBIntegralBoss `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
|
||||
Data *DBIntegralBoss `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
|
||||
Atno []*UserAtno `protobuf:"bytes,2,rep,name=atno,proto3" json:"atno"` // 推送atno
|
||||
Heroexp map[string]int32 `protobuf:"bytes,3,rep,name=heroexp,proto3" json:"heroexp" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 英雄获得经验
|
||||
}
|
||||
|
||||
func (x *IntegralChallengeOverResp) Reset() {
|
||||
@ -327,6 +321,20 @@ func (x *IntegralChallengeOverResp) GetData() *DBIntegralBoss {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *IntegralChallengeOverResp) GetAtno() []*UserAtno {
|
||||
if x != nil {
|
||||
return x.Atno
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *IntegralChallengeOverResp) GetHeroexp() map[string]int32 {
|
||||
if x != nil {
|
||||
return x.Heroexp
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// 领取奖励
|
||||
type IntegralGetRewardReq struct {
|
||||
state protoimpl.MessageState
|
||||
@ -483,7 +491,8 @@ type IntegralRankListResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Ranks []*DBIntegralRank `protobuf:"bytes,1,rep,name=ranks,proto3" json:"ranks"`
|
||||
Ranks []*DBIntegralRank `protobuf:"bytes,1,rep,name=ranks,proto3" json:"ranks"`
|
||||
Friends []*DBIntegralRank `protobuf:"bytes,2,rep,name=friends,proto3" json:"friends"`
|
||||
}
|
||||
|
||||
func (x *IntegralRankListResp) Reset() {
|
||||
@ -525,6 +534,13 @@ func (x *IntegralRankListResp) GetRanks() []*DBIntegralRank {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *IntegralRankListResp) GetFriends() []*DBIntegralRank {
|
||||
if x != nil {
|
||||
return x.Friends
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
var File_integral_integral_msg_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_integral_integral_msg_proto_rawDesc = []byte{
|
||||
@ -549,35 +565,46 @@ var file_integral_integral_msg_proto_rawDesc = []byte{
|
||||
0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
||||
0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e,
|
||||
0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x6d, 0x0a, 0x18, 0x49, 0x6e, 0x74, 0x65,
|
||||
0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x57, 0x0a, 0x18, 0x49, 0x6e, 0x74, 0x65,
|
||||
0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65,
|
||||
0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65,
|
||||
0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74,
|
||||
0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
|
||||
0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x40, 0x0a, 0x19, 0x49, 0x6e, 0x74, 0x65, 0x67,
|
||||
0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42,
|
||||
0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2c, 0x0a, 0x14, 0x49, 0x6e, 0x74,
|
||||
0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
|
||||
0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x22, 0x5d, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65, 0x67,
|
||||
0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
|
||||
0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52,
|
||||
0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52,
|
||||
0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x2b, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72,
|
||||
0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a,
|
||||
0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61,
|
||||
0x6e, 0x64, 0x75, 0x22, 0x3d, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52,
|
||||
0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x05, 0x72,
|
||||
0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49,
|
||||
0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e,
|
||||
0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x33,
|
||||
0x74, 0x22, 0xde, 0x01, 0x0a, 0x19, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68,
|
||||
0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12,
|
||||
0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
|
||||
0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04,
|
||||
0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03,
|
||||
0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61,
|
||||
0x74, 0x6e, 0x6f, 0x12, 0x41, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x03,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43,
|
||||
0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
|
||||
0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68,
|
||||
0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78,
|
||||
0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
|
||||
0x38, 0x01, 0x22, 0x2c, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65,
|
||||
0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74,
|
||||
0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65,
|
||||
0x22, 0x5d, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x52,
|
||||
0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74,
|
||||
0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65,
|
||||
0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1f,
|
||||
0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e,
|
||||
0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22,
|
||||
0x2b, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x4c,
|
||||
0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x68, 0x0a, 0x14,
|
||||
0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20,
|
||||
0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
|
||||
0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x12, 0x29, 0x0a, 0x07, 0x66,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44,
|
||||
0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x07, 0x66,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
|
||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -592,7 +619,7 @@ func file_integral_integral_msg_proto_rawDescGZIP() []byte {
|
||||
return file_integral_integral_msg_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_integral_integral_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
|
||||
var file_integral_integral_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
|
||||
var file_integral_integral_msg_proto_goTypes = []interface{}{
|
||||
(*IntegralGetListReq)(nil), // 0: IntegralGetListReq
|
||||
(*IntegralGetListResp)(nil), // 1: IntegralGetListResp
|
||||
@ -604,27 +631,31 @@ var file_integral_integral_msg_proto_goTypes = []interface{}{
|
||||
(*IntegralGetRewardResp)(nil), // 7: IntegralGetRewardResp
|
||||
(*IntegralRankListReq)(nil), // 8: IntegralRankListReq
|
||||
(*IntegralRankListResp)(nil), // 9: IntegralRankListResp
|
||||
(*DBIntegralBoss)(nil), // 10: DBIntegralBoss
|
||||
(*BattleFormation)(nil), // 11: BattleFormation
|
||||
(*BattleInfo)(nil), // 12: BattleInfo
|
||||
(*BattleReport)(nil), // 13: BattleReport
|
||||
(*UserAtno)(nil), // 14: UserAtno
|
||||
(*DBIntegralRank)(nil), // 15: DBIntegralRank
|
||||
nil, // 10: IntegralChallengeOverResp.HeroexpEntry
|
||||
(*DBIntegralBoss)(nil), // 11: DBIntegralBoss
|
||||
(*BattleFormation)(nil), // 12: BattleFormation
|
||||
(*BattleInfo)(nil), // 13: BattleInfo
|
||||
(*BattleReport)(nil), // 14: BattleReport
|
||||
(*UserAtno)(nil), // 15: UserAtno
|
||||
(*DBIntegralRank)(nil), // 16: DBIntegralRank
|
||||
}
|
||||
var file_integral_integral_msg_proto_depIdxs = []int32{
|
||||
10, // 0: IntegralGetListResp.data:type_name -> DBIntegralBoss
|
||||
11, // 1: IntegralChallengeReq.battle:type_name -> BattleFormation
|
||||
12, // 2: IntegralChallengeResp.info:type_name -> BattleInfo
|
||||
13, // 3: IntegralChallengeOverReq.report:type_name -> BattleReport
|
||||
10, // 4: IntegralChallengeOverResp.data:type_name -> DBIntegralBoss
|
||||
10, // 5: IntegralGetRewardResp.data:type_name -> DBIntegralBoss
|
||||
14, // 6: IntegralGetRewardResp.award:type_name -> UserAtno
|
||||
15, // 7: IntegralRankListResp.ranks:type_name -> DBIntegralRank
|
||||
8, // [8:8] is the sub-list for method output_type
|
||||
8, // [8:8] is the sub-list for method input_type
|
||||
8, // [8:8] is the sub-list for extension type_name
|
||||
8, // [8:8] is the sub-list for extension extendee
|
||||
0, // [0:8] is the sub-list for field type_name
|
||||
11, // 0: IntegralGetListResp.data:type_name -> DBIntegralBoss
|
||||
12, // 1: IntegralChallengeReq.battle:type_name -> BattleFormation
|
||||
13, // 2: IntegralChallengeResp.info:type_name -> BattleInfo
|
||||
14, // 3: IntegralChallengeOverReq.report:type_name -> BattleReport
|
||||
11, // 4: IntegralChallengeOverResp.data:type_name -> DBIntegralBoss
|
||||
15, // 5: IntegralChallengeOverResp.atno:type_name -> UserAtno
|
||||
10, // 6: IntegralChallengeOverResp.heroexp:type_name -> IntegralChallengeOverResp.HeroexpEntry
|
||||
11, // 7: IntegralGetRewardResp.data:type_name -> DBIntegralBoss
|
||||
15, // 8: IntegralGetRewardResp.award:type_name -> UserAtno
|
||||
16, // 9: IntegralRankListResp.ranks:type_name -> DBIntegralRank
|
||||
16, // 10: IntegralRankListResp.friends:type_name -> DBIntegralRank
|
||||
11, // [11:11] is the sub-list for method output_type
|
||||
11, // [11:11] is the sub-list for method input_type
|
||||
11, // [11:11] is the sub-list for extension type_name
|
||||
11, // [11:11] is the sub-list for extension extendee
|
||||
0, // [0:11] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_integral_integral_msg_proto_init() }
|
||||
@ -763,7 +794,7 @@ func file_integral_integral_msg_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_integral_integral_msg_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 10,
|
||||
NumMessages: 11,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user