From 2fe1c75c4ecda79a198a8a32bce8f33f369da51a Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Fri, 27 Jun 2025 15:39:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E4=BB=BB=E5=8A=A1=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/conf/server.json | 2 +- src/server/game/Player.go | 3 +- src/server/game/mod/dailyTask/DailyTask.go | 4 +-- src/server/middleware/kafka/kafka.go | 35 ---------------------- 4 files changed, 4 insertions(+), 40 deletions(-) diff --git a/src/server/conf/server.json b/src/server/conf/server.json index 4a6b04f3..4e2d8c8e 100644 --- a/src/server/conf/server.json +++ b/src/server/conf/server.json @@ -35,5 +35,5 @@ "KafkaHost":"kafka-server", "KafkaPort":"9092", "Version":"1.0.0", - "IdVerify":true + "IdVerify":false } diff --git a/src/server/game/Player.go b/src/server/game/Player.go index d0891a46..f1eb9a53 100644 --- a/src/server/game/Player.go +++ b/src/server/game/Player.go @@ -152,11 +152,10 @@ func (p *Player) ProcessTrigger() { DailyTaskMod := p.PlayMod.getDailyTaskMod() MailMod := p.PlayMod.getMailMod() PlayroomMod := p.PlayMod.getPlayroomMod() - GuideMod := p.PlayMod.getGuideMod() IsPlayroomBack := false IsMailBack := false for _, tr := range p.Trigger { - if DailyTaskMod.Trigger(tr, GuideMod.CheckFinishFirstTask()) { + if DailyTaskMod.Trigger(tr) { IsDailyBack = true } if p.MailTrigger(tr) { diff --git a/src/server/game/mod/dailyTask/DailyTask.go b/src/server/game/mod/dailyTask/DailyTask.go index 431fdf29..3d3695fa 100644 --- a/src/server/game/mod/dailyTask/DailyTask.go +++ b/src/server/game/mod/dailyTask/DailyTask.go @@ -107,8 +107,8 @@ func (dt *DailyTaskMod) WeekUpdate() { dt.WeekReward = weekReward } -func (dt *DailyTaskMod) Trigger(Tr *quest.Trigger, Unlock bool) bool { - if !Unlock { +func (dt *DailyTaskMod) Trigger(Tr *quest.Trigger) bool { + if !dt.Lock { return false } update := false diff --git a/src/server/middleware/kafka/kafka.go b/src/server/middleware/kafka/kafka.go index b4a8fdef..d0f995e1 100644 --- a/src/server/middleware/kafka/kafka.go +++ b/src/server/middleware/kafka/kafka.go @@ -10,46 +10,11 @@ import ( ) var KafkaMod *kafka.Writer -var topic string func init() { if conf.Server.GameName == "pet_home_local" { return } - topic = conf.Server.GameName - - // Create a Kafka connection to the broker - conn, err := kafka.Dial("tcp", fmt.Sprintf("%s:%s", conf.Server.KafkaHost, conf.Server.KafkaPort)) - if err != nil { - log.Debug("Failed to connect to Kafka broker: %v", err) - return - } - defer conn.Close() - - // Check if topic exists, create if not - partitions, err := conn.ReadPartitions() - if err != nil { - log.Debug("Failed to read partitions: %v", err) - return - } - exists := false - for _, p := range partitions { - if p.Topic == topic { - exists = true - break - } - } - if !exists { - err = conn.CreateTopics(kafka.TopicConfig{ - Topic: topic, - NumPartitions: 1, - ReplicationFactor: 1, - }) - if err != nil { - log.Debug("Failed to create topic: %v", err) - return - } - } KafkaMod = newKafkaWriter(fmt.Sprintf("%s:%s", conf.Server.KafkaHost, conf.Server.KafkaPort), conf.Server.GameName) log.Debug("KafkaMod init") }