From 31ec56ffbf9f36d326e368ac06b2adcf1d3902d1 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Thu, 29 Jun 2023 15:36:56 +0800
Subject: [PATCH] Rtype9

---
 bin/json/game_buriedcondi.json | 10 +++++-----
 bin/json/game_worldtask.json   | 14 +++++++-------
 modules/user/api_login.go      | 10 +++++++++-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 138ace48a..31ac65711 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -17756,15 +17756,15 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_759",
-      "text": "装备副本boss2难度2"
+      "text": "火焰泰坦难度3"
     },
     "type": 73,
     "valid": 0,
     "NPC": 10344,
     "value": 1,
     "filter": [
-      2,
-      2
+      1,
+      3
     ],
     "filter2": [
       "boss类型",
@@ -17923,7 +17923,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_766",
-      "text": "维京远征火焰泰坦难度3"
+      "text": "火焰泰坦难度4"
     },
     "type": 73,
     "valid": 0,
@@ -17931,7 +17931,7 @@
     "value": 1,
     "filter": [
       1,
-      3
+      4
     ],
     "filter2": [
       "boss类型",
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 521ebd61e..500c76b92 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -411,7 +411,7 @@
       },
       {
         "a": "item",
-        "t": "10000008",
+        "t": "10000004",
         "n": 3
       }
     ],
@@ -980,7 +980,7 @@
       },
       {
         "a": "item",
-        "t": "10000008",
+        "t": "10000004",
         "n": 3
       }
     ],
@@ -1269,7 +1269,7 @@
       },
       {
         "a": "item",
-        "t": "10000008",
+        "t": "10000004",
         "n": 3
       }
     ],
@@ -1542,7 +1542,7 @@
       },
       {
         "a": "item",
-        "t": "10000008",
+        "t": "10000004",
         "n": 3
       }
     ],
@@ -2133,7 +2133,7 @@
       },
       {
         "a": "item",
-        "t": "10000009",
+        "t": "10000005",
         "n": 2
       }
     ],
@@ -2647,7 +2647,7 @@
       },
       {
         "a": "item",
-        "t": "10000009",
+        "t": "10000005",
         "n": 4
       }
     ],
@@ -3279,7 +3279,7 @@
       },
       {
         "a": "item",
-        "t": "10000010",
+        "t": "10000006",
         "n": 2
       }
     ],
diff --git a/modules/user/api_login.go b/modules/user/api_login.go
index 52761f14b..061ebe610 100644
--- a/modules/user/api_login.go
+++ b/modules/user/api_login.go
@@ -105,6 +105,13 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
 		return
 	}
 
+	// 在logintime更新前判断是否是昨天
+	if utils.IsYestoday(user.Logintime) {
+		go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype9, 1))
+	} else {
+		this.module.ModuleBuried.ResetBuriedByType(user.Uid, comm.Rtype9)
+	}
+
 	//不是新账号
 	if !isNewUser {
 		lastLoginTime = user.Logintime
@@ -129,13 +136,14 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
 		if this.module.modelUser.isLoginFirst(lastLoginTime) {
 			this.module.ModuleHero.NoLoginDay(user.Uid, int32(utils.DiffDays(lastLoginTime, configure.Now().Unix())))
 			go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1))
-			go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype9, 1))
 			this.module.modelExpand.updateLoginDay(user.Uid, lastLoginTime)
 			// 清理点赞
 			this.module.ModuleFriend.ResetFriend(user.Uid)
 			this.module.modelSign.UserSign(session)
 		}
 
+		// 判断昨日是否登录
+
 		rsp.Data = user
 
 		// 查询玩家扩展数据