From 7b086e99d2de0833e5e4a8a0e9cca1040132b20a Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Fri, 27 Jun 2025 12:10:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=80=80=E5=BD=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/chess/Chess.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/mod/chess/Chess.go b/src/server/game/mod/chess/Chess.go index 3bbcd1af..237af194 100644 --- a/src/server/game/mod/chess/Chess.go +++ b/src/server/game/mod/chess/Chess.go @@ -262,7 +262,7 @@ func (cb *ChessBorad) GetEmitList() []int { if EmitID == "" { continue } - if cb.Retire[EmitID] == EMIT_RETIRE_END { + if cb.Retire[EmitID] == EMIT_RETIRE_START { continue } EmitType := mergeDataCfg.GetEmitType(k) 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 2/4] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BC=98=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") } From 0fb9c56de990eb28c6ddfc7f12b65a7039f0550b Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Fri, 27 Jun 2025 17:10:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?playroom=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/PlayerFunc.go | 9 ++++++--- src/server/game/RegisterNetworkFunc.go | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go index a334d136..cf920e89 100644 --- a/src/server/game/PlayerFunc.go +++ b/src/server/game/PlayerFunc.go @@ -207,11 +207,14 @@ func handle(p *Player, m *msg.Msg) error { SyncMailMsg(p) case msg.HANDLE_TYPE_PLAYROOM_LOSE: // # 玩家输了 PlayroomMod := p.PlayMod.getPlayroomMod() - Items := make([]*item.Item, 0) + Items := m.Item + IsChip := false if m.Extra != nil { - Items = m.Extra.([]*item.Item) + IsChip = m.Extra.(bool) + } + if IsChip { + PlayroomMod.AddChip(m.From, m.SendT) } - PlayroomMod.AddChip(m.From, m.SendT) PlayroomMod.AddMood(playroom.MOOD_TYPE_FOOD, -50) PlayroomMod.AddMood(playroom.MOOD_TYPE_CLEAN, -50) PlayroomMod.AddVisitor(m.From, m.SendT) diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index c72b5419..05576199 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -3288,7 +3288,8 @@ func ReqPlayroomSelectReward(player *Player, buf []byte) error { To: Target, Type: MsqMod.HANDLE_TYPE_PLAYROOM_LOSE, SendT: GoUtil.Now(), - Extra: Items, + Item: Items, + Extra: true, }) G_GameLogicPtr.SetUserData(Target, VAR_OP_CHIP, 1) PlayroomMod.ResetGame() @@ -3478,7 +3479,8 @@ func ReqPlayroomFlipReward(player *Player, buf []byte) error { To: Target, Type: MsqMod.HANDLE_TYPE_PLAYROOM_LOSE, SendT: GoUtil.Now(), - Extra: Items, + Item: Items, + Extra: false, }) player.PlayMod.save() PlayroomBackData(player) From a51e37490b6a72bbd4a27898c14644ff404253f6 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Fri, 27 Jun 2025 17:19:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/admin.go | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/server/game/admin.go b/src/server/game/admin.go index 6c79a927..919f47b0 100644 --- a/src/server/game/admin.go +++ b/src/server/game/admin.go @@ -40,22 +40,6 @@ func AdminProcess(Func string, args []interface{}) { } func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg.ResLogin) { - if accountInfo == nil { - ResLogin = &msg.ResLogin{ - ResultCode: MergeConst.Protocol_Error_Account_NoExsit, - DwUin: 0, - } - return - } - - if detail.Type == msg.LOGIN_TYPE_ACCOUNT_LOGIN && accountInfo.UserPassword != detail.UserPwd { - ResLogin = &msg.ResLogin{ - ResultCode: MergeConst.Protocol_Error_Account_OR_PWD_ERROR, - DwUin: 0, - } - return - } - if detail.Type == msg.LOGIN_TYPE_CODE_LOGIN { err := VerifyCode(detail.UserName, detail.Code) if err != nil { @@ -66,6 +50,20 @@ func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg return } } + if accountInfo == nil { + ResLogin = &msg.ResLogin{ + ResultCode: MergeConst.Protocol_Error_Account_NoExsit, + DwUin: 0, + } + return + } + if detail.Type == msg.LOGIN_TYPE_ACCOUNT_LOGIN && accountInfo.UserPassword != detail.UserPwd { + ResLogin = &msg.ResLogin{ + ResultCode: MergeConst.Protocol_Error_Account_OR_PWD_ERROR, + DwUin: 0, + } + return + } if detail.Type == msg.LOGIN_TYPE_DEVICE_LOGIN { if detail.Device != accountInfo.DeviceId { ResLogin = &msg.ResLogin{