项目重构

src/server/benchmark_test.go

@@ -4,9 +4,7 @@ import (
 	"fmt"
 	"runtime"
 	"server/game"
-	"server/game/mod/msg"
 	"testing"
-	"time"
 )
 
 //	func TestBenchInit(t *testing.T) {
@@ -20,36 +18,6 @@ import (
 //			}
 //		}
 //	}
-func BenchmarkGame(b *testing.B) {
-	runtime.GOMAXPROCS(2)
-	fmt.Print("BenchmarkGame")
-	f := "wmz00%d"
-	for i := 0; i < 10000; i++ {
-		go func() {
-			UserName := fmt.Sprintf(f, i)
-			p1 := new(game.Player)
-			err := p1.InitPlayer(UserName)
-			if err != nil {
-				fmt.Println(err)
-			}
-			game.G_GameLogicPtr.SetPlayer(p1)
-			for {
-				time.Sleep(1 * time.Second)
-				game.Benchmark(p1)
-			}
-		}()
-	}
-	go func() {
-		time.Sleep(20 * time.Second)
-		game.G_GameLogicPtr.ChampshipMgrSend(&msg.Msg{
-			Type: msg.HANDLE_TYPE_CHAMPSHIP_GROUP,
-		})
-	}()
-	for {
-		time.Sleep(1 * time.Second)
-		printMemUsage()
-	}
-}
 
 func BenchmarkLog(b *testing.B) {
 	runtime.GOMAXPROCS(2)

src/server/cluster/Cluster.go

@@ -3,9 +3,9 @@ package mergeCluster
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
 	"server/conf"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 	"server/pkg/github.com/name5566/leaf/network"
 	"sync"

src/server/cluster/cluster_func.go

@@ -2,9 +2,9 @@ package mergeCluster
 
 import (
 	"fmt"
-	"server/GoUtil"
 	"server/conf"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 	"server/pkg/github.com/name5566/leaf/network"
 	"time"

src/server/conf/activity/activity_cfg.go

@@ -1,9 +1,9 @@
 package activityCfg
 
 import (
-	"server/GoUtil"
 	languageCfg "server/conf/language"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"

src/server/conf/card/card_cfg.go

@@ -1,8 +1,8 @@
 package cardCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strconv"

src/server/conf/catnip/catnip_cfg.go

@@ -1,8 +1,8 @@
 package catnipCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 )
 

src/server/conf/champship/champship_cfg.go

@@ -1,8 +1,8 @@
 package champshipCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 )
 

src/server/conf/charge/charge_cfg.go

@@ -1,8 +1,8 @@
 package chargeCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"sort"
 	"strings"

src/server/conf/collect/collect_cfg.go

@@ -1,8 +1,8 @@
 package collectCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 )
 

src/server/conf/emoji/emoji_cfg.go

@@ -1,7 +1,7 @@
 package emojiCfg
 
 import (
-	"server/GoUtil"
+	GoUtil "server/game_util"
 	"server/gamedata"
 )
 

src/server/conf/friend_treasure/friend_treasure_cfg.go

@@ -1,8 +1,8 @@
 package friendTreasureCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 )
 

src/server/conf/guess_color/guess_color_cfg.go

@@ -1,8 +1,8 @@
 package guesscolorCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"strings"
 )

src/server/conf/guide_task/guide_task_cfg.go

@@ -1,8 +1,8 @@
 package GuideTaskCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strconv"

src/server/conf/limited_time_event/limited_time_event_cfg.go

@@ -1,8 +1,8 @@
 package limitedTimeEventCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"

src/server/conf/mail/mail_cfg.go

@@ -2,9 +2,9 @@ package mailCfg
 
 import (
 	"fmt"
-	"server/GoUtil"
 	languageCfg "server/conf/language"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/msg"
 	"strings"

src/server/conf/merge_data/merge_data_cfg.go

@@ -2,8 +2,8 @@ package mergeDataCfg
 
 import (
 	"errors"
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strconv"

src/server/conf/mining/mining_cfg.go

@@ -1,8 +1,8 @@
 package miningCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"strconv"
 	"strings"

src/server/conf/playroom/playroom_cfg.go

@@ -1,8 +1,8 @@
 package playroomCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strings"

src/server/conf/randname/randname_cfg.go

@@ -1,7 +1,7 @@
 package randnameCfg
 
 import (
-	"server/GoUtil"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"strconv"
 )

src/server/db/Mysql.go

@@ -3,9 +3,9 @@ package db
 import (
 	"fmt"
 	"reflect"
-	"server/GoUtil"
 	"server/MergeConst"
 	"server/conf"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strings"
 	"sync"

src/server/game/GameLogic.go

@@ -6,10 +6,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"server/GoUtil"
 	"server/MergeConst"
 	"server/conf"
 	userCfg "server/conf/user"
+	GoUtil "server/game_util"
 	"strconv"
 	"sync"
 

src/server/game/activity_func.go

@@ -2,10 +2,9 @@ package game
 
 import (
 	"fmt"
-	"server/GoUtil"
 	activityCfg "server/conf/activity"
 	catnipCfg "server/conf/catnip"
-	guesscolorCfg "server/conf/guessColor"
+	guesscolorCfg "server/conf/guess_color"
 	itemCfg "server/conf/item"
 	languageCfg "server/conf/language"
 	mailCfg "server/conf/mail"
@@ -15,6 +14,7 @@ import (
 	"server/game/mod/activity"
 	"server/game/mod/item"
 	"server/game/mod/mail"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/admin.go

@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"runtime"
-	"server/GoUtil"
 	"server/MergeConst"
 	"server/conf"
 	"server/db"
 	Msg "server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/gate"

src/server/game/ban_mgr.go

@@ -2,7 +2,7 @@ package game
 
 import (
 	"encoding/gob"
-	"server/GoUtil"
+	GoUtil "server/game_util"
 )
 
 type BanMgr struct {

src/server/game/champship_mgr.go

@@ -2,10 +2,10 @@ package game
 
 import (
 	"math"
-	"server/GoUtil"
 	champshipCfg "server/conf/champship"
 	randnameCfg "server/conf/randname"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	proto "server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"

src/server/game/charge_func.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"os/exec"
-	"server/GoUtil"
 	"server/MergeConst"
 	"server/conf"
 	activityCfg "server/conf/activity"
@@ -14,8 +13,9 @@ import (
 	"server/game/mod/activity"
 	"server/game/mod/item"
 	MsgMod "server/game/mod/msg"
-	"server/game/mod/piggyBank"
+	piggyBank "server/game/mod/piggy_bank"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	proto "server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strings"

src/server/game/external.go

@@ -3,10 +3,10 @@ package game
 import (
 	"fmt"
 	"reflect"
-	"server/GoUtil"
 	"server/MergeConst"
 	"server/conf"
 	"server/game/internal"
+	GoUtil "server/game_util"
 	"strings"
 	"time"
 

src/server/game/friend_func.go

@@ -1,9 +1,9 @@
 package game
 
 import (
-	"server/GoUtil"
 	"server/db"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"
 )

src/server/game/friend_mgr.go

@@ -3,7 +3,6 @@ package game
 import (
 	"encoding/gob"
 	"fmt"
-	"server/GoUtil"
 	"server/MergeConst"
 	mergeCluster "server/cluster"
 	"server/conf"
@@ -11,6 +10,7 @@ import (
 	"server/game/mod/friend"
 	"server/game/mod/item"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 )
 

src/server/game/game_type.go

@@ -3,7 +3,7 @@ package game
 import (
 	"encoding/gob"
 	"server/game/mod/friend"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	"server/game/mod/msg"
 )
 

src/server/game/gm_handler.go

@@ -5,14 +5,13 @@ import (
 	"encoding/gob"
 	"fmt"
 	"os"
-	"server/GoUtil"
 	"server/conf"
 	avatarCfg "server/conf/avatar"
 	cardCfg "server/conf/card"
 	chargeCfg "server/conf/charge"
 	emojiCfg "server/conf/emoji"
 	faceCfg "server/conf/face"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	playroomCfg "server/conf/playroom"
 	"server/db"
 	"server/game/mod/activity"
@@ -27,6 +26,7 @@ import (
 	MsgMod "server/game/mod/msg"
 	"server/game/mod/order"
 	"server/game/mod/playroom"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strconv"

src/server/game/internal/chanrpc.go

@@ -1,8 +1,8 @@
 package internal
 
 import (
-	"server/GoUtil"
 	"server/MergeConst"
+	GoUtil "server/game_util"
 	"sync"
 
 	"server/pkg/github.com/name5566/leaf/gate"

src/server/game/internal/module.go

@@ -1,8 +1,8 @@
 package internal
 
 import (
-	"server/GoUtil"
 	"server/base"
+	GoUtil "server/game_util"
 
 	"server/pkg/github.com/name5566/leaf/module"
 )

src/server/game/limited_time_trigger.go

@@ -3,14 +3,14 @@ package game
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
 	playroomCfg "server/conf/playroom"
 	userCfg "server/conf/user"
 	"server/game/mod/card"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	MsgMod "server/game/mod/msg" // Ensure this package exists and is correctly referenced
 	"server/game/mod/playroom"
+	GoUtil "server/game_util"
 	"server/msg"
 	"time"
 )

src/server/game/mail_mgr.go

@@ -2,10 +2,10 @@ package game
 
 import (
 	"encoding/json"
-	"server/GoUtil"
 	"server/db"
 	"server/game/mod/item"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strings"
 )

src/server/game/message_handler.go

@@ -2,15 +2,14 @@ package game
 
 import (
 	"fmt"
-	"server/GoUtil"
 	mergeCluster "server/cluster"
 	cardCfg "server/conf/card"
 	catnipCfg "server/conf/catnip"
 	decorateCfg "server/conf/decorate"
 	itemCfg "server/conf/item"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
+	limitedTimeEventCfg "server/conf/limited_time_event"
 	mailCfg "server/conf/mail"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	orderCfg "server/conf/order"
 	playroomCfg "server/conf/playroom"
 	userCfg "server/conf/user"
@@ -18,11 +17,12 @@ import (
 	"server/game/mod/card"
 	"server/game/mod/friend"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	"server/game/mod/mail"
 	"server/game/mod/msg"
 	"server/game/mod/order"
 	"server/game/mod/playroom"
+	GoUtil "server/game_util"
 	proto "server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"

src/server/game/mod/activity/activity.go

@@ -3,9 +3,9 @@ package activity
 import (
 	"encoding/gob"
 	"fmt"
-	"server/GoUtil"
 	activityCfg "server/conf/activity"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 )
 

src/server/game/mod/activity/activity_gift.go

@@ -2,9 +2,9 @@ package activity
 
 import (
 	"fmt"
-	"server/GoUtil"
 	activityCfg "server/conf/activity"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 )
 
 func (a *Activity) Fire(Id int) ([]*item.Item, error) {

src/server/game/mod/avatar/Avatar.go

@@ -2,8 +2,8 @@ package avatar
 
 import (
 	"fmt"
-	"server/GoUtil"
 	avatarCfg "server/conf/avatar"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/base/Base.go

@@ -2,10 +2,10 @@ package base
 
 import (
 	"fmt"
-	"server/GoUtil"
 	"server/conf"
 	baseCfg "server/conf/base"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/card/Card.go

@@ -2,9 +2,9 @@ package card
 
 import (
 	"fmt"
-	"server/GoUtil"
 	cardCfg "server/conf/card"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 )

src/server/game/mod/card/card_func.go

@@ -1,8 +1,8 @@
 package card
 
 import (
-	"server/GoUtil"
 	cardCfg "server/conf/card"
+	GoUtil "server/game_util"
 )
 
 func randCard(Round, Star, IsGold int, Except []int) int {

src/server/game/mod/catnip/Catnip.go

@@ -2,9 +2,9 @@ package catnip
 
 import (
 	"fmt"
-	"server/GoUtil"
 	catnipCfg "server/conf/catnip"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 )
 
 type CatnipMod struct {

src/server/game/mod/champship/Champship.go

@@ -2,10 +2,10 @@ package champship
 
 import (
 	"fmt"
-	"server/GoUtil"
 	champshipCfg "server/conf/champship"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/charge/Charge.go

@@ -3,12 +3,12 @@ package charge
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
 	chargeCfg "server/conf/charge"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	playroomCfg "server/conf/playroom"
 	"server/game/mod/item"
 	"server/game/mod/order"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 )

src/server/game/mod/chess/Chess.go

@@ -3,11 +3,11 @@ package chess
 import (
 	"errors"
 	"fmt"
-	"server/GoUtil"
-	mergeDataCfg "server/conf/mergeData"
-	startMergeCfg "server/conf/startMerge"
+	mergeDataCfg "server/conf/merge_data"
+	startMergeCfg "server/conf/start_merge"
 	userCfg "server/conf/user"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 	"sort"
 	"strings"

src/server/game/mod/collect/Collect.go

@@ -2,9 +2,9 @@ package collect
 
 import (
 	"fmt"
-	"server/GoUtil"
 	collectCfg "server/conf/collect"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/compensation/compensation.go

@@ -1,8 +1,8 @@
 package compensation
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 )
 
 type Compensation struct {

src/server/game/mod/daily_task/DailyFunc.go

@@ -2,9 +2,9 @@ package dailyTask
 
 import (
 	"math"
-	"server/GoUtil"
-	dailyTaskCfg "server/conf/dailyTask"
+	dailyTaskCfg "server/conf/daily_task"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"sort"
 )
 

src/server/game/mod/daily_task/DailyTask.go

@@ -2,10 +2,10 @@ package dailyTask
 
 import (
 	"fmt"
-	"server/GoUtil"
-	dailyTaskCfg "server/conf/dailyTask"
+	dailyTaskCfg "server/conf/daily_task"
 	"server/game/mod/item"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"

src/server/game/mod/decorate/Decorate.go

@@ -3,10 +3,10 @@ package decorate
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
 	decorateCfg "server/conf/decorate"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
+	limitedTimeEventCfg "server/conf/limited_time_event"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 	"sort"
 )

src/server/game/mod/emoji/emoji.go

@@ -2,8 +2,8 @@ package emoji
 
 import (
 	"fmt"
-	"server/GoUtil"
 	emojiCfg "server/conf/emoji"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/endless/endless_func.go

@@ -1,9 +1,9 @@
 package endless
 
 import (
-	Util "server/GoUtil"
 	endlessCfg "server/conf/endless"
 	"server/game/mod/item"
+	Util "server/game_util"
 )
 
 // 初始化奖励

src/server/game/mod/face/Face.go

@@ -2,8 +2,8 @@ package face
 
 import (
 	"fmt"
-	"server/GoUtil"
 	faceCfg "server/conf/face"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/friend/Friend.go

@@ -2,11 +2,11 @@ package friend
 
 import (
 	"fmt"
-	"server/GoUtil"
 	cardCfg "server/conf/card"
 	friendCfg "server/conf/friend"
 	"server/game/mod/card"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/friend_treasure.go/friend_treasure.go

@@ -2,9 +2,9 @@ package friendTreasure
 
 import (
 	"fmt"
-	"server/GoUtil"
-	friendTreasureCfg "server/conf/friendTreasure"
+	friendTreasureCfg "server/conf/friend_treasure"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 )

src/server/game/mod/guess_color/guess_color.go

@@ -2,10 +2,10 @@ package guesscolor
 
 import (
 	"fmt"
-	"server/GoUtil"
-	guesscolorCfg "server/conf/guessColor"
+	guesscolorCfg "server/conf/guess_color"
 	randnameCfg "server/conf/randname"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 )
 
 type GuessColorMod struct {

src/server/game/mod/guide/Guide.go

@@ -2,9 +2,9 @@ package guide
 
 import (
 	"fmt"
-	"server/GoUtil"
 	guidecfg "server/conf/guide"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/guide_task/guide_task.go

@@ -2,10 +2,10 @@ package guideTask
 
 import (
 	"fmt"
-	"server/GoUtil"
-	GuideTaskCfg "server/conf/guideTask"
+	GuideTaskCfg "server/conf/guide_task"
 	"server/game/mod/item"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/handbook/Handbook.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	handbookCfg "server/conf/handbook"
-	startMergeCfg "server/conf/startMerge"
+	startMergeCfg "server/conf/start_merge"
 	"server/game/mod/item"
 	"server/msg"
 )

src/server/game/mod/invite/invite.go

@@ -2,9 +2,9 @@ package invite
 
 import (
 	"fmt"
-	"server/GoUtil"
 	inviteCfg "server/conf/invite"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/limited_time_event/limited_time_event.go

@@ -3,10 +3,10 @@ package limitedTimeEvent
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
-	mergeDataCfg "server/conf/mergeData"
+	limitedTimeEventCfg "server/conf/limited_time_event"
+	mergeDataCfg "server/conf/merge_data"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/mail/Mail.go

@@ -2,8 +2,8 @@ package mail
 
 import (
 	"fmt"
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/order/Order.go

@@ -2,11 +2,11 @@ package order
 
 import (
 	"fmt"
-	"server/GoUtil"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
-	mergeDataCfg "server/conf/mergeData"
+	limitedTimeEventCfg "server/conf/limited_time_event"
+	mergeDataCfg "server/conf/merge_data"
 	orderCfg "server/conf/order"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 	"strings"
 	"time"

src/server/game/mod/order/order_func.go

@@ -3,10 +3,10 @@ package order
 import (
 	"log"
 	"math"
-	"server/GoUtil"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	orderCfg "server/conf/order"
 	userCfg "server/conf/user"
+	GoUtil "server/game_util"
 	"sort"
 )
 

src/server/game/mod/pass/Pass.go

@@ -1,9 +1,9 @@
 package pass
 
 import (
-	"server/GoUtil"
 	passCfg "server/conf/pass"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 )
 
 type PassMod struct {

src/server/game/mod/piggy_bank/piggy_bank.go

@@ -1,9 +1,9 @@
 package piggyBank
 
 import (
-	"server/GoUtil"
 	chargeCfg "server/conf/charge"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/playroom/playroom.go

@@ -3,11 +3,11 @@ package playroom
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
+	limitedTimeEventCfg "server/conf/limited_time_event"
 	playroomCfg "server/conf/playroom"
 	"server/game/mod/item"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	"server/msg"
 	"sort"
 )

src/server/game/mod/quest/Quest.go

@@ -2,7 +2,7 @@ package quest
 
 import (
 	"fmt"
-	"server/GoUtil"
+	GoUtil "server/game_util"
 	"server/msg"
 	"strconv"
 	"strings"

src/server/game/mod/race/race.go

@@ -3,10 +3,10 @@ package race
 import (
 	"fmt"
 	"math/rand"
-	"server/GoUtil"
 	raceCfg "server/conf/race"
 	randnameCfg "server/conf/randname"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 )
 
 type RaceMod struct {

src/server/game/mod/seven_login/seven_login.go

@@ -2,9 +2,9 @@ package sevenLogin
 
 import (
 	"fmt"
-	"server/GoUtil"
-	sevenLoginCfg "server/conf/sevenLogin"
+	sevenLoginCfg "server/conf/seven_login"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 

src/server/game/mod/seven_login/seven_login_func.go

@@ -2,9 +2,9 @@ package sevenLogin
 
 import (
 	"math/rand/v2"
-	"server/GoUtil"
-	sevenLoginCfg "server/conf/sevenLogin"
+	sevenLoginCfg "server/conf/seven_login"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"sort"
 )

src/server/game/player_back.go

@@ -1,11 +1,11 @@
 package game
 
 import (
-	"server/GoUtil"
 	chargeCfg "server/conf/charge"
 	playroomCfg "server/conf/playroom"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
+	GoUtil "server/game_util"
 	proto "server/msg"
 )
 

src/server/game/player_base_mod.go

@@ -9,7 +9,7 @@ import (
 	userCfg "server/conf/user"
 	"server/db"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	Msg "server/game/mod/msg"
 	"server/game/mod/order"
 	"server/game/mod/quest"

src/server/game/player_chess_mod.go

@@ -3,14 +3,14 @@ package game
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
 	"server/conf"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	orderCfg "server/conf/order"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	"server/game/mod/order"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"

src/server/game/player_data.go

@@ -6,14 +6,13 @@ import (
 	"encoding/json"
 	"errors"
 	"math"
-	"server/GoUtil"
 	activityCfg "server/conf/activity"
 	cardCfg "server/conf/card"
 	chargeCfg "server/conf/charge"
-	guesscolorCfg "server/conf/guessColor"
+	guesscolorCfg "server/conf/guess_color"
 	itemCfg "server/conf/item"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
-	mergeDataCfg "server/conf/mergeData"
+	limitedTimeEventCfg "server/conf/limited_time_event"
+	mergeDataCfg "server/conf/merge_data"
 	miningCfg "server/conf/mining"
 	playroomCfg "server/conf/playroom"
 	"server/db"
@@ -21,10 +20,11 @@ import (
 	"server/game/mod/activity"
 	"server/game/mod/friend"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	MsgMod "server/game/mod/msg"
 	"server/game/mod/playroom"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	"server/msg"
 	telog "server/thinkdata"
 	"strconv"