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

modules/enchant/api_getlist.go

@@ -2,11 +2,13 @@ package enchant
 
 import (
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
 
+	"go.mongodb.org/mongo-driver/bson/primitive"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -28,7 +30,35 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.EnchantGetListRe
 	}
 
 	list, err := this.module.modelEnchant.getEnchantList(session.GetUserId())
-	if err != nil {
+	if mgo.MongodbNil == err {
+
+		list.Id = primitive.NewObjectID().Hex()
+		list.Uid = session.GetUserId()
+		list.Boss = make(map[int32]int64)
+		list.BossTime = make(map[int32]int32)
+
+		_cfg := this.module.configure.GetEnchantBossTypeConfigData()
+		for k := range _cfg {
+			list.BossTime[k] = 0
+		}
+
+		this.module.modelEnchant.Add(session.GetUserId(), list)
+		conf := this.module.configure.GetGlobalConf()
+		if conf == nil {
+			code = pb.ErrorCode_ConfigNoFound
+			return
+		}
+		iContt := conf.EnchantbossInitial
+		atn := conf.EnchantbossCos
+		if iContt > 0 {
+
+			this.module.DispenseRes(session, []*cfg.Gameatn{&cfg.Gameatn{
+				A: atn.A,
+				T: atn.T,
+				N: iContt,
+			}}, true)
+		}
+	} else if err != nil {
 		code = pb.ErrorCode_DBError
 		return
 	}

modules/enchant/model_enchant.go

@@ -3,7 +3,6 @@ package enchant
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
-	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
 
@@ -40,19 +39,10 @@ func (this *modelEnchant) getEnchantList(uid string) (result *pb.DBEnchant, err
 		Boss:     make(map[int32]int64),
 		BossTime: make(map[int32]int32),
 	}
-	if err = this.Get(uid, result); err != nil && mgo.MongodbNil != err {
-
+	if err = this.Get(uid, result); err != nil {
 		return
 	}
-	if mgo.MongodbNil == err {
-		if len(result.Boss) == 0 {
-			_cfg := this.module.configure.GetEnchantBossTypeConfigData()
-			for k := range _cfg {
-				result.BossTime[k] = 0
-			}
-		}
-		this.Add(uid, result)
-	}
+
 	err = nil
 	return result, err
 }

modules/worldtask/api_finish.go

@@ -108,6 +108,21 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 			)
 		}()
 
+		for _, v := range curTaskConf.Reword {
+			if v.A == comm.HeroType {
+				hero = append(hero, v.T)
+			}
+		}
+		if len(hero) > 0 {
+			ishave := this.module.ModuleUser.CheckTujianHero(session, hero)
+			for i, v := range ishave {
+				if v {
+					newhero = append(newhero, hero[i])
+				}
+			}
+		}
+		rsp.Newheros = newhero
+
 		// 完成任务
 		if err := this.module.modelWorldtask.finishTask(req.GroupId, req.TaskId, userTask); err != nil {
 			code = pb.ErrorCode_WorldtaskFinish
@@ -131,21 +146,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 			)
 		}
 
-		for _, v := range curTaskConf.Reword {
-			if v.A == comm.HeroType {
-				hero = append(hero, v.T)
-			}
-		}
-		if len(hero) > 0 {
-			ishave := this.module.ModuleUser.CheckTujianHero(session, hero)
-			for i, v := range ishave {
-				if v {
-					newhero = append(newhero, hero[i])
-				}
-			}
-		}
-		rsp.Newheros = newhero
-
 	}
 
 	//判断任务是否已完成

pb/battle_db.pb.go

@@ -90,6 +90,7 @@ const (
 	PlayType_academy      PlayType = 8  //联盟学院
 	PlayType_heroteaching PlayType = 9  //英雄教学
 	PlayType_combat       PlayType = 10 //新关卡
+	PlayType_enchant      PlayType = 11 // 附魔副本
 )
 
 // Enum value maps for PlayType.
@@ -106,6 +107,7 @@ var (
 		8:  "academy",
 		9:  "heroteaching",
 		10: "combat",
+		11: "enchant",
 	}
 	PlayType_value = map[string]int32{
 		"null":         0,
@@ -119,6 +121,7 @@ var (
 		"academy":      8,
 		"heroteaching": 9,
 		"combat":       10,
+		"enchant":      11,
 	}
 )
 
@@ -672,7 +675,7 @@ var file_battle_battle_db_proto_rawDesc = []byte{
 	0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70,
 	0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a,
 	0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x2a,
-	0x99, 0x01, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04,
+	0xa6, 0x01, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04,
 	0x6e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
 	0x6e, 0x65, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02,
 	0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68,
@@ -681,13 +684,14 @@ var file_battle_battle_db_proto_rawDesc = []byte{
 	0x61, 0x73, 0x79, 0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07,
 	0x12, 0x0b, 0x0a, 0x07, 0x61, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x10, 0x08, 0x12, 0x10, 0x0a,
 	0x0c, 0x68, 0x65, 0x72, 0x6f, 0x74, 0x65, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x10, 0x09, 0x12,
-	0x0a, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x10, 0x0a, 0x2a, 0x1f, 0x0a, 0x0c, 0x42,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69,
-	0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c,
-	0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04,
-	0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12,
-	0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x0a, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x65,
+	0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x10, 0x0b, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74,
+	0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00,
+	0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61,
+	0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04,
+	0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

services/worker/main.go

@@ -8,6 +8,7 @@ import (
 	"go_dreamfactory/modules/battle"
 	"go_dreamfactory/modules/chat"
 	"go_dreamfactory/modules/combat"
+	"go_dreamfactory/modules/enchant"
 	"go_dreamfactory/modules/equipment"
 	"go_dreamfactory/modules/forum"
 	"go_dreamfactory/modules/friend"
@@ -106,6 +107,7 @@ func main() {
 		academy.NewModule(),
 		reddot.NewModule(),
 		combat.NewModule(),
+		enchant.NewModule(),
 	)
 }