From 227fd0b654f162cd54eb6280f425c9b6c3cbabae Mon Sep 17 00:00:00 2001
From: 1 <1@72wo.cn>
Date: Tue, 23 Sep 2025 15:34:55 +0000
Subject: [PATCH] =?UTF-8?q?refactor(login):=20=E4=BC=98=E5=8C=96=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=87=8D=E7=BD=AE=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84model=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=B9=B6=E9=87=8D=E6=9E=84Talk=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/controller/login.go       | 20 ++++++++++++--------
 modules/blazing/service/reg.go  |  3 +++
 modules/blazing/service/talk.go |  5 +++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/logic/controller/login.go b/logic/controller/login.go
index b08b47af..f5d41379 100644
--- a/logic/controller/login.go
+++ b/logic/controller/login.go
@@ -11,7 +11,6 @@ import (
 	"blazing/logic/service/maps"
 	"blazing/logic/service/player"
 	"blazing/logic/service/space"
-	"blazing/modules/blazing/model"
 	blservice "blazing/modules/blazing/service"
 	"context"
 	"time"
@@ -49,19 +48,24 @@ func (h *Controller) Login(data *user.MAIN_LOGIN_IN, c *player.Conn) (result *us
 			//挖矿需要单独存，因为防止多开挖矿
 			t.Info.TimeToday = 0 //重置电池
 			defer func() {
-				for i := 400; i < 500; i++ { //每日任务区段
-					t.Info.TaskList[i] = 0 //重置每日任务
+				// for i := 400; i < 500; i++ { //每日任务区段
+				// 	t.Info.TaskList[i] = 0 //重置每日任务
 
-					t.Service.Task((uint32(i)), func(te *model.TaskEX) bool {
-						te.Data = make([]uint32, 0)
-						return true
-					})
+				// 	t.Service.Task((uint32(i)), func(te *model.TaskEX) bool {
+				// 		te.Data = make([]uint32, 0)
+				// 		return true
+				// 	})
 
-				}
+				// }
 				for i := 400; i < 50; i++ { //每日任务区段
 					t.Info.DailyResArr[i] = 0 //重置每日任务
 
 				}
+				t.Service.Talk(func(m *map[uint32]uint32) {
+					m1 := map[uint32]uint32{}
+					m = &m1
+
+				})
 			}()
 
 		}
diff --git a/modules/blazing/service/reg.go b/modules/blazing/service/reg.go
index 73cd56cf..7971977b 100644
--- a/modules/blazing/service/reg.go
+++ b/modules/blazing/service/reg.go
@@ -27,6 +27,9 @@ func (s *UserService) IsReg() bool {
 
 // 实现注册,id+昵称+颜色
 func (s *UserService) Reg(nick string, color uint32) {
+	if s.IsReg() {
+		return
+	}
 
 	nick = strings.Trim(nick, "\x00")
 
diff --git a/modules/blazing/service/talk.go b/modules/blazing/service/talk.go
index dea9c78f..2d25566b 100644
--- a/modules/blazing/service/talk.go
+++ b/modules/blazing/service/talk.go
@@ -6,12 +6,13 @@ import (
 
 // TalkCheck 获取玩家当前的Talk数据
 // todo 待实现xml解析判断是否溢出
-func (s *UserService) Talk(t func(map[uint32]uint32)) {
+func (s *UserService) Talk(t func(*map[uint32]uint32)) {
 
 	m1 := s.Model(s.talk.Model)
 
 	var talks model.TalkEX
 	m1.Scan(&talks)
 
-	t(talks.Data)
+	t(&talks.Data)
+	m1.Update(talks)
 }