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

modules/arena/module.go

@@ -13,6 +13,8 @@ import (
 	cfg "go_dreamfactory/sys/configure/structs"
 )
 
+var _ comm.IArena = (*Arena)(nil)
+
 const moduleName = "竞技场"
 
 /*
@@ -94,12 +96,15 @@ func (this *Arena) Rpc_ModuleArenaModifyIntegral(ctx context.Context, args *pb.R
 }
 
 //红点需求
-func (this *Arena) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (result map[comm.ReddotType]bool) {
+func (this *Arena) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (result map[comm.ReddotType]*pb.ReddotItem) {
-	result = make(map[comm.ReddotType]bool)
+	result = make(map[comm.ReddotType]*pb.ReddotItem)
 	for _, v := range rid {
 		switch v {
 		case comm.Reddot22102:
-			result[comm.Reddot22102] = this.modelArena.reddot(session)
+			result[comm.Reddot22102] = &pb.ReddotItem{
+				Rid: int32(comm.Reddot22102),
+			}
+			result[comm.Reddot22102].Activated = this.modelArena.reddot(session)
 			break
 		}
 	}

modules/horoscope/module.go

@@ -13,6 +13,9 @@ import (
 描述:全局属性增幅器
 开发:李伟
 */
+
+var _ comm.IHoroscope = (*Horoscope)(nil)
+
 func NewModule() core.IModule {
 	m := new(Horoscope)
 	return m
@@ -59,12 +62,15 @@ func (this *Horoscope) ComputeHeroNumeric(uid string, hero ...*pb.DBHero) {
 }
 
 //红点需求
-func (this *Horoscope) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (result map[comm.ReddotType]bool) {
+func (this *Horoscope) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (result map[comm.ReddotType]*pb.ReddotItem) {
-	result = make(map[comm.ReddotType]bool)
+	result = make(map[comm.ReddotType]*pb.ReddotItem)
 	for _, v := range rid {
 		switch v {
 		case comm.Reddot17:
-			result[comm.Reddot17] = this.modelHoroscope.reddot(session)
+			result[comm.Reddot17] = &pb.ReddotItem{
+				Rid:       int32(comm.Reddot17),
+				Activated: this.modelHoroscope.reddot(session),
+			}
 			break
 		}
 	}

modules/parkour/module.go

@@ -22,6 +22,9 @@ import (
 描述:捕羊大赛
 开发:李伟
 */
+
+var _ comm.IParkour = (*Parkour)(nil)
+
 func NewModule() core.IModule {
 	m := new(Parkour)
 	return m

modules/practice/module.go

@@ -21,6 +21,9 @@ import (
 描述:熊猫武馆 主系统 打桩 以及武馆相关数据管理
 开发:李伟
 */
+
+var _ comm.IPractice = (*Practice)(nil)
+
 func NewModule() core.IModule {
 	m := new(Practice)
 	return m