Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
f64ffa6b30
@ -332,7 +332,8 @@ const (
|
|||||||
|
|
||||||
//开服任务
|
//开服任务
|
||||||
Tablekftask = "kftask"
|
Tablekftask = "kftask"
|
||||||
|
//累充活动
|
||||||
|
TablekRecharge = "recharge"
|
||||||
//守护者任务
|
//守护者任务
|
||||||
TableHerotask = "herotask"
|
TableHerotask = "herotask"
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ type ModelRecharge struct {
|
|||||||
|
|
||||||
func (this *ModelRecharge) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
|
func (this *ModelRecharge) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
|
||||||
err = this.MCompModel.Init(service, module, comp, options)
|
err = this.MCompModel.Init(service, module, comp, options)
|
||||||
this.TableName = comm.Tablekftask
|
this.TableName = comm.TablekRecharge
|
||||||
this.module = module.(*AddRecharge)
|
this.module = module.(*AddRecharge)
|
||||||
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
|
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
|
||||||
Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
|
Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
|
||||||
|
@ -71,7 +71,7 @@ func (this *configureComp) getActiveReward(integral int32) (result *cfg.GameAren
|
|||||||
this.module.Errorln(err)
|
this.module.Errorln(err)
|
||||||
} else {
|
} else {
|
||||||
for _, v := range v.(*cfg.GameArenaActiveReward).GetDataMap() {
|
for _, v := range v.(*cfg.GameArenaActiveReward).GetDataMap() {
|
||||||
if integral >= v.ScoreLow && integral < v.ScoreUp {
|
if integral >= v.ScoreLow && integral <= v.ScoreUp {
|
||||||
result = v
|
result = v
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user