狩猎新增英雄经验奖励
This commit is contained in:
parent
a9a6325ccb
commit
a2eb455151
@ -28,7 +28,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 10001000,
|
"drop": 10001000,
|
||||||
"bossmodel": 53001,
|
"heroexp": 60,
|
||||||
"boss": [
|
"boss": [
|
||||||
401003
|
401003
|
||||||
],
|
],
|
||||||
@ -83,7 +83,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 10002000,
|
"drop": 10002000,
|
||||||
"bossmodel": 53001,
|
"heroexp": 88,
|
||||||
"boss": [
|
"boss": [
|
||||||
401006
|
401006
|
||||||
],
|
],
|
||||||
@ -143,7 +143,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 10003000,
|
"drop": 10003000,
|
||||||
"bossmodel": 53001,
|
"heroexp": 120,
|
||||||
"boss": [
|
"boss": [
|
||||||
401009
|
401009
|
||||||
],
|
],
|
||||||
@ -203,7 +203,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 10004000,
|
"drop": 10004000,
|
||||||
"bossmodel": 53001,
|
"heroexp": 156,
|
||||||
"boss": [
|
"boss": [
|
||||||
401012
|
401012
|
||||||
],
|
],
|
||||||
@ -263,7 +263,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 10005000,
|
"drop": 10005000,
|
||||||
"bossmodel": 53001,
|
"heroexp": 196,
|
||||||
"boss": [
|
"boss": [
|
||||||
401015
|
401015
|
||||||
],
|
],
|
||||||
@ -323,7 +323,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 10006000,
|
"drop": 10006000,
|
||||||
"bossmodel": 53001,
|
"heroexp": 240,
|
||||||
"boss": [
|
"boss": [
|
||||||
401018
|
401018
|
||||||
],
|
],
|
||||||
@ -388,7 +388,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 10007000,
|
"drop": 10007000,
|
||||||
"bossmodel": 53001,
|
"heroexp": 288,
|
||||||
"boss": [
|
"boss": [
|
||||||
401021
|
401021
|
||||||
],
|
],
|
||||||
@ -453,7 +453,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 10008000,
|
"drop": 10008000,
|
||||||
"bossmodel": 53001,
|
"heroexp": 340,
|
||||||
"boss": [
|
"boss": [
|
||||||
401024
|
401024
|
||||||
],
|
],
|
||||||
@ -518,7 +518,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 10009000,
|
"drop": 10009000,
|
||||||
"bossmodel": 53001,
|
"heroexp": 450,
|
||||||
"boss": [
|
"boss": [
|
||||||
401027
|
401027
|
||||||
],
|
],
|
||||||
@ -583,7 +583,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 10010000,
|
"drop": 10010000,
|
||||||
"bossmodel": 53001,
|
"heroexp": 570,
|
||||||
"boss": [
|
"boss": [
|
||||||
401030
|
401030
|
||||||
],
|
],
|
||||||
@ -648,7 +648,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 10011000,
|
"drop": 10011000,
|
||||||
"bossmodel": 53001,
|
"heroexp": 700,
|
||||||
"boss": [
|
"boss": [
|
||||||
401033
|
401033
|
||||||
],
|
],
|
||||||
@ -713,7 +713,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 10012000,
|
"drop": 10012000,
|
||||||
"bossmodel": 53001,
|
"heroexp": 800,
|
||||||
"boss": [
|
"boss": [
|
||||||
401036
|
401036
|
||||||
],
|
],
|
||||||
@ -768,7 +768,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 20001000,
|
"drop": 20001000,
|
||||||
"bossmodel": 51004,
|
"heroexp": 60,
|
||||||
"boss": [
|
"boss": [
|
||||||
402003
|
402003
|
||||||
],
|
],
|
||||||
@ -823,7 +823,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 20002000,
|
"drop": 20002000,
|
||||||
"bossmodel": 51004,
|
"heroexp": 88,
|
||||||
"boss": [
|
"boss": [
|
||||||
402006
|
402006
|
||||||
],
|
],
|
||||||
@ -883,7 +883,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 20003000,
|
"drop": 20003000,
|
||||||
"bossmodel": 51004,
|
"heroexp": 120,
|
||||||
"boss": [
|
"boss": [
|
||||||
402009
|
402009
|
||||||
],
|
],
|
||||||
@ -943,7 +943,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 20004000,
|
"drop": 20004000,
|
||||||
"bossmodel": 51004,
|
"heroexp": 156,
|
||||||
"boss": [
|
"boss": [
|
||||||
402012
|
402012
|
||||||
],
|
],
|
||||||
@ -1003,7 +1003,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 20005000,
|
"drop": 20005000,
|
||||||
"bossmodel": 51004,
|
"heroexp": 196,
|
||||||
"boss": [
|
"boss": [
|
||||||
402015
|
402015
|
||||||
],
|
],
|
||||||
@ -1063,7 +1063,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 20006000,
|
"drop": 20006000,
|
||||||
"bossmodel": 51004,
|
"heroexp": 240,
|
||||||
"boss": [
|
"boss": [
|
||||||
402018
|
402018
|
||||||
],
|
],
|
||||||
@ -1128,7 +1128,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 20007000,
|
"drop": 20007000,
|
||||||
"bossmodel": 51004,
|
"heroexp": 288,
|
||||||
"boss": [
|
"boss": [
|
||||||
402021
|
402021
|
||||||
],
|
],
|
||||||
@ -1193,7 +1193,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 20008000,
|
"drop": 20008000,
|
||||||
"bossmodel": 51004,
|
"heroexp": 340,
|
||||||
"boss": [
|
"boss": [
|
||||||
402024
|
402024
|
||||||
],
|
],
|
||||||
@ -1258,7 +1258,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 20009000,
|
"drop": 20009000,
|
||||||
"bossmodel": 51004,
|
"heroexp": 450,
|
||||||
"boss": [
|
"boss": [
|
||||||
402027
|
402027
|
||||||
],
|
],
|
||||||
@ -1323,7 +1323,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 20010000,
|
"drop": 20010000,
|
||||||
"bossmodel": 51004,
|
"heroexp": 570,
|
||||||
"boss": [
|
"boss": [
|
||||||
402030
|
402030
|
||||||
],
|
],
|
||||||
@ -1388,7 +1388,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 20011000,
|
"drop": 20011000,
|
||||||
"bossmodel": 51004,
|
"heroexp": 700,
|
||||||
"boss": [
|
"boss": [
|
||||||
402033
|
402033
|
||||||
],
|
],
|
||||||
@ -1453,7 +1453,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 20012000,
|
"drop": 20012000,
|
||||||
"bossmodel": 51004,
|
"heroexp": 800,
|
||||||
"boss": [
|
"boss": [
|
||||||
402036
|
402036
|
||||||
],
|
],
|
||||||
@ -1508,7 +1508,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 30001000,
|
"drop": 30001000,
|
||||||
"bossmodel": 51005,
|
"heroexp": 60,
|
||||||
"boss": [
|
"boss": [
|
||||||
403003
|
403003
|
||||||
],
|
],
|
||||||
@ -1563,7 +1563,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 30002000,
|
"drop": 30002000,
|
||||||
"bossmodel": 51005,
|
"heroexp": 88,
|
||||||
"boss": [
|
"boss": [
|
||||||
403006
|
403006
|
||||||
],
|
],
|
||||||
@ -1623,7 +1623,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 30003000,
|
"drop": 30003000,
|
||||||
"bossmodel": 51005,
|
"heroexp": 120,
|
||||||
"boss": [
|
"boss": [
|
||||||
403009
|
403009
|
||||||
],
|
],
|
||||||
@ -1683,7 +1683,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 30004000,
|
"drop": 30004000,
|
||||||
"bossmodel": 51005,
|
"heroexp": 156,
|
||||||
"boss": [
|
"boss": [
|
||||||
403012
|
403012
|
||||||
],
|
],
|
||||||
@ -1743,7 +1743,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 30005000,
|
"drop": 30005000,
|
||||||
"bossmodel": 51005,
|
"heroexp": 196,
|
||||||
"boss": [
|
"boss": [
|
||||||
403015
|
403015
|
||||||
],
|
],
|
||||||
@ -1803,7 +1803,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 30006000,
|
"drop": 30006000,
|
||||||
"bossmodel": 51005,
|
"heroexp": 240,
|
||||||
"boss": [
|
"boss": [
|
||||||
403018
|
403018
|
||||||
],
|
],
|
||||||
@ -1868,7 +1868,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 30007000,
|
"drop": 30007000,
|
||||||
"bossmodel": 51005,
|
"heroexp": 288,
|
||||||
"boss": [
|
"boss": [
|
||||||
403021
|
403021
|
||||||
],
|
],
|
||||||
@ -1933,7 +1933,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 30008000,
|
"drop": 30008000,
|
||||||
"bossmodel": 51005,
|
"heroexp": 340,
|
||||||
"boss": [
|
"boss": [
|
||||||
403024
|
403024
|
||||||
],
|
],
|
||||||
@ -1998,7 +1998,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 30009000,
|
"drop": 30009000,
|
||||||
"bossmodel": 51005,
|
"heroexp": 450,
|
||||||
"boss": [
|
"boss": [
|
||||||
403027
|
403027
|
||||||
],
|
],
|
||||||
@ -2063,7 +2063,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 30010000,
|
"drop": 30010000,
|
||||||
"bossmodel": 51005,
|
"heroexp": 570,
|
||||||
"boss": [
|
"boss": [
|
||||||
403030
|
403030
|
||||||
],
|
],
|
||||||
@ -2128,7 +2128,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 30011000,
|
"drop": 30011000,
|
||||||
"bossmodel": 51005,
|
"heroexp": 700,
|
||||||
"boss": [
|
"boss": [
|
||||||
403033
|
403033
|
||||||
],
|
],
|
||||||
@ -2193,7 +2193,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 30012000,
|
"drop": 30012000,
|
||||||
"bossmodel": 51005,
|
"heroexp": 800,
|
||||||
"boss": [
|
"boss": [
|
||||||
403036
|
403036
|
||||||
],
|
],
|
||||||
@ -2248,7 +2248,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 40001000,
|
"drop": 40001000,
|
||||||
"bossmodel": 51002,
|
"heroexp": 127,
|
||||||
"boss": [
|
"boss": [
|
||||||
404003
|
404003
|
||||||
],
|
],
|
||||||
@ -2303,7 +2303,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 40002000,
|
"drop": 40002000,
|
||||||
"bossmodel": 51002,
|
"heroexp": 128,
|
||||||
"boss": [
|
"boss": [
|
||||||
404006
|
404006
|
||||||
],
|
],
|
||||||
@ -2363,7 +2363,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 40003000,
|
"drop": 40003000,
|
||||||
"bossmodel": 51002,
|
"heroexp": 129,
|
||||||
"boss": [
|
"boss": [
|
||||||
404009
|
404009
|
||||||
],
|
],
|
||||||
@ -2423,7 +2423,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 40004000,
|
"drop": 40004000,
|
||||||
"bossmodel": 51002,
|
"heroexp": 130,
|
||||||
"boss": [
|
"boss": [
|
||||||
404012
|
404012
|
||||||
],
|
],
|
||||||
@ -2483,7 +2483,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 40005000,
|
"drop": 40005000,
|
||||||
"bossmodel": 51002,
|
"heroexp": 131,
|
||||||
"boss": [
|
"boss": [
|
||||||
404015
|
404015
|
||||||
],
|
],
|
||||||
@ -2543,7 +2543,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 40006000,
|
"drop": 40006000,
|
||||||
"bossmodel": 51002,
|
"heroexp": 132,
|
||||||
"boss": [
|
"boss": [
|
||||||
404018
|
404018
|
||||||
],
|
],
|
||||||
@ -2608,7 +2608,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 40007000,
|
"drop": 40007000,
|
||||||
"bossmodel": 51002,
|
"heroexp": 133,
|
||||||
"boss": [
|
"boss": [
|
||||||
404021
|
404021
|
||||||
],
|
],
|
||||||
@ -2673,7 +2673,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 40008000,
|
"drop": 40008000,
|
||||||
"bossmodel": 51002,
|
"heroexp": 134,
|
||||||
"boss": [
|
"boss": [
|
||||||
404024
|
404024
|
||||||
],
|
],
|
||||||
@ -2738,7 +2738,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 40009000,
|
"drop": 40009000,
|
||||||
"bossmodel": 51002,
|
"heroexp": 135,
|
||||||
"boss": [
|
"boss": [
|
||||||
404027
|
404027
|
||||||
],
|
],
|
||||||
@ -2803,7 +2803,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 40010000,
|
"drop": 40010000,
|
||||||
"bossmodel": 51002,
|
"heroexp": 136,
|
||||||
"boss": [
|
"boss": [
|
||||||
404030
|
404030
|
||||||
],
|
],
|
||||||
@ -2868,7 +2868,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 40011000,
|
"drop": 40011000,
|
||||||
"bossmodel": 51002,
|
"heroexp": 137,
|
||||||
"boss": [
|
"boss": [
|
||||||
404033
|
404033
|
||||||
],
|
],
|
||||||
@ -2933,7 +2933,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"drop": 40012000,
|
"drop": 40012000,
|
||||||
"bossmodel": 51002,
|
"heroexp": 138,
|
||||||
"boss": [
|
"boss": [
|
||||||
404036
|
404036
|
||||||
],
|
],
|
||||||
|
@ -5864,7 +5864,7 @@
|
|||||||
"decompose_deplete": [],
|
"decompose_deplete": [],
|
||||||
"decompose_get": [],
|
"decompose_get": [],
|
||||||
"access": [
|
"access": [
|
||||||
1128
|
122
|
||||||
],
|
],
|
||||||
"use_skip": 139,
|
"use_skip": 139,
|
||||||
"upper_limit": 0,
|
"upper_limit": 0,
|
||||||
|
@ -36,7 +36,8 @@ type (
|
|||||||
CheckTaskCond(session IUserSession, id int32)
|
CheckTaskCond(session IUserSession, id int32)
|
||||||
CheckMlineCond(session IUserSession, id int32)
|
CheckMlineCond(session IUserSession, id int32)
|
||||||
|
|
||||||
CheckFriendCond(session IUserSession, id int32)
|
// 校验好友数量判断功能是否开启
|
||||||
|
CheckFriendCond(session IUserSession, num int32)
|
||||||
// 查询opencond 配置
|
// 查询opencond 配置
|
||||||
CheckOpenCondCfgById(uid string, id string) (bOpen bool, errdata *pb.ErrorData)
|
CheckOpenCondCfgById(uid string, id string) (bOpen bool, errdata *pb.ErrorData)
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,9 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
|
|||||||
oldDifficulty int32 // 记录
|
oldDifficulty int32 // 记录
|
||||||
consumPs int32
|
consumPs int32
|
||||||
userExp int32
|
userExp int32
|
||||||
|
changExp map[string]int32
|
||||||
)
|
)
|
||||||
|
changExp = map[string]int32{}
|
||||||
mapData = make(map[string]interface{}, 0)
|
mapData = make(map[string]interface{}, 0)
|
||||||
reward = make([]*cfg.Gameatn, 0)
|
reward = make([]*cfg.Gameatn, 0)
|
||||||
if errdata = this.ChallengeOverCheck(session, req); errdata != nil {
|
if errdata = this.ChallengeOverCheck(session, req); errdata != nil {
|
||||||
@ -139,7 +141,16 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
|
|||||||
if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
|
if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
// 加经验
|
||||||
|
if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 {
|
||||||
|
for _, v := range req.Report.Info.Redflist[0].Team {
|
||||||
|
if cfgHunting.Heroexp > 0 && !v.Ishelp { // 助战英雄不加经验
|
||||||
|
this.module.ModuleHero.AddHeroExp(session, v.Oid, cfgHunting.Heroexp)
|
||||||
|
changExp[v.HeroID] = cfgHunting.Heroexp
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
errdata = this.module.ModifyHuntingData(session.GetUserId(), mapData)
|
errdata = this.module.ModifyHuntingData(session.GetUserId(), mapData)
|
||||||
userExp, _ = this.module.ModuleUser.ConsumePsAddExp(session, consumPs)
|
userExp, _ = this.module.ModuleUser.ConsumePsAddExp(session, consumPs)
|
||||||
session.SendMsg(string(this.module.GetType()), HuntingChallengeOverResp, &pb.HuntingChallengeOverResp{
|
session.SendMsg(string(this.module.GetType()), HuntingChallengeOverResp, &pb.HuntingChallengeOverResp{
|
||||||
@ -147,6 +158,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
|
|||||||
Asset: atno,
|
Asset: atno,
|
||||||
Sell: del,
|
Sell: del,
|
||||||
UserExp: userExp,
|
UserExp: userExp,
|
||||||
|
Heroexp: changExp,
|
||||||
})
|
})
|
||||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype80, 1, req.BossType, req.Difficulty))
|
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype80, 1, req.BossType, req.Difficulty))
|
||||||
// 随机任务统计
|
// 随机任务统计
|
||||||
|
@ -5,6 +5,7 @@ import (
|
|||||||
"go_dreamfactory/comm"
|
"go_dreamfactory/comm"
|
||||||
"go_dreamfactory/lego/base"
|
"go_dreamfactory/lego/base"
|
||||||
"go_dreamfactory/lego/core"
|
"go_dreamfactory/lego/core"
|
||||||
|
"go_dreamfactory/lego/sys/event"
|
||||||
"go_dreamfactory/modules"
|
"go_dreamfactory/modules"
|
||||||
"go_dreamfactory/pb"
|
"go_dreamfactory/pb"
|
||||||
cfg "go_dreamfactory/sys/configure/structs"
|
cfg "go_dreamfactory/sys/configure/structs"
|
||||||
@ -36,6 +37,7 @@ func (this *ModuleSys) OnInstallComp() {
|
|||||||
func (this *ModuleSys) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
|
func (this *ModuleSys) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
|
||||||
err = this.ModuleBase.Init(service, module, options)
|
err = this.ModuleBase.Init(service, module, options)
|
||||||
this.service = service.(base.IRPCXService)
|
this.service = service.(base.IRPCXService)
|
||||||
|
event.Register(comm.EventFriendChange, this.FriendCountChange)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -69,13 +71,13 @@ func (this *ModuleSys) CheckMlineCond(session comm.IUserSession, id int32) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *ModuleSys) CheckFriendCond(session comm.IUserSession, id int32) {
|
func (this *ModuleSys) CheckTaskCond(session comm.IUserSession, id int32) {
|
||||||
if cond := this.configure.getFriendTask(id); len(cond) > 0 {
|
if cond := this.configure.getOpencondTask(id); len(cond) > 0 {
|
||||||
this.AutoActivate(session, cond)
|
this.AutoActivate(session, cond)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (this *ModuleSys) CheckTaskCond(session comm.IUserSession, num int32) {
|
func (this *ModuleSys) CheckFriendCond(session comm.IUserSession, num int32) {
|
||||||
if cond := this.configure.getOpencondTask(num); len(cond) > 0 {
|
if cond := this.configure.getFriendTask(num); len(cond) > 0 {
|
||||||
// 通知本服
|
// 通知本服
|
||||||
ctx, _ := context.WithTimeout(context.Background(), time.Second*5)
|
ctx, _ := context.WithTimeout(context.Background(), time.Second*5)
|
||||||
_, err := this.service.RpcGo(
|
_, err := this.service.RpcGo(
|
||||||
@ -156,3 +158,17 @@ func (this *ModuleSys) OpenCond(ctx context.Context, req *pb.RPCFriendNumReq, re
|
|||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (this *ModuleSys) FriendCountChange(uid string, count int32) {
|
||||||
|
if cond := this.configure.getFriendTask(count); len(cond) > 0 {
|
||||||
|
if session, ok := this.GetUserSession(uid); ok {
|
||||||
|
this.AutoActivate(session, cond)
|
||||||
|
if err := session.Push(); err != nil {
|
||||||
|
this.Errorln(err)
|
||||||
|
}
|
||||||
|
this.PutUserSession(session)
|
||||||
|
} else {
|
||||||
|
this.PutUserSession(session)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -325,10 +325,11 @@ type HuntingChallengeOverResp struct {
|
|||||||
sizeCache protoimpl.SizeCache
|
sizeCache protoimpl.SizeCache
|
||||||
unknownFields protoimpl.UnknownFields
|
unknownFields protoimpl.UnknownFields
|
||||||
|
|
||||||
Data *DBHunting `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
|
Data *DBHunting `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
|
||||||
Asset []*UserAtno `protobuf:"bytes,2,rep,name=asset,proto3" json:"asset"` // 推送atno
|
Asset []*UserAtno `protobuf:"bytes,2,rep,name=asset,proto3" json:"asset"` // 推送atno
|
||||||
Sell []string `protobuf:"bytes,3,rep,name=sell,proto3" json:"sell"` // 自动出售的装备
|
Sell []string `protobuf:"bytes,3,rep,name=sell,proto3" json:"sell"` // 自动出售的装备
|
||||||
UserExp int32 `protobuf:"varint,4,opt,name=userExp,proto3" json:"userExp"`
|
UserExp int32 `protobuf:"varint,4,opt,name=userExp,proto3" json:"userExp"`
|
||||||
|
Heroexp map[string]int32 `protobuf:"bytes,5,rep,name=heroexp,proto3" json:"heroexp" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 英雄获得经验
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *HuntingChallengeOverResp) Reset() {
|
func (x *HuntingChallengeOverResp) Reset() {
|
||||||
@ -391,6 +392,13 @@ func (x *HuntingChallengeOverResp) GetUserExp() int32 {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *HuntingChallengeOverResp) GetHeroexp() map[string]int32 {
|
||||||
|
if x != nil {
|
||||||
|
return x.Heroexp
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// 购买
|
// 购买
|
||||||
type HuntingBuyReq struct {
|
type HuntingBuyReq struct {
|
||||||
state protoimpl.MessageState
|
state protoimpl.MessageState
|
||||||
@ -629,7 +637,7 @@ var file_hunting_hunting_msg_proto_rawDesc = []byte{
|
|||||||
0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
|
0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
|
||||||
0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52,
|
0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52,
|
||||||
0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x18, 0x05, 0x20,
|
0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x18, 0x05, 0x20,
|
||||||
0x01, 0x28, 0x08, 0x52, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x22, 0x89, 0x01, 0x0a, 0x18, 0x48, 0x75,
|
0x01, 0x28, 0x08, 0x52, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x22, 0x87, 0x02, 0x0a, 0x18, 0x48, 0x75,
|
||||||
0x6e, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76,
|
0x6e, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76,
|
||||||
0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
|
0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
|
||||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67,
|
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67,
|
||||||
@ -638,22 +646,30 @@ var file_hunting_hunting_msg_proto_rawDesc = []byte{
|
|||||||
0x52, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x65, 0x6c, 0x6c, 0x18,
|
0x52, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x65, 0x6c, 0x6c, 0x18,
|
||||||
0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x73, 0x65, 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x75,
|
0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x73, 0x65, 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x75,
|
||||||
0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73,
|
0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73,
|
||||||
0x65, 0x72, 0x45, 0x78, 0x70, 0x22, 0x25, 0x0a, 0x0d, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67,
|
0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x40, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70,
|
||||||
0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
|
0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67,
|
||||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x30, 0x0a, 0x0e,
|
0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73,
|
||||||
0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e,
|
0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07,
|
||||||
0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44,
|
0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65,
|
||||||
0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x48,
|
0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
|
||||||
0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73,
|
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
|
||||||
0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65,
|
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
|
||||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65,
|
0x02, 0x38, 0x01, 0x22, 0x25, 0x0a, 0x0d, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75,
|
||||||
0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
|
0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20,
|
||||||
0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x3b, 0x0a, 0x13, 0x48, 0x75, 0x6e, 0x74,
|
0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x30, 0x0a, 0x0e, 0x48, 0x75,
|
||||||
0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
|
0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04,
|
||||||
0x24, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e,
|
0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x48,
|
||||||
0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05,
|
0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x48, 0x0a, 0x12,
|
||||||
0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
|
0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52,
|
||||||
0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01,
|
||||||
|
0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16,
|
||||||
|
0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
|
||||||
|
0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x3b, 0x0a, 0x13, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e,
|
||||||
|
0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a,
|
||||||
|
0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44,
|
||||||
|
0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 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,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -668,7 +684,7 @@ func file_hunting_hunting_msg_proto_rawDescGZIP() []byte {
|
|||||||
return file_hunting_hunting_msg_proto_rawDescData
|
return file_hunting_hunting_msg_proto_rawDescData
|
||||||
}
|
}
|
||||||
|
|
||||||
var file_hunting_hunting_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
|
var file_hunting_hunting_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
|
||||||
var file_hunting_hunting_msg_proto_goTypes = []interface{}{
|
var file_hunting_hunting_msg_proto_goTypes = []interface{}{
|
||||||
(*HuntingGetListReq)(nil), // 0: HuntingGetListReq
|
(*HuntingGetListReq)(nil), // 0: HuntingGetListReq
|
||||||
(*HuntingGetListResp)(nil), // 1: HuntingGetListResp
|
(*HuntingGetListResp)(nil), // 1: HuntingGetListResp
|
||||||
@ -680,27 +696,29 @@ var file_hunting_hunting_msg_proto_goTypes = []interface{}{
|
|||||||
(*HuntingBuyResp)(nil), // 7: HuntingBuyResp
|
(*HuntingBuyResp)(nil), // 7: HuntingBuyResp
|
||||||
(*HuntingRankListReq)(nil), // 8: HuntingRankListReq
|
(*HuntingRankListReq)(nil), // 8: HuntingRankListReq
|
||||||
(*HuntingRankListResp)(nil), // 9: HuntingRankListResp
|
(*HuntingRankListResp)(nil), // 9: HuntingRankListResp
|
||||||
(*DBHunting)(nil), // 10: DBHunting
|
nil, // 10: HuntingChallengeOverResp.HeroexpEntry
|
||||||
(*BattleFormation)(nil), // 11: BattleFormation
|
(*DBHunting)(nil), // 11: DBHunting
|
||||||
(*BattleInfo)(nil), // 12: BattleInfo
|
(*BattleFormation)(nil), // 12: BattleFormation
|
||||||
(*BattleReport)(nil), // 13: BattleReport
|
(*BattleInfo)(nil), // 13: BattleInfo
|
||||||
(*UserAtno)(nil), // 14: UserAtno
|
(*BattleReport)(nil), // 14: BattleReport
|
||||||
(*DBHuntingRank)(nil), // 15: DBHuntingRank
|
(*UserAtno)(nil), // 15: UserAtno
|
||||||
|
(*DBHuntingRank)(nil), // 16: DBHuntingRank
|
||||||
}
|
}
|
||||||
var file_hunting_hunting_msg_proto_depIdxs = []int32{
|
var file_hunting_hunting_msg_proto_depIdxs = []int32{
|
||||||
10, // 0: HuntingGetListResp.data:type_name -> DBHunting
|
11, // 0: HuntingGetListResp.data:type_name -> DBHunting
|
||||||
11, // 1: HuntingChallengeReq.battle:type_name -> BattleFormation
|
12, // 1: HuntingChallengeReq.battle:type_name -> BattleFormation
|
||||||
12, // 2: HuntingChallengeResp.info:type_name -> BattleInfo
|
13, // 2: HuntingChallengeResp.info:type_name -> BattleInfo
|
||||||
13, // 3: HuntingChallengeOverReq.report:type_name -> BattleReport
|
14, // 3: HuntingChallengeOverReq.report:type_name -> BattleReport
|
||||||
10, // 4: HuntingChallengeOverResp.data:type_name -> DBHunting
|
11, // 4: HuntingChallengeOverResp.data:type_name -> DBHunting
|
||||||
14, // 5: HuntingChallengeOverResp.asset:type_name -> UserAtno
|
15, // 5: HuntingChallengeOverResp.asset:type_name -> UserAtno
|
||||||
10, // 6: HuntingBuyResp.data:type_name -> DBHunting
|
10, // 6: HuntingChallengeOverResp.heroexp:type_name -> HuntingChallengeOverResp.HeroexpEntry
|
||||||
15, // 7: HuntingRankListResp.ranks:type_name -> DBHuntingRank
|
11, // 7: HuntingBuyResp.data:type_name -> DBHunting
|
||||||
8, // [8:8] is the sub-list for method output_type
|
16, // 8: HuntingRankListResp.ranks:type_name -> DBHuntingRank
|
||||||
8, // [8:8] is the sub-list for method input_type
|
9, // [9:9] is the sub-list for method output_type
|
||||||
8, // [8:8] is the sub-list for extension type_name
|
9, // [9:9] is the sub-list for method input_type
|
||||||
8, // [8:8] is the sub-list for extension extendee
|
9, // [9:9] is the sub-list for extension type_name
|
||||||
0, // [0:8] is the sub-list for field type_name
|
9, // [9:9] is the sub-list for extension extendee
|
||||||
|
0, // [0:9] is the sub-list for field type_name
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() { file_hunting_hunting_msg_proto_init() }
|
func init() { file_hunting_hunting_msg_proto_init() }
|
||||||
@ -839,7 +857,7 @@ func file_hunting_hunting_msg_proto_init() {
|
|||||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||||
RawDescriptor: file_hunting_hunting_msg_proto_rawDesc,
|
RawDescriptor: file_hunting_hunting_msg_proto_rawDesc,
|
||||||
NumEnums: 0,
|
NumEnums: 0,
|
||||||
NumMessages: 10,
|
NumMessages: 11,
|
||||||
NumExtensions: 0,
|
NumExtensions: 0,
|
||||||
NumServices: 0,
|
NumServices: 0,
|
||||||
},
|
},
|
||||||
|
@ -19,7 +19,7 @@ type GameHuntingBossData struct {
|
|||||||
Firstprize []*Gameatn
|
Firstprize []*Gameatn
|
||||||
Dropshow []*Gameatn
|
Dropshow []*Gameatn
|
||||||
Drop int32
|
Drop int32
|
||||||
Bossmodel int32
|
Heroexp int32
|
||||||
Boss []int32
|
Boss []int32
|
||||||
PsConsume []*Gameatn
|
PsConsume []*Gameatn
|
||||||
PsMg []*Gameatn
|
PsMg []*Gameatn
|
||||||
@ -67,7 +67,7 @@ func (_v *GameHuntingBossData)Deserialize(_buf map[string]interface{}) (err erro
|
|||||||
}
|
}
|
||||||
|
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) }
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) }
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossmodel"].(float64); !_ok_ { err = errors.New("bossmodel error"); return }; _v.Bossmodel = int32(_tempNum_) }
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) }
|
||||||
{
|
{
|
||||||
var _arr_ []interface{}
|
var _arr_ []interface{}
|
||||||
var _ok_ bool
|
var _ok_ bool
|
||||||
|
Loading…
Reference in New Issue
Block a user