From a882a010d3277942c259d57cf3955f46e0e5e649 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Mon, 9 Mar 2026 16:25:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E6=A6=9C=E4=B8=AD=E6=9C=BA=E5=99=A8=E4=BA=BA=E7=9A=84=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E6=A1=86=E6=94=B9=E6=88=90=E5=88=9D=E5=A7=8B=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/conf/avatar/avatar_cfg.go | 10 ++++++++++
 src/server/conf/face/face_cfg.go     | 10 ++++++++++
 src/server/game/champship_mgr.go     |  6 ++++--
 src/server/test/fix_test.go          |  8 ++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/server/conf/avatar/avatar_cfg.go b/src/server/conf/avatar/avatar_cfg.go
index b35231aa..2ed0811e 100644
--- a/src/server/conf/avatar/avatar_cfg.go
+++ b/src/server/conf/avatar/avatar_cfg.go
@@ -1,6 +1,7 @@
 package avatarCfg
 
 import (
+	"math/rand"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strconv"
@@ -31,6 +32,15 @@ func GetInitList() []int {
 	return r
 }
 
+func GetRandInitId() int {
+	list := GetInitList()
+	if len(list) == 0 {
+		return 0
+	}
+	index := rand.Intn(len(list))
+	return list[index]
+}
+
 func CheckExist(Id int) bool {
 	data, err := gamedata.GetData(CFG_AVATAR)
 	if err != nil {
diff --git a/src/server/conf/face/face_cfg.go b/src/server/conf/face/face_cfg.go
index c662a969..6f4e783b 100644
--- a/src/server/conf/face/face_cfg.go
+++ b/src/server/conf/face/face_cfg.go
@@ -1,6 +1,7 @@
 package faceCfg
 
 import (
+	"math/rand"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strconv"
@@ -35,6 +36,15 @@ func GetInitList() []int {
 	return r
 }
 
+func GetRandInitId() int {
+	list := GetInitList()
+	if len(list) == 0 {
+		return 0
+	}
+	index := rand.Intn(len(list))
+	return list[index]
+}
+
 func CheckExist(Id int) bool {
 	data, err := gamedata.GetData(CFG_FACE)
 	if err != nil {
diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 2fa7ded2..65ec6c86 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -3,7 +3,9 @@ package game
 import (
 	"fmt"
 	"math"
+	avatarCfg "server/conf/avatar"
 	champshipCfg "server/conf/champship"
+	faceCfg "server/conf/face"
 	randnameCfg "server/conf/randname"
 	"server/db"
 	"server/game/mod/msg"
@@ -842,8 +844,8 @@ func CreateRobot(M float64, GroupId int) *ChampshipRobot {
 		Max:      M / 10,
 		Type:     Type,
 		Name:     randnameCfg.GetRandName(),
-		Avatar:   GoUtil.RandNum(1, 10),
-		Face:     GoUtil.RandNum(1, 10),
+		Avatar:   avatarCfg.GetRandInitId(),
+		Face:     faceCfg.GetRandInitId(),
 		Level:    GoUtil.RandNum(1, 10),
 		GroupId:  GroupId,
 		Time:     GoUtil.Now(),
diff --git a/src/server/test/fix_test.go b/src/server/test/fix_test.go
index 12adb328..7b1a0b1a 100644
--- a/src/server/test/fix_test.go
+++ b/src/server/test/fix_test.go
@@ -3,7 +3,9 @@ package test
 import (
 	"fmt"
 	"server/backend"
+	avatarCfg "server/conf/avatar"
 	decorateCfg "server/conf/decorate"
+	faceCfg "server/conf/face"
 	languageCfg "server/conf/language"
 	notification_cfg "server/conf/notification"
 	"server/db"
@@ -256,3 +258,9 @@ func TestMsgFormat(t *testing.T) {
 	}
 	fmt.Printf("Msg: %v\n", m)
 }
+
+func TestRandFace(t *testing.T) {
+	face := faceCfg.GetRandInitId()
+	avatar := avatarCfg.GetRandInitId()
+	fmt.Printf("Random Face ID: %d, Random Avatar ID: %d\n", face, avatar)
+}