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

comm/imodule.go

@@ -82,8 +82,6 @@ type (
 		InitTaskAll(uid string)
 		//清空任务
 		ResetTask(uid string, taskTag TaskTag)
-		//监听任务
-		ListenTask()
 		//任务通知
 		SendToTask(session IUserSession, taskType TaskType, param *pb.TaskParam) (code pb.ErrorCode)
 		// 清理玩家任务数据

modules/hero/api_drawCard.go

@@ -7,6 +7,7 @@ import (
 	cfg "go_dreamfactory/sys/configure/structs"
 	"math"
 	"math/big"
+	"strconv"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -35,11 +36,8 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 	rsp := &pb.HeroDrawCardResp{}
 	this.module.Debugf("当前4星抽卡没中次数:%d, 当前5星抽卡没中次数:%d", curStar4Count, curStar5Count)
 
-	rst, err := this.module.modelHero.GetUserRecord(session.GetUserId())
+	rst, _ := this.module.modelHero.GetUserRecord(session.GetUserId())
-	if err != nil {
+	if req.DrawType%2 == 0 { // 转成对应阵营信息 1~5
-
-	}
-	if req.DrawType%2 == 0 { // 转成对应阵营信息
 		race = int32((int(req.DrawType)) / 2)
 	} else {
 		race = int32(int(req.DrawType+1) / 2)
@@ -60,24 +58,24 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 		curStar4Count = rst.Race4.H4
 		curStar5Count = rst.Race4.H5
 	}
-
-	// 抽卡相关
 	// 获取配置文件的权重信息
 	_conf, err := this.module.configure.GetHeroDrawConfig(race)
 	if err != nil {
-		code = pb.ErrorCode_ConfigNoFound
+		code = pb.ErrorCode_DrawCardTypeNotFound // 抽卡类型不匹配
 		return
 	}
 
-	_costConf, err := this.module.configure.GetDrawCostConfigByID(req.DrawType)
+	_costConf, err := this.module.configure.GetDrawCostConfigByID(req.DrawType) // 抽卡消耗
 	if err != nil {
 		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
 	config4Count = _costConf.Floor4 // 4星保底次数
-	config5Count = _costConf.Floor5             // 五星保底次数
+	config5Count = _costConf.Floor5 // 5星保底次数
-	if config4Count == 0 || config5Count == 0 { // 数量为0 设置最大
+	if config4Count == 0 {          // 数量为0 设置最大
 		config5Count = math.MaxInt32
+	}
+	if config5Count == 0 {
 		config4Count = math.MaxInt32
 	}
 	sz := make([]*cfg.Game_atn, 0)
@@ -166,23 +164,15 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 		H5: curStar5Count,
 	}
 	// 更新record 配置信息
-	update := map[string]interface{}{
+	update := map[string]interface{}{}
-		"race0": raceData,
-	}
 
-	if race == 0 { // 获取4，5星抽取次数
+	update["race"+strconv.Itoa(int(race)-1)] = raceData
-		update["race0"] = raceData
-	} else if race == 1 {
-		update["race1"] = raceData
-	} else if race == 2 {
-		update["race2"] = raceData
-	} else if race == 3 {
-		update["race3"] = raceData
-	} else if race == 4 {
-		update["race4"] = raceData
-	}
 	this.module.modelHero.ChangeUserRecord(session.GetUserId(), update)
-
+	// 消耗道具
+	code = this.module.ConsumeRes(session, sz, true)
+	if code != pb.ErrorCode_Success {
+		return
+	}
 	if err := this.module.modelHero.createMultiHero(session.GetUserId(), szCards...); err != nil {
 		code = pb.ErrorCode_HeroCreate
 		return

modules/items/api_sellItem.go

@@ -10,7 +10,7 @@ import (
 
 //参数校验
 func (this *apiComp) SellItemCheck(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode) {
-	if req.GridId != "" || req.Amount <= 0 {
+	if req.GridId == "" || req.Amount <= 0 {
 		code = pb.ErrorCode_ReqParameterError
 	}
 	return
@@ -41,8 +41,9 @@ func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemRe
 		return
 	}
 	sale = make([]*cfg.Game_atn, len(itemcf.Sale))
-	for _, v := range sale {
+	for i, v := range itemcf.Sale {
-		v.N = v.N * int32(req.Amount)
+		sale[i] = v
+		sale[i].N = v.N * int32(req.Amount)
 	}
 	if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success {
 		return

modules/items/api_useItem.go

@@ -10,7 +10,7 @@ import (
 
 //参数校验
 func (this *apiComp) UseitemCheck(session comm.IUserSession, req *pb.ItemsUseItemReq) (code pb.ErrorCode) {
-	if req.GridId != "" || req.Amount <= 0 {
+	if req.GridId == "" || req.Amount <= 0 {
 		code = pb.ErrorCode_ReqParameterError
 	}
 	return
@@ -36,14 +36,11 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
 		return
 	}
 	switch itemcf.Usetype {
-	case 6:
+	case 4:
-		if prop, err = this.module.configure.GetPropsgroupConfigure(itemcf.BoxId); err != nil {
+		sale := make([]*cfg.Game_atn, len(itemcf.Sale))
-			code = pb.ErrorCode_ConfigNoFound
+		for i, v := range itemcf.Sale {
-			return
+			sale[i] = v
-		}
+			sale[i].N = v.N * int32(req.Amount)
-		sale := make([]*cfg.Game_atn, len(prop.Prize))
-		for _, v := range sale {
-			v.N = v.N * int32(req.Amount)
 		}
 		if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success {
 			return

modules/task/model_task.go

@@ -18,7 +18,6 @@ const ( //Redis
 type ModelTask struct {
 	modules.MCompModel
 	moduleTask *ModuleTask
-
 }
 
 func (this *ModelTask) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
@@ -59,14 +58,10 @@ func (this *ModelTask) getTaskTypeList(uid string, taskType comm.TaskType) (newl
 	return
 }
 
-//任务处理器注册
-
 //初始化任务
 func (this *ModelTask) initTask(uid string) error {
 	if data, err := this.moduleTask.configure.getTaskList(); err == nil {
 		for _, cnf := range data {
-			//注册任务处理器
-			
 			//初始玩家任务数据
 			objId := primitive.NewObjectID().Hex()
 			task := &pb.DBTask{
@@ -245,3 +240,15 @@ func (this *ModelTask) inStrategy(uid string, heroCfgId int32) (taskIds []int32,
 
 	return
 }
+
+func (this *ModelTask) UpEquip() {
+
+}
+
+func (this *ModelTask) UpHeroStar() {
+
+}
+
+func (this *ModelTask) UpHeroLevel() {
+
+}

modules/task/module.go

@@ -27,6 +27,7 @@ func (this *ModuleTask) GetType() core.M_Modules {
 
 func (this *ModuleTask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
 	err = this.ModuleBase.Init(service, module, options)
+	// this.initTaskHandle()
 	return
 }
 
@@ -89,6 +90,7 @@ func (this *ModuleTask) CreateTaskForStrategy(uid string, heroCfgId int32) {
 
 }
 
+// 清理任务数据
 func (this *ModuleTask) CleanData(uid string) {
 	this.modelTask.clearTask(uid, comm.TASK_DAILY)
 	this.modelTask.clearTask(uid, comm.TASK_WEEKLY)
@@ -98,3 +100,28 @@ func (this *ModuleTask) CleanData(uid string) {
 	this.modelTaskActive.clearTask(uid, comm.TASK_DAILY)
 	this.modelTaskActive.clearTask(uid, comm.TASK_WEEKLY)
 }
+
+//任务处理器注册
+type taskHandle func()
+
+func (this *ModuleTask) register(taskType comm.TaskType, fn taskHandle) {
+
+}
+
+func (this *ModuleTask) initTaskHandle() {
+	if data, err := this.configure.getTaskList(); err == nil {
+		for _, v := range data {
+			switch v.TypeId {
+			case int32(comm.TaskTypeUpEquip):
+				this.register(comm.TaskTypeUpEquip, this.modelTask.UpEquip)
+			case int32(comm.TaskTypeUpHeroStar):
+				this.register(comm.TaskTypeUpEquip, this.modelTask.UpHeroStar)
+			case int32(comm.TaskTypeUpHeroLevel):
+				this.register(comm.TaskTypeUpEquip, this.modelTask.UpHeroLevel)
+			default:
+				log.Error("no ")
+			}
+
+		}
+	}
+}

pb/errorcode.pb.go

@@ -97,6 +97,7 @@ const (
 	ErrorCode_HeroAddMaxExp        ErrorCode = 1319 // 升级经验卡溢出 检查传入的数量
 	ErrorCode_HeroStarLvErr        ErrorCode = 1320 // 升星等级不够
 	ErrorCode_HeroMaxStarLv        ErrorCode = 1321 // 达到最大升星等级
+	ErrorCode_DrawCardTypeNotFound ErrorCode = 1322 // 抽卡类型不匹配
 	// equipment
 	ErrorCode_EquipmentOnFoundEquipment ErrorCode = 1400 // 未找到武器
 	ErrorCode_EquipmentLvlimitReached   ErrorCode = 1401 // 武器等级已达上限
@@ -192,6 +193,7 @@ var (
 		1319: "HeroAddMaxExp",
 		1320: "HeroStarLvErr",
 		1321: "HeroMaxStarLv",
+		1322: "DrawCardTypeNotFound",
 		1400: "EquipmentOnFoundEquipment",
 		1401: "EquipmentLvlimitReached",
 		1500: "MainlineNotFindChapter",
@@ -281,6 +283,7 @@ var (
 		"HeroAddMaxExp":             1319,
 		"HeroStarLvErr":             1320,
 		"HeroMaxStarLv":             1321,
+		"DrawCardTypeNotFound":      1322,
 		"EquipmentOnFoundEquipment": 1400,
 		"EquipmentLvlimitReached":   1401,
 		"MainlineNotFindChapter":    1500,
@@ -332,7 +335,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0xa8, 0x0e, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xc3, 0x0e, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
 	0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
 	0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
@@ -422,32 +425,34 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x61, 0x78, 0x45, 0x78, 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f,
 	0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12, 0x0a, 0x0d,
 	0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10, 0xa9, 0x0a,
-	0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46,
+	0x12, 0x19, 0x0a, 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65,
-	0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a,
+	0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45,
-	0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c,
+	0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45,
-	0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x1b,
+	0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45,
-	0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69, 0x6e,
+	0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52,
-	0x64, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d,
+	0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69,
-	0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70,
-	0xdd, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f,
+	0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
-	0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x69,
+	0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xdd, 0x0b, 0x12, 0x15, 0x0a,
-	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64,
+	0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e,
-	0x10, 0xdf, 0x0b, 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52,
+	0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
-	0x65, 0x70, 0x65, 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12, 0x1b,
+	0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xdf, 0x0b, 0x12, 0x19,
-	0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
+	0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74,
-	0x74, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54,
+	0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69,
-	0x61, 0x73, 0x6b, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x77,
-	0x73, 0x6b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61,
+	0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e,
-	0x73, 0x6b, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54,
+	0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73,
-	0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13,
+	0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e,
-	0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74,
+	0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
-	0x10, 0xc4, 0x0c, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76,
+	0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73,
-	0x65, 0x4e, 0x6f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54,
+	0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, 0x0c, 0x12, 0x16,
-	0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67,
+	0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f,
-	0x68, 0x10, 0xc6, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69,
+	0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63,
-	0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73,
+	0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc6, 0x0c, 0x12,
-	0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x42, 0x06, 0x5a, 0x04,
+	0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65,
-	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69,
+	0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/proto/errorcode.proto

@@ -80,6 +80,7 @@ enum ErrorCode {
   HeroAddMaxExp = 1319;       // 升级经验卡溢出 检查传入的数量
   HeroStarLvErr = 1320;       // 升星等级不够
   HeroMaxStarLv = 1321;       // 达到最大升星等级
+  DrawCardTypeNotFound = 1322; // 抽卡类型不匹配
 
   // equipment
   EquipmentOnFoundEquipment = 1400; // 未找到武器