Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
16dca8f3db
File diff suppressed because it is too large
Load Diff
@ -16,7 +16,7 @@ const (
|
||||
game_buriedcondi = "game_buriedcondi.json"
|
||||
)
|
||||
|
||||
//配置管理组件
|
||||
// 配置管理组件
|
||||
type configureComp struct {
|
||||
modules.MCompConfigure
|
||||
module *Buried
|
||||
@ -24,7 +24,7 @@ type configureComp struct {
|
||||
group map[int32][]*cfg.GameBuriedCondiData //安排点类型 分组
|
||||
}
|
||||
|
||||
//组件初始化接口
|
||||
// 组件初始化接口
|
||||
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
|
||||
this.MCompConfigure.Init(service, module, comp, options)
|
||||
this.module = module.(*Buried)
|
||||
@ -40,7 +40,7 @@ func (this *configureComp) Start() (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
//校验配置异常
|
||||
// 校验配置异常
|
||||
func (this *configureComp) checkconfig() (err error) {
|
||||
var (
|
||||
v interface{}
|
||||
@ -77,7 +77,7 @@ func (this *configureComp) checkconfig() (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
//读取埋点配置数据
|
||||
// 读取埋点配置数据
|
||||
func (this *configureComp) getburiedtypedata(tt int32) (result *cfg.GameBuriedTypeData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
@ -96,7 +96,7 @@ func (this *configureComp) getburiedtypedata(tt int32) (result *cfg.GameBuriedTy
|
||||
return
|
||||
}
|
||||
|
||||
//读取条件任务id配置
|
||||
// 读取条件任务id配置
|
||||
func (this *configureComp) getburiedcondidata(cid int32) (result *cfg.GameBuriedCondiData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
@ -107,7 +107,7 @@ func (this *configureComp) getburiedcondidata(cid int32) (result *cfg.GameBuried
|
||||
return
|
||||
} else {
|
||||
if result, ok = v.(*cfg.GameBuriedCondi).GetDataMap()[cid]; !ok {
|
||||
err = comm.NewNotFoundConfErr(moduleName, game_buriedtype, cid)
|
||||
err = comm.NewNotFoundConfErr(moduleName, game_buriedcondi, cid)
|
||||
this.module.Errorf("err:%v", err)
|
||||
return
|
||||
}
|
||||
@ -115,7 +115,7 @@ func (this *configureComp) getburiedcondidata(cid int32) (result *cfg.GameBuried
|
||||
return
|
||||
}
|
||||
|
||||
//动态更新配置
|
||||
// 动态更新配置
|
||||
func (this *configureComp) updateconfigure() {
|
||||
if v, err := this.GetConfigure(game_buriedcondi); err != nil {
|
||||
return
|
||||
@ -138,7 +138,7 @@ func (this *configureComp) updateconfigure() {
|
||||
}
|
||||
}
|
||||
|
||||
//读取埋点条件配置
|
||||
// 读取埋点条件配置
|
||||
func (this *configureComp) getCondiDatas(tt int32) (result []*cfg.GameBuriedCondiData) {
|
||||
result = make([]*cfg.GameBuriedCondiData, 0)
|
||||
this.lock.RLock()
|
||||
|
||||
@ -52,7 +52,7 @@ func (this *Buried) Start() (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
//装备组件
|
||||
// 装备组件
|
||||
func (this *Buried) OnInstallComp() {
|
||||
this.ModuleBase.OnInstallComp()
|
||||
|
||||
@ -67,7 +67,7 @@ func (this *Buried) Rpc_ModuleBuriedTrigger(ctx context.Context, args *pb.Rpc_Mo
|
||||
return
|
||||
}
|
||||
|
||||
//激活数据采集点
|
||||
// 激活数据采集点
|
||||
func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
|
||||
var (
|
||||
conf *cfg.GameBuriedCondiData
|
||||
@ -82,6 +82,9 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
|
||||
}
|
||||
|
||||
for _, v := range condiIds {
|
||||
if v == 0 {
|
||||
continue
|
||||
}
|
||||
if conf, err = this.configure.getburiedcondidata(v); err != nil {
|
||||
return
|
||||
}
|
||||
@ -133,7 +136,7 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
//激活数据采集点
|
||||
// 激活数据采集点
|
||||
func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.ConIProgress, err error) {
|
||||
var (
|
||||
model *buriedModel
|
||||
@ -150,6 +153,9 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.
|
||||
}
|
||||
condis = make([]*pb.ConIProgress, 0)
|
||||
for _, v := range condiIds {
|
||||
if v == 0 {
|
||||
continue
|
||||
}
|
||||
if conf, err = this.configure.getburiedcondidata(v); err != nil {
|
||||
return
|
||||
}
|
||||
@ -195,7 +201,7 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.
|
||||
return
|
||||
}
|
||||
|
||||
//设置任务完成状态并校验
|
||||
// 设置任务完成状态并校验
|
||||
func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32, condiIds ...int32) (condis []*pb.ConIProgress, err error) {
|
||||
var (
|
||||
model *buriedModel
|
||||
@ -225,6 +231,9 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32,
|
||||
|
||||
condis = make([]*pb.ConIProgress, 0)
|
||||
for _, v := range finishcondiIds {
|
||||
if v == 0 {
|
||||
continue
|
||||
}
|
||||
if conf, err = this.configure.getburiedcondidata(v); err != nil {
|
||||
return
|
||||
}
|
||||
@ -280,6 +289,9 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32,
|
||||
}
|
||||
|
||||
for _, v := range condiIds {
|
||||
if v == 0 {
|
||||
continue
|
||||
}
|
||||
if conf, err = this.configure.getburiedcondidata(v); err != nil {
|
||||
return
|
||||
}
|
||||
@ -341,7 +353,7 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32,
|
||||
return
|
||||
}
|
||||
|
||||
//触发埋点
|
||||
// 触发埋点
|
||||
func (this *Buried) TriggerBuried(uid string, burieds ...*pb.BuriedParam) {
|
||||
|
||||
if db.IsCross() {
|
||||
@ -494,7 +506,7 @@ func (this *Buried) trigger(uid string, burieds ...*pb.BuriedParam) {
|
||||
}
|
||||
}
|
||||
|
||||
//更新并校验完成
|
||||
// 更新并校验完成
|
||||
func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *pb.DBBuriedItem, collec *pb.BuriedParam, cond *cfg.GameBuriedCondiData, autoActivated bool) (chanage bool, bitem *pb.DBBuriedConItem, err error) {
|
||||
var (
|
||||
ok bool
|
||||
@ -598,7 +610,7 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p
|
||||
return
|
||||
}
|
||||
|
||||
//判断埋点数据的有效性
|
||||
// 判断埋点数据的有效性
|
||||
func (this *Buried) checkburied(buried *pb.BuriedParam, bconf *cfg.GameBuriedTypeData, conf *cfg.GameBuriedCondiData) (efficient bool) {
|
||||
if !(len(buried.Filter) == len(conf.Filter) && len(bconf.Filter) == len(conf.Filter)) {
|
||||
this.Error("校验埋点错误!", log.Field{Key: "buried", Value: buried}, log.Field{Key: "conf", Value: conf})
|
||||
|
||||
@ -8,7 +8,7 @@ import (
|
||||
"go_dreamfactory/utils"
|
||||
)
|
||||
|
||||
//参数校验
|
||||
// 参数校验
|
||||
func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEquipReq) (errdata *pb.ErrorData) {
|
||||
if len(req.EquipmentId) != 8 || req.HeroCardId == "" {
|
||||
errdata = &pb.ErrorData{
|
||||
@ -19,7 +19,7 @@ func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEqui
|
||||
return
|
||||
}
|
||||
|
||||
///英雄挂在装备 code 错误码信息 data 错误附加数据
|
||||
// /英雄挂在装备 code 错误码信息 data 错误附加数据
|
||||
func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
err error
|
||||
@ -94,8 +94,9 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
|
||||
}
|
||||
|
||||
suit = nil
|
||||
for _, suit = range suits {
|
||||
if suit.Suitid == confs[i].Suittype && !suit.Effect { //找到一个未生效的套装
|
||||
for _, _suit := range suits {
|
||||
if _suit.Suitid == confs[i].Suittype && !_suit.Effect { //找到一个未生效的套装
|
||||
suit = _suit
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@ import (
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
)
|
||||
|
||||
//参数校验
|
||||
// 参数校验
|
||||
func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (errdata *pb.ErrorData) {
|
||||
if req.EquipmentId == "" {
|
||||
errdata = &pb.ErrorData{
|
||||
@ -24,7 +24,7 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUp
|
||||
return
|
||||
}
|
||||
|
||||
///英雄挂在装备
|
||||
// /英雄挂在装备
|
||||
func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
err error
|
||||
@ -229,8 +229,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
|
||||
}
|
||||
}
|
||||
suit = nil
|
||||
for _, suit = range suits {
|
||||
if suit.Suitid == confs[i].Suittype && !suit.Effect { //找到一个未生效的套装
|
||||
for _, _suit := range suits {
|
||||
if _suit.Suitid == confs[i].Suittype && !_suit.Effect { //找到一个未生效的套装
|
||||
suit = _suit
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user