From 3c4824e59ee116fcd6e4ea3d60119feec9a5c774 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 10 Mar 2026 19:14:01 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/player_data.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server/game/player_data.go b/src/server/game/player_data.go index 011ed567..38ab33d5 100644 --- a/src/server/game/player_data.go +++ b/src/server/game/player_data.go @@ -1193,6 +1193,9 @@ func (p *Player) initActivity() { Title: v.Title, } } + p.TeLog("activity_ids", map[string]interface{}{ + "info": p.activity, + }) p.ActivityLogin() } From 89f9b8481955e6cf88077f70b1982ad285f13222 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 10 Mar 2026 19:54:49 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=9A=84=E5=9B=9E=E6=94=B6=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/message_handler.go | 20 ++++++++++++++++++++ src/server/game/mod/order/Order.go | 4 ++++ src/server/game/register_network_func.go | 2 ++ src/server/game_util/GoUtil.go | 10 ++++++++++ src/server/test/fix_test.go | 7 +++++++ 5 files changed, 43 insertions(+) diff --git a/src/server/game/message_handler.go b/src/server/game/message_handler.go index 2d17c6f6..df0c54b2 100644 --- a/src/server/game/message_handler.go +++ b/src/server/game/message_handler.go @@ -1349,6 +1349,26 @@ func (p *Player) AddHighOrder2() { } } +func (p *Player) DeleteHighOrder() { + OrderMod := p.PlayMod.getOrderMod() + ChessMod := p.PlayMod.getChessMod() + ChessList := ChessMod.GetUnlockChessList() + for k, v := range OrderMod.GetOrderList() { + if v.Type != order.Extra_type { + continue + } + if len(v.MergeId) == 0 { + continue + } + chessId := v.MergeId[0] + chessNum := len(v.MergeId) + elementNum := GoUtil.ElemNumber(ChessList, chessId) + if elementNum < chessNum { + OrderMod.DeleteOrder(k) + } + } +} + func (p *Player) FormatPetOrderItem(Items []*item.Item) []*item.Item { var NewItems []*item.Item PlayroomMod := p.PlayMod.getPlayroomMod() diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go index 467589d4..163a98cc 100644 --- a/src/server/game/mod/order/Order.go +++ b/src/server/game/mod/order/Order.go @@ -439,6 +439,10 @@ func (o *OrderMod) CreateNormalOrder(lv int, Emit []int, EnergyMul, OrderType in return nil } +func (o *OrderMod) DeleteOrder(OrderId int) { + delete(o.OrderList, OrderId) +} + // 生成超级订单 func (o *OrderMod) CreateSuperOrder(lv int, Emit []int, EnergyMul int) error { if len(Emit) == 0 { diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go index e5e72d0d..02d214fa 100644 --- a/src/server/game/register_network_func.go +++ b/src/server/game/register_network_func.go @@ -413,6 +413,8 @@ func ReqRewardOrder(player *Player, buf []byte) error { player.AddOrder() player.AddHighOrder() player.AddHighOrder2() + // 删除无法完成的回收订单 + player.DeleteHighOrder() player.InitOrderItem() // 存钱罐增加钻石 PiggyBankMod := player.PlayMod.getPiggyBankMod() diff --git a/src/server/game_util/GoUtil.go b/src/server/game_util/GoUtil.go index df3eca3a..9b3fc74c 100644 --- a/src/server/game_util/GoUtil.go +++ b/src/server/game_util/GoUtil.go @@ -648,3 +648,13 @@ func NotifyPlayer(uid, pushid int, title, content string) { } log.Debug("notification send uid %d, type %d , res %s", uid, pushid, string(body)) } + +func ElemNumber(list []int, ele int) int { + count := 0 + for _, v := range list { + if v == ele { + count++ + } + } + return count +} diff --git a/src/server/test/fix_test.go b/src/server/test/fix_test.go index 2ec8125e..670d9363 100644 --- a/src/server/test/fix_test.go +++ b/src/server/test/fix_test.go @@ -100,6 +100,13 @@ func TestRandInt(t *testing.T) { SevenMod.BackData() } +func TestLevelUp(t *testing.T) { + p1 := new(game.Player) + p1.InitPlayer("3625212") + PlayerBaseMod := p1.GetPlayerBaseMod() + PlayerBaseMod.AddExp(p1, 10000, 10000) +} + func TestEndless(t *testing.T) { p1 := new(game.Player) p1.InitPlayer("3625212") From fefc3e6eae20fdcce3817650cfd91121c5bc049e Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 10 Mar 2026 20:11:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E3=80=90=E5=85=88=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E3=80=91=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0=E6=B3=95=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=9A=84=E5=9B=9E=E6=94=B6=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/register_network_func.go | 4 ++-- src/server/test/fix_test.go | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go index 02d214fa..d9194431 100644 --- a/src/server/game/register_network_func.go +++ b/src/server/game/register_network_func.go @@ -413,8 +413,8 @@ func ReqRewardOrder(player *Player, buf []byte) error { player.AddOrder() player.AddHighOrder() player.AddHighOrder2() - // 删除无法完成的回收订单 - player.DeleteHighOrder() + // 删除无法完成的回收订单 TODO 需前端配合开发 + // player.DeleteHighOrder() player.InitOrderItem() // 存钱罐增加钻石 PiggyBankMod := player.PlayMod.getPiggyBankMod() diff --git a/src/server/test/fix_test.go b/src/server/test/fix_test.go index 670d9363..fb60bc61 100644 --- a/src/server/test/fix_test.go +++ b/src/server/test/fix_test.go @@ -96,8 +96,7 @@ func TestFixUserData(t *testing.T) { func TestRandInt(t *testing.T) { p1 := new(game.Player) p1.InitPlayer("3625212") - SevenMod := p1.GetSevenLoginMod() - SevenMod.BackData() + p1.DeleteHighOrder() } func TestLevelUp(t *testing.T) { From 485280243aa0e6c3bae6058c8585c2a97f181721 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 10 Mar 2026 20:57:14 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=9C=8D=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/game/champship_mgr.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go index 8a8c2ad6..e4c595b9 100644 --- a/src/server/game/champship_mgr.go +++ b/src/server/game/champship_mgr.go @@ -902,17 +902,11 @@ func CreateRobot(M float64, GroupId int) *ChampshipRobot { PerScore = math.Round((M/10*0.34)/(float64(GoUtil.NextZeroTimestampDuration())/1800)*100) / 100 Score = 2 } - num, err := db.RedisZCard(RANK_USER) - if err != nil { - num = 0 - } - id := rand.Intn(int(num)) + 1 - rinfo, err := db.RedisZGetByIndexWithScore(RANK_USER, int64(id)) - playerSimpleData := G_GameLogicPtr.GetSimplePlayerByUid(GoUtil.Int(rinfo.Member)) return &ChampshipRobot{ Max: M / 10, Type: Type, Name: randnameCfg.GetRandName(), + PetName: randnameCfg.GetRandName(), Avatar: avatarCfg.GetRandInitId(), Face: faceCfg.GetRandInitId(), Level: GoUtil.RandNum(1, 10), @@ -920,9 +914,6 @@ func CreateRobot(M float64, GroupId int) *ChampshipRobot { Time: GoUtil.Now(), Score: Score, PerScore: PerScore, - Playroom: playerSimpleData.Playroom, - DressSet: playerSimpleData.DressSet, - FurSet: playerSimpleData.PetFur, } } From c18a8cc3ce3d5064f9d18019cead4b483a6d4116 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 10 Mar 2026 21:17:38 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/champship_mgr.go | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go index e4c595b9..9cd68cd3 100644 --- a/src/server/game/champship_mgr.go +++ b/src/server/game/champship_mgr.go @@ -489,6 +489,7 @@ func (c *ChampshipMgr) group(iszero bool) (interface{}, error) { Score: UserData.Score, Time: UserData.Time, }) + log.Debug("group AutoId:%d, Uid:%d, Score:%f, Time:%d", ChampshipData.AutoId, UserData.Uid, UserData.Score, UserData.Time) if len(ChampshipData.Rank[ChampshipData.AutoId]) == 10 { ChampshipData.AutoId++ } From c28bf27f8f503da2541ad524ebb8e8c100e93130 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 10 Mar 2026 21:23:00 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=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/champship/champship_cfg.go | 4 ++-- src/server/test/fix_test.go | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/server/conf/champship/champship_cfg.go b/src/server/conf/champship/champship_cfg.go index b10be54c..ea5683eb 100644 --- a/src/server/conf/champship/champship_cfg.go +++ b/src/server/conf/champship/champship_cfg.go @@ -28,14 +28,14 @@ func GetGroupId(N int) int { data, err := gamedata.GetData(CFG_CHAMPSHIP_GROUP) if err != nil { log.Debug("GetGroupId err:%v, N=%d", err, N) - return 0 + return 1 } for k, v := range data { if N >= gamedata.GetIntValue(v, "Min") && N <= gamedata.GetIntValue(v, "Max") { return GoUtil.Int(k) } } - return 0 + return 11 } func GetChessScore(ChessLv int) int { diff --git a/src/server/test/fix_test.go b/src/server/test/fix_test.go index fb60bc61..27530992 100644 --- a/src/server/test/fix_test.go +++ b/src/server/test/fix_test.go @@ -99,6 +99,12 @@ func TestRandInt(t *testing.T) { p1.DeleteHighOrder() } +func TestII(t *testing.T) { + for i := 10; i >= 0; i-- { + fmt.Printf("i: %d\n", i) + } +} + func TestLevelUp(t *testing.T) { p1 := new(game.Player) p1.InitPlayer("3625212") From d9eb329bea8d8a59e93c481cf1d6a7ce0a849c89 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 10 Mar 2026 21:38:44 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=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/game/champship_mgr.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go index 9cd68cd3..c18232e3 100644 --- a/src/server/game/champship_mgr.go +++ b/src/server/game/champship_mgr.go @@ -481,18 +481,18 @@ func (c *ChampshipMgr) group(iszero bool) (interface{}, error) { } ChampshipData.AutoId++ StartId := ChampshipData.AutoId + numGroups := (len(g[i]) + 9) / 10 // 向上取整，计算需要的组数 + ChampshipData.AutoId += numGroups for j := 0; j < len(g[i]); j++ { - ChampshipData.GroupInfo[g[i][j]] = ChampshipData.AutoId + groupIndex := StartId + j/10 + ChampshipData.GroupInfo[g[i][j]] = groupIndex UserData := ChampshipData.Pool[g[i][j]] - ChampshipData.Rank[ChampshipData.AutoId] = append(ChampshipData.Rank[ChampshipData.AutoId], &ChampshipRank{ + ChampshipData.Rank[groupIndex] = append(ChampshipData.Rank[groupIndex], &ChampshipRank{ Uid: UserData.Uid, Score: UserData.Score, Time: UserData.Time, }) - log.Debug("group AutoId:%d, Uid:%d, Score:%f, Time:%d", ChampshipData.AutoId, UserData.Uid, UserData.Score, UserData.Time) - if len(ChampshipData.Rank[ChampshipData.AutoId]) == 10 { - ChampshipData.AutoId++ - } + log.Debug("group AutoId:%d, Uid:%d, Score:%f, Time:%d", groupIndex, UserData.Uid, UserData.Score, UserData.Time) } for j := StartId; j <= ChampshipData.AutoId; j++ { // 填充机器人 RobotNum := 30 - len(ChampshipData.Rank[j]) From beda327165ffe0ccfb57554ff2ad4d688a39f4ae Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 10 Mar 2026 21:40:20 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=96=E7=9F=BFGm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/gm_handler.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go index c5f5fc00..1a0da95f 100644 --- a/src/server/game/gm_handler.go +++ b/src/server/game/gm_handler.go @@ -327,6 +327,13 @@ func ReqGmCommand_(player *Player, Command string) error { ActivityInfo := player.GetActivityInfo(activity.ACT_TYPE_MINING) MiningMod.ZeroUpdate(ActivityInfo.Id) player.MiningBackData() + case "miningSetPass": + MiningMod := player.PlayMod.getMiningMod() + MiningMod.Pass = 10 + MiningMod.Mining = 0 + MiningMod.Map = nil + MiningMod.Gem = nil + player.MiningBackData() case "catnipReload": CatnipMod := player.PlayMod.getCatnipMod() CatnipMod.ZeroUpdate(-1) From f50c7f6e8610e3b4802dcca46a94c4b1f13c816f Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 10 Mar 2026 21:41:55 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=96=E7=9F=BFGm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/gm_handler.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go index 1a0da95f..990c1aaf 100644 --- a/src/server/game/gm_handler.go +++ b/src/server/game/gm_handler.go @@ -329,7 +329,8 @@ func ReqGmCommand_(player *Player, Command string) error { player.MiningBackData() case "miningSetPass": MiningMod := player.PlayMod.getMiningMod() - MiningMod.Pass = 10 + Id, _ := strconv.Atoi(arg[1]) + MiningMod.Pass = Id MiningMod.Mining = 0 MiningMod.Map = nil MiningMod.Gem = nil