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

cmd/v2/ui/views/sociaty_mine.go

@@ -180,6 +180,10 @@ func (this *SociatyMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
 			return
 		}
 
+		if this.master == nil {
+			logrus.Errorf("会长数据是空,公会ID:%v", this.sociaty.Id)
+			return
+		}
 		//会长信息
 		pName := widget.NewEntry()
 		pName.Text = this.master.Name

modules/dispatch/model_dispatch.go

@@ -427,6 +427,7 @@ func (this *modelDispatch) updateNotice(uid string, dispatch *pb.DBDispatch) err
 					}
 					if nextConf != nil {
 						dispatch.Nb.Lv++
+						dispatch.Nb.TaskCount = 0
 					}
 				}
 				//累计任务数

modules/practice/api_expulsion.go

@@ -30,6 +30,7 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls
 		tconfigure      *cfg.GamePandamasJxData
 		pconfigure      *cfg.GamePandamasJxData
 		_session        comm.IUserSession
+		minutes         int32
 		filed           string
 		exp             int32
 		exp1            int32
@@ -66,10 +67,10 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls
 
 	//计算经验收益
 	if configure.Now().After(time.Unix(pillar.Expend, 0)) {
-		minutes := int32(time.Unix(pillar.Expend, 0).Sub(time.Unix(pillar.Start, 0)).Minutes())
+		minutes = int32(time.Unix(pillar.Expend, 0).Sub(time.Unix(pillar.Start, 0)).Minutes())
 		exp = minutes * pillarconfigure.MinExp
 	} else {
-		minutes := int32(configure.Now().Sub(time.Unix(pillar.Start, 0)).Minutes())
+		minutes = int32(configure.Now().Sub(time.Unix(pillar.Start, 0)).Minutes())
 		exp = minutes * pillarconfigure.MinExp
 	}
 	exp1 += exp
@@ -83,7 +84,7 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls
 				if hero, code := this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), pillar.Hero); code == pb.ErrorCode_Success {
 					if heroconf := this.module.configure.GetHeroConfig(hero.HeroID); heroconf != nil {
 						if (conf.Camp == 0 || (conf.Camp != 0 && heroconf.Race == conf.Camp)) && (conf.Occupation == 0 || (conf.Occupation != 0 && heroconf.Job == conf.Occupation)) {
-							exp1 += int32(math.Floor(float64(v/conf.Register) * float64(conf.ExpBonus) / float64(100) * float64(exp)))
+							exp1 += minutes * int32(math.Floor(float64(v/conf.Register)*float64(conf.ExpBonus))) * exp
 						}
 					}
 				}

modules/practice/api_receive.go

@@ -29,6 +29,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR
 		pillarconfigure *cfg.GamePandamasMzData
 		tconfigure      *cfg.GamePandamasJxData
 		pconfigure      *cfg.GamePandamasJxData
+		minutes         int32
 		filed           string
 		exp             int32
 		exp1            int32
@@ -93,10 +94,10 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR
 	}
 	//计算经验收益
 	if configure.Now().After(time.Unix(pillar.Expend, 0)) {
-		minutes := int32(time.Unix(pillar.Expend, 0).Sub(time.Unix(pillar.Start, 0)).Minutes())
+		minutes = int32(time.Unix(pillar.Expend, 0).Sub(time.Unix(pillar.Start, 0)).Minutes())
 		exp = minutes * pillarconfigure.MinExp
 	} else {
-		minutes := int32(configure.Now().Sub(time.Unix(pillar.Start, 0)).Minutes())
+		minutes = int32(configure.Now().Sub(time.Unix(pillar.Start, 0)).Minutes())
 		exp = minutes * pillarconfigure.MinExp
 	}
 	exp1 += exp
@@ -110,7 +111,8 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR
 				if hero, code := this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), pillar.Hero); code == pb.ErrorCode_Success {
 					if heroconf := this.module.configure.GetHeroConfig(hero.HeroID); heroconf != nil {
 						if (conf.Camp == 0 || (conf.Camp != 0 && heroconf.Race == conf.Camp)) && (conf.Occupation == 0 || (conf.Occupation != 0 && heroconf.Job == conf.Occupation)) {
-							exp1 += int32(math.Floor(float64(v/conf.Register) * float64(conf.ExpBonus) / float64(100) * float64(exp)))
+							// exp1 += int32(math.Floor(float64(v/conf.Register) * float64(conf.ExpBonus) / float64(100) * float64(exp)))
+							exp1 += minutes * int32(math.Floor(float64(v/conf.Register)*float64(conf.ExpBonus))) * exp
 						}
 					}
 				}

modules/reddot/api_get.go

@@ -49,10 +49,10 @@ func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (code
 			for k, v := range this.module.arena.Reddot(session, _rid) {
 				reddot[int32(k)] = v
 			}
-		case comm.Reddot23, comm.Reddot24, comm.Reddot25:
+		// case comm.Reddot23, comm.Reddot24, comm.Reddot25:
-			for k, v := range this.module.martialhall.Reddot(session, _rid) {
+		// 	for k, v := range this.module.martialhall.Reddot(session, _rid) {
-				reddot[int32(k)] = v
+		// 		reddot[int32(k)] = v
-			}
+		// 	}
 		case comm.Reddot20, comm.Reddot21, comm.Reddot22:
 			for k, v := range this.module.gourmet.Reddot(session, _rid) {
 				reddot[int32(k)] = v

modules/reddot/api_getall.go

@@ -34,9 +34,9 @@ func (this *apiComp) GetAll(session comm.IUserSession, req *pb.ReddotGetAllReq)
 	for k, v := range this.module.horoscope.Reddot(session, comm.Reddot17) {
 		reddot[int32(k)] = v
 	}
-	for k, v := range this.module.martialhall.Reddot(session, comm.Reddot23, comm.Reddot24, comm.Reddot25) {
+	// for k, v := range this.module.martialhall.Reddot(session, comm.Reddot23, comm.Reddot24, comm.Reddot25) {
-		reddot[int32(k)] = v
+	// 	reddot[int32(k)] = v
-	}
+	// }
 	for k, v := range this.module.arena.Reddot(session, comm.Reddot19) {
 		reddot[int32(k)] = v
 	}

modules/reddot/module.go

@@ -22,7 +22,7 @@ type Reddot struct {
 	service base.IRPCXService
 
 	pagoda comm.IPagoda
-	martialhall comm.IMartialhall
+	// martialhall comm.IMartialhall
 	horoscope comm.IHoroscope
 	arena     comm.IArena
 	gourmet   comm.IGourmet
@@ -56,10 +56,10 @@ func (this *Reddot) Start() (err error) {
 		return
 	}
 	this.pagoda = module.(comm.IPagoda)
-	if module, err = this.service.GetModule(comm.ModuleMartialhall); err != nil {
+	// if module, err = this.service.GetModule(comm.ModuleMartialhall); err != nil {
-		return
+	// 	return
-	}
+	// }
-	this.martialhall = module.(comm.IMartialhall)
+	// this.martialhall = module.(comm.IMartialhall)
 	if module, err = this.service.GetModule(comm.ModuleHoroscope); err != nil {
 		return
 	}

modules/user/model_session.go

@@ -45,12 +45,19 @@ func (this *ModelSession) getUserSession(uid string) (user *pb.CacheUser) {
 
 // 设置用户session
 func (this *ModelSession) addUserSession(uid string, session comm.IUserSession) (err error) {
-	if err = this.AddList(comm.RDS_EMPTY, uid, map[string]interface{}{
+	// if err = this.AddList(comm.RDS_EMPTY, uid, map[string]interface{}{
-		"uid":              uid,
+	// 	"uid":              uid,
-		"sessionId":        session.GetSessionId(),
+	// 	"sessionId":        session.GetSessionId(),
-		"serviceTag":       session.GetServiecTag(),
+	// 	"serviceTag":       session.GetServiecTag(),
-		"gatewayServiceId": session.GetGatewayServiceId(),
+	// 	"gatewayServiceId": session.GetGatewayServiceId(),
-		"ip":               session.GetIP(),
+	// 	"ip":               session.GetIP(),
+	// }, db.SetDBMgoLog(false)); err != nil {
+	if err = this.AddList(comm.RDS_EMPTY, uid, &pb.CacheUser{
+		Uid:              uid,
+		SessionId:        session.GetSessionId(),
+		ServiceTag:       session.GetServiecTag(),
+		GatewayServiceId: session.GetGatewayServiceId(),
+		Ip:               session.GetIP(),
 	}, db.SetDBMgoLog(false)); err != nil {
 		log.Debug("setUserSession err:%v", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err})
 		return

modules/user/module.go

@@ -110,7 +110,7 @@ func (this *User) GetUser(uid string) (user *pb.DBUser) {
 	if this.IsCross() {
 		user, err = this.getRemoteUser(uid)
 		if err != nil {
-			this.Errorln("查询远程玩家信息", err)
+			this.Errorf("查询远程玩家信息 tag:%v err:%v", this.service.GetTag(), err)
 			return nil
 		}
 	} else {

services/comp_gateroute.go

@@ -196,12 +196,19 @@ func (this *SCompGateRoute) NoticeUserLogin(ctx context.Context, args *pb.Notice
 		return err
 	}
 	model := db.NewDBModel(comm.TableSession, 0, conn)
-	model.AddList(comm.RDS_EMPTY, args.UserId, map[string]interface{}{
+	// model.AddList(comm.RDS_EMPTY, args.UserId, map[string]interface{}{
-		"uid":              args.UserId,
+	// 	"uid":              args.UserId,
-		"sessionId":        args.UserSessionId,
+	// 	"sessionId":        args.UserSessionId,
-		"serviceTag":       args.ServiceTag,
+	// 	"serviceTag":       args.ServiceTag,
-		"gatewayServiceId": args.GatewayServiceId,
+	// 	"gatewayServiceId": args.GatewayServiceId,
-		"ip":               args.Ip,
+	// 	"ip":               args.Ip,
+	// }, db.SetDBMgoLog(false))
+	model.AddList(comm.RDS_EMPTY, args.UserId, &pb.CacheUser{
+		Uid:              args.UserId,
+		SessionId:        args.UserSessionId,
+		ServiceTag:       args.ServiceTag,
+		GatewayServiceId: args.GatewayServiceId,
+		Ip:               args.Ip,
 	}, db.SetDBMgoLog(false))
 	session := this.pools.Get().(comm.IUserSession)
 	session.SetSession(args.Ip, args.UserSessionId, args.ServiceTag, args.GatewayServiceId, args.UserId)

services/worker/main.go

@@ -24,7 +24,6 @@ import (
 	"go_dreamfactory/modules/library"
 	"go_dreamfactory/modules/linestory"
 	"go_dreamfactory/modules/mail"
-	"go_dreamfactory/modules/martialhall"
 	"go_dreamfactory/modules/mline"
 	"go_dreamfactory/modules/moonfantasy"
 	"go_dreamfactory/modules/notify"
@@ -90,7 +89,7 @@ func main() {
 		forum.NewModule(),
 		pagoda.NewModule(),
 		gourmet.NewModule(),
-		martialhall.NewModule(),
+		// martialhall.NewModule(),
 		rtask.NewModule(),
 		viking.NewModule(),
 		smithy.NewModule(),

sys/db/db.go

@@ -175,7 +175,6 @@ func (this *DB) ServerDBConn(stage string) (conn *DBConn, err error) {
 	if !ok {
 		err = fmt.Errorf("DBConn:%s on init", stage)
 	}
-	log.Debug("servers", log.Field{Key: stage, Value: this.servers[stage]})
 	return
 }