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

comm/imodule.go

@@ -338,4 +338,8 @@ type (
 	IGrowtask interface {
 		BingoAllGrowTask(session IUserSession) error
 	}
+	//支付发货
+	IPayDelivery interface {
+		Delivery(session IUserSession, pid string) (code pb.ErrorCode, items []*pb.UserAssets)
+	}
 )

modules/moonfantasy/module.go

@@ -93,7 +93,14 @@ func (this *Moonfantasy) Trigger(session comm.IUserSession, source *pb.BattleRep
 		n, _ := rand.Int(rand.Reader, big.NewInt(1000))
 		if int32(n.Int64()) < triggerData.DreamlandPro {
 			if this.IsCross() {
-				this.modelDream.trigger(session)
+				go func(uid string) {
+					ss, _ := this.GetUserSession(uid)
+					this.modelDream.trigger(ss)
+					if err = ss.Push(); err != nil {
+						this.Errorln(err)
+					}
+				}(session.GetUserId())
+
 			} else {
 				if _, err = this.service.AcrossClusterRpcGo(context.Background(),
 					this.GetCrossTag(),

modules/pay/module.go

@@ -29,6 +29,7 @@ type Pay struct {
 	modelPay     *modelPayComp
 	modelPayUser *modelPayUserComp
 	modelDaily   *modelDailyComp
+	privilege    comm.IPayDelivery //月卡
 	configure    *configureComp
 }
 
@@ -45,6 +46,11 @@ func (this *Pay) Init(service core.IService, module core.IModule, options core.I
 }
 func (this *Pay) Start() (err error) {
 	err = this.ModuleBase.Start()
+	var module core.IModule
+	if module, err = this.service.GetModule(comm.ModuleMainline); err != nil {
+		return
+	}
+	this.privilege = module.(comm.IPayDelivery)
 	this.service.RegisterFunctionName(string(comm.Rpc_ModulePayDelivery), this.Rpc_ModulePayDelivery)
 	return
 }
@@ -115,6 +121,9 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery
 	case 2:
 		reply.Code, items = this.modelDaily.delivery(session, args.Productid)
 		break
+	case 3:
+		reply.Code, items = this.privilege.Delivery(session, args.Productid)
+		break
 	}
 	for _, v := range res {
 		items = append(items, &pb.UserAssets{A: v.A, T: v.T, N: v.N})
@@ -131,6 +140,6 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery
 			return
 		}
 	}
-	this.ModuleHero.RechargeMoney(session.GetUserId(), conf.Amount)
+	go this.ModuleHero.RechargeMoney(session.GetUserId(), conf.Amount)
 	return
 }