更新配置

bin/json/game_opencond.json

@@ -1364,5 +1364,31 @@
       "text": "功能暂未开启"
     },
     "uiid": 0
+  },
+  {
+    "id": "mainline_elite",
+    "name": {
+      "key": "num_2031",
+      "text": "主线关卡-困难"
+    },
+    "main": [
+      {
+        "key": "platlv",
+        "param": 5
+      },
+      {
+        "key": "maxmapid",
+        "param": 1
+      }
+    ],
+    "optional": "",
+    "wkqbx": 0,
+    "kqbx": 0,
+    "img": "zc_icon_01",
+    "prompt": {
+      "key": "opencond_prompt_mainline_elite",
+      "text": "功能暂未开启"
+    },
+    "uiid": 0
   }
 ]

modules/task/model_active.go

@@ -91,6 +91,11 @@ func (this *ModelTaskActive) getActiveListByTag(uid string, taskTag comm.TaskTag
 
 // 查询完成的且未领取的任务 发现未领取返回true
 func (this *ModelTaskActive) noReceiveTaskActive(uid string, taskTag comm.TaskTag) (bool, error) {
+	// 获取玩家活跃度
+	expand, err := this.moduleTask.ModuleUser.GetUserExpand(uid)
+	if err != nil {
+		return false, err
+	}
 	task := &pb.DBActivity{}
 	if err := this.Get(uid, task); err != nil {
 		this.moduleTask.Errorf("getTaskActivityList err %v", err)
@@ -99,7 +104,19 @@ func (this *ModelTaskActive) noReceiveTaskActive(uid string, taskTag comm.TaskTa
 
 	for _, v := range task.ActivityList {
 		if v.Tag == int32(taskTag) && v.Received == 0 {
-			return true, nil
+			conf := this.moduleTask.configure.getTaskActiveById(v.TaskId)
+			if conf != nil && expand != nil {
+				switch taskTag {
+				case comm.TASK_DAILY:
+					if expand.Activeday >= conf.Active {
+						return true, nil
+					}
+				case comm.TASK_WEEKLY:
+					if expand.Activeweek >= conf.Active {
+						return true, nil
+					}
+				}
+			}
 		}
 	}
 	return false, nil
@@ -130,7 +147,7 @@ func (this *ModelTaskActive) clearTask(uid string, taskTag ...comm.TaskTag) {
 		return
 	}
 	data := this.getActiveList(uid)
-	for i:=0; i<len(data); i++ {
+	for i := 0; i < len(data); i++ {
 		if data[i].Tag == int32(taskTag[0]) {
 			data = append(data[:i], data[i+1:]...)
 			i--