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

bin/json/game_combatbox.json

@@ -1,62 +1,62 @@
-[
+[
-  {
+  {
-    "id": 10001,
+    "id": 10001,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10002,
+    "id": 10002,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10003,
+    "id": 10003,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10004,
+    "id": 10004,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10005,
+    "id": 10005,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10006,
+    "id": 10006,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10007,
+    "id": 10007,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10008,
+    "id": 10008,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10009,
+    "id": 10009,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10010,
+    "id": 10010,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10011,
+    "id": 10011,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10012,
+    "id": 10012,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10013,
+    "id": 10013,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10014,
+    "id": 10014,
-    "drop": 1001
+    "drop": 1001
-  },
+  },
-  {
+  {
-    "id": 10015,
+    "id": 10015,
-    "drop": 1001
+    "drop": 1001
-  }
+  }
 ]

bin/json/game_combatlevel.json

@@ -1,18 +1,18 @@
 [
   {
     "id": 10001,
-    "scene": "LevelDemo",
+    "scene": "LevelDemo_Fcamer 1",
     "formatList": [
-      110211,
+      101011,
-      110212
+      101021
     ],
     "droplist": [
-      1001,
+      10001,
-      1002
+      10002
     ],
     "passformatList": [],
     "passdroplist": [
-      1002
+      10001
     ],
     "award": [
       {
@@ -30,11 +30,11 @@
       110213
     ],
     "droplist": [
-      1001
+      10002
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10002
     ],
     "award": [
       {
@@ -52,11 +52,11 @@
       110214
     ],
     "droplist": [
-      1001
+      10003
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10003
     ],
     "award": [
       {
@@ -74,11 +74,11 @@
       110215
     ],
     "droplist": [
-      1001
+      10004
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10004
     ],
     "award": [
       {
@@ -96,11 +96,11 @@
       110216
     ],
     "droplist": [
-      1001
+      10005
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10005
     ],
     "award": [
       {
@@ -118,11 +118,11 @@
       120031
     ],
     "droplist": [
-      1001
+      10006
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10006
     ],
     "award": [
       {
@@ -140,11 +140,11 @@
       120032
     ],
     "droplist": [
-      1001
+      10007
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10007
     ],
     "award": [
       {
@@ -162,11 +162,11 @@
       120033
     ],
     "droplist": [
-      1001
+      10008
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10008
     ],
     "award": [
       {
@@ -184,11 +184,11 @@
       120034
     ],
     "droplist": [
-      1001
+      10009
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10009
     ],
     "award": [
       {
@@ -206,11 +206,11 @@
       120035
     ],
     "droplist": [
-      1001
+      10010
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10010
     ],
     "award": [
       {
@@ -227,11 +227,11 @@
       120035
     ],
     "droplist": [
-      1001
+      10011
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10011
     ],
     "award": [
       {
@@ -248,11 +248,11 @@
       120036
     ],
     "droplist": [
-      1001
+      10012
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10012
     ],
     "award": [
       {
@@ -269,11 +269,11 @@
       130011
     ],
     "droplist": [
-      1001
+      10013
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10013
     ],
     "award": [
       {
@@ -290,11 +290,11 @@
       130012
     ],
     "droplist": [
-      1001
+      10014
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10014
     ],
     "award": [
       {
@@ -311,11 +311,11 @@
       130013
     ],
     "droplist": [
-      1001
+      10015
     ],
     "passformatList": [],
     "passdroplist": [
-      1001
+      10015
     ],
     "award": [
       {

bin/json/game_combatmanster.json

@@ -1,9 +1,8 @@
 [
   {
-    "id": 110211,
+    "id": 101011,
     "formatList": [
-      101071,
+      101011
-      101072
     ],
     "award": [
       {
@@ -14,9 +13,9 @@
     ]
   },
   {
-    "id": 110212,
+    "id": 101021,
     "formatList": [
-      101072
+      101021
     ],
     "award": [
       {

bin/json/game_rdtaskcondi.json

@@ -873,7 +873,7 @@
     "type": 70,
     "inited": [],
     "data1": 1,
-    "data2": 101,
+    "data2": 102,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -884,7 +884,7 @@
     "type": 70,
     "inited": [],
     "data1": 1,
-    "data2": 101,
+    "data2": 103,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -895,7 +895,7 @@
     "type": 70,
     "inited": [],
     "data1": 1,
-    "data2": 101,
+    "data2": 104,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -906,7 +906,7 @@
     "type": 70,
     "inited": [],
     "data1": 1,
-    "data2": 101,
+    "data2": 105,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -917,7 +917,7 @@
     "type": 70,
     "inited": [],
     "data1": 1,
-    "data2": 101,
+    "data2": 106,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -928,7 +928,7 @@
     "type": 70,
     "inited": [],
     "data1": 1,
-    "data2": 101,
+    "data2": 107,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -939,7 +939,7 @@
     "type": 70,
     "inited": [],
     "data1": 1,
-    "data2": 101,
+    "data2": 108,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -950,7 +950,7 @@
     "type": 70,
     "inited": [],
     "data1": 1,
-    "data2": 101,
+    "data2": 109,
     "data3": 0,
     "data4": 0,
     "data5": 0

modules/rtask/condiFindHandle.go

@@ -54,7 +54,7 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ...
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
-		if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok {
+		if ok, err1 := soEqual(vals[1], cfg.Data2); !ok {
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
@@ -63,11 +63,11 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ...
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
-		if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok {
+		if ok, err1 := soEqual(vals[1], cfg.Data2); !ok {
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
-		if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok {
+		if ok, err1 := soEqual(vals[2], cfg.Data3); !ok {
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
@@ -76,15 +76,15 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ...
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
-		if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok {
+		if ok, err1 := soEqual(vals[1], cfg.Data2); !ok {
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
-		if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok {
+		if ok, err1 := soEqual(vals[2], cfg.Data3); !ok {
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
-		if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok {
+		if ok, err1 := soEqual(vals[3], cfg.Data4); !ok {
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
@@ -93,19 +93,19 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ...
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
-		if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok {
+		if ok, err1 := soEqual(vals[1], cfg.Data2); !ok {
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
-		if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok {
+		if ok, err1 := soEqual(vals[2], cfg.Data3); !ok {
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
-		if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok {
+		if ok, err1 := soEqual(vals[3], cfg.Data4); !ok {
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}
-		if ok, err1 := soGreatEqual(vals[4], cfg.Data5); !ok {
+		if ok, err1 := soEqual(vals[4], cfg.Data5); !ok {
 			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
 			return
 		}

modules/rtask/module.go

@@ -260,7 +260,7 @@ func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.T
 		}
 		if condiId, err = v.find(v.cfg, params...); condiId == 0 {
 			if err != nil {
-				this.Warnln(errors.WithMessage(err, uid).Error())
+				this.Warn(errors.WithMessage(err, uid).Error(),log.Fields{})
 			}
 		} else {
 			condis = append(condis, v)

modules/rtask/updateHandle.go

@@ -20,11 +20,9 @@ func (this *ModelRtaskRecord) overrideUpdate(uid string, cfg *cfg.GameRdtaskCond
 	}
 
 	record := &pb.DBRtaskRecord{}
-	if err2 := this.Get(uid, record); err2 != nil {
+	if err := this.Get(uid, record); err != nil {
-		if err2 != mongo.ErrNoDocuments {
+		if err != mongo.ErrNoDocuments {
 			return errors.Wrapf(err, "获取玩家任务记录 err: %v rtype[%v]", uid, cfg.Id)
-		} else {
-			err = err2
 		}
 	}
 
@@ -33,12 +31,15 @@ func (this *ModelRtaskRecord) overrideUpdate(uid string, cfg *cfg.GameRdtaskCond
 	}
 
 	if v, ok := record.Vals[cfg.Id]; ok {
-		m := hasUpdateData(paramLen, v, vals...)
+		v.Data = hasUpdateData(paramLen, v, vals...)
-		if len(m) > 0 {
+		if len(v.Data) > 0 {
 			update := map[string]interface{}{
-				"vals": m,
+				"vals": v,
 			}
-			err = this.Change(uid, update)
+			if err = this.Change(uid, update); err != nil {
+				return
+			}
+
 		}
 	} else {
 		data := &pb.RtaskData{
@@ -51,7 +52,9 @@ func (this *ModelRtaskRecord) overrideUpdate(uid string, cfg *cfg.GameRdtaskCond
 		update := map[string]interface{}{
 			"vals": record.Vals,
 		}
-		err = this.Change(uid, update)
+		if err = this.Change(uid, update); err != nil {
+			return
+		}
 	}
 
 	this.listenTask(uid, cfg.Id)

modules/task/api_activereceive.go

@@ -2,7 +2,9 @@ package task
 
 import (
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -21,76 +23,89 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive
 	if code = this.ActiveReceiveCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}
+	uid := session.GetUserId()
+
+	// ua := this.moduleTask.modelTaskActive.getUserActive(uid, req.Id, comm.TaskTag(req.TaskTag))
+	// if ua == nil {
+	// 	code = pb.ErrorCode_TaskActiveNofound
+	// 	return
+	// }
+
+	//判断是否已领取
+	// if ua.Received == 1 {
+	// 	code = pb.ErrorCode_TaskReceived
+	// 	return
+	// }
+
+	var rewards []*cfg.Gameatn
+	// 玩家的
+	activeList := this.moduleTask.modelTaskActive.getActiveListByTag(uid, comm.TaskTag(req.TaskTag))
+	for _, v := range activeList {
+		if v.Received != 1 { //未领取
+			conf := this.moduleTask.configure.getTaskActiveById(v.RId)
+			if conf == nil {
+				code = pb.ErrorCode_ConfigNoFound
+				return
+			}
+
+			// get user expand
+			ue, err := this.moduleTask.ModuleUser.GetUserExpand(uid)
+			if err != nil {
+				code = pb.ErrorCode_DBError
+				return
+			}
+
+			if ue == nil {
+				code = pb.ErrorCode_UserExpandNull
+				return
+			}
+
+			update := make(map[string]interface{})
+			if req.TaskTag == int32(comm.TASK_DAILY) {
+				if ue.Activeday >= conf.Active {
+					update["received"] = 1
+				} else {
+					code = pb.ErrorCode_TaskActiveNoenough
+					return
+				}
+			} else if req.TaskTag == int32(comm.TASK_WEEKLY) {
+				if ue.Activeweek >= conf.Active {
+					update["received"] = 1
+				} else {
+					code = pb.ErrorCode_TaskActiveNoenough
+					return
+				}
+			}
+			if len(update) > 0 {
+				if err := this.moduleTask.modelTaskActive.updateReceive(session.GetUserId(),
+					v.Id,
+					comm.TaskTag(req.TaskTag),
+					update); err != nil {
+					this.moduleTask.Errorf("updateReceive err %v", err)
+					code = pb.ErrorCode_DBError
+					return
+				}
+			}
+			rewards = append(rewards, conf.Reword...)
+		}
+	}
+
+	if len(rewards) > 0 {
+		//派发奖励
+		if code = this.moduleTask.DispenseRes(session, rewards, true); code != pb.ErrorCode_Success {
+			this.moduleTask.Error("活跃度奖励", log.Fields{"uid": uid, "rewards": rewards, "code": code})
+		}
+	}
+
 	resp := &pb.TaskActiveReceiveResp{
 		TaskTag: req.TaskTag,
 		Id:      req.Id,
 	}
 
-	defer func() {
+	err := session.SendMsg(string(this.moduleTask.GetType()), TaskSubTypeActiveReceive, resp)
-		err := session.SendMsg(string(this.moduleTask.GetType()), TaskSubTypeActiveReceive, resp)
-		if err != nil {
-			code = pb.ErrorCode_SystemError
-		}
-	}()
-
-	ua := this.moduleTask.modelTaskActive.getUserActive(session.GetUserId(), req.Id, comm.TaskTag(req.TaskTag))
-	if ua == nil {
-		code = pb.ErrorCode_TaskActiveNofound
-		return
-	}
-
-	//判断是否已领取
-	if ua.Received == 1 {
-		code = pb.ErrorCode_TaskReceived
-		return
-	}
-
-	conf := this.moduleTask.configure.getTaskActiveById(ua.RId)
-	if conf == nil {
-		code = pb.ErrorCode_ConfigNoFound
-		return
-	}
-
-	// get user expand
-	ue, err := this.moduleTask.ModuleUser.GetUserExpand(session.GetUserId())
 	if err != nil {
-		code = pb.ErrorCode_DBError
+		code = pb.ErrorCode_SystemError
-		return
 	}
 
-	if ue == nil {
-		code = pb.ErrorCode_UserExpandNull
-		return
-	}
-
-	update := make(map[string]interface{})
-	if req.TaskTag == int32(comm.TASK_DAILY) {
-		if ue.Activeday >= conf.Active {
-			update["received"] = 1
-		} else {
-			code = pb.ErrorCode_TaskActiveNoenough
-			return
-		}
-	} else if req.TaskTag == int32(comm.TASK_WEEKLY) {
-		if ue.Activeweek >= conf.Active {
-			update["received"] = 1
-		} else {
-			code = pb.ErrorCode_TaskActiveNoenough
-			return
-		}
-	}
-	if len(update) > 0 {
-		if err := this.moduleTask.modelTaskActive.updateReceive(session.GetUserId(),
-			ua.Id,
-			comm.TaskTag(req.TaskTag),
-			update); err != nil {
-			this.moduleTask.Errorf("updateReceive err %v", err)
-			code = pb.ErrorCode_DBError
-			return
-		}
-	}
-
-	//派发奖励
-	code = this.moduleTask.DispenseRes(session, conf.Reword, true)
 	return
 }

modules/worldtask/api_battlefinish.go

@@ -22,16 +22,47 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
 		return
 	}
 
+	uid := session.GetUserId()
 	taskConf, err := this.module.configure.getWorldtaskById(req.TaskId)
 	if err != nil || taskConf == nil {
 		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
 
+	// 当前玩家世界任务
+	userTask, err := this.module.modelWorldtask.getWorldtask(uid)
+	if err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
+
 	rsp := &pb.WorldtaskBattleFinishResp{
 		TaskId: req.TaskId,
 	}
 
+	if taskConf.Completetask == 0 {
+		if err := this.module.modelWorldtask.finishTask(taskConf.Group, req.TaskId, userTask); err != nil {
+			code = pb.ErrorCode_DBError
+			this.module.Error("世界任务战斗结果", log.Fields{"uid": uid, "err": err.Error()})
+			return
+		}
+
+		if err := session.SendMsg(string(this.module.GetType()), WorldtaskBattleFinish, rsp); err != nil {
+			code = pb.ErrorCode_SystemError
+			return
+		}
+
+		if taskConf.IdAfter != 0 {
+			if err := session.SendMsg(string(this.module.GetType()), "nexttask", &pb.WorldtaskNexttaskPush{
+				NextTaskId: taskConf.IdAfter,
+			}); err != nil {
+				log.Error("任务条件达成推送", log.Fields{"uid": uid, "err": err})
+				return
+			}
+		}
+
+	}
+
 	battleModule, err := this.module.service.GetModule(comm.ModuleBattle)
 	if err != nil {
 		code = pb.ErrorCode_SystemError

modules/worldtask/module.go

@@ -163,6 +163,7 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId
 	if err != nil {
 		return err
 	}
+	mytask.Uid = uid
 	// 更新数据
 	update := map[string]interface{}{}
 
@@ -181,15 +182,14 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId
 	if taskConf.Ontxe != 0 && taskConf.IdAfter != 0 {
 		for _, v := range this.worldtaskConf.GetDataList() {
 			if v.Group == groupId && v.Key <= taskId {
-				mytask.LastTaskIds[groupId] = &pb.Worldtask{
+				wt := &pb.Worldtask{
 					TaskId:   v.Key,
 					TaskType: v.Des,
 				}
-				mytask.TaskList = append(mytask.TaskList, &pb.Worldtask{
+				mytask.LastTaskIds[groupId] = wt
-					TaskId: v.Key,
+				mytask.TaskList = append(mytask.TaskList, wt)
-				})
 			}
-			break
+
 		}
 	} else {
 		wt := &pb.Worldtask{