Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

comm/const.go

@@ -332,7 +332,8 @@ const (
 
 	//开服任务
 	Tablekftask = "kftask"
-
+	//累充活动
+	TablekRecharge = "recharge"
 	//守护者任务
 	TableHerotask = "herotask"
 

modules/addrecharge/modelRecharge.go

@@ -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) {
 	err = this.MCompModel.Init(service, module, comp, options)
-	this.TableName = comm.Tablekftask
+	this.TableName = comm.TablekRecharge
 	this.module = module.(*AddRecharge)
 	this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
 		Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},

modules/arena/configure.go

@@ -71,7 +71,7 @@ func (this *configureComp) getActiveReward(integral int32) (result *cfg.GameAren
 		this.module.Errorln(err)
 	} else {
 		for _, v := range v.(*cfg.GameArenaActiveReward).GetDataMap() {
-			if integral >= v.ScoreLow && integral < v.ScoreUp {
+			if integral >= v.ScoreLow && integral <= v.ScoreUp {
 				result = v
 				return
 			}