diff --git a/configs/init.go b/configs/init.go index 5d6a4f9..3df862a 100644 --- a/configs/init.go +++ b/configs/init.go @@ -4,7 +4,14 @@ import ( "apigame/configs/confapi" "apigame/configs/confcardholder" "apigame/configs/confglobal" + "apigame/configs/confroomrank" "apigame/service-common/svconst" + "apigame/util/zconvert" + "apigame/util/zmap" + "fmt" + "github.com/astaxie/beego" + "sort" + "strings" ) func Init() bool { @@ -25,5 +32,69 @@ func Init() bool { // _, _ = confroomrank.GetCurrent(gameId) //} + //{ + // config, hasConfig := confroomrank.GetCurrent("10149", 30002) + // if hasConfig { + // items := zmap.Values(config.Robot) + // sort.Slice(items, func(i, j int) bool { + // return items[i].Id < items[j].Id + // }) + // fmt.Println("----------------") + // for _, i2 := range items { + // fmt.Println(i2.Id) + // } + // fmt.Println("----------------") + // for _, i2 := range items { + // fmt.Println(i2.MinScore) + // } + // fmt.Println("----------------") + // for _, i2 := range items { + // fmt.Println(i2.TotalScore) + // } + // fmt.Println("----------------") + // for _, i2 := range items { + // fmt.Println(i2.Range) + // } + // fmt.Println("----------------") + // } + //} + if beego.BConfig.RunMode == "dev" { + dump() + } + return true } + +func dump() { + config, hasConfig := confroomrank.GetCurrent("10149", 30002) + if hasConfig { + items := zmap.Values(config.Room) + sort.Slice(items, func(i, j int) bool { + return items[i].Id < items[j].Id + }) + for _, i2 := range items { + //fmt.Println(i2.Levels) + //fmt.Println(strings.Join(zconvert.ListIntegerToListString(i2.SettleUserType), ",")) + //{ + // ltxt := make([]string, 0) + // for _, i3 := range i2.PlayerTypeCount { + // txt := strings.Join(zconvert.ListIntegerToListString(i3), ",") + // ltxt = append(ltxt, txt) + // } + // fmt.Println(strings.Join(ltxt, "|")) + //} + { + ltxt := make([]string, 0) + ks := zmap.Keys(i2.Awards) + sort.Slice(ks, func(i, j int) bool { + return zconvert.ToInt(ks[i]) < zconvert.ToInt(ks[j]) + }) + for _, k := range ks { + txt := fmt.Sprintf("%s:%s", k, i2.Awards[k]) + ltxt = append(ltxt, txt) + } + fmt.Println(strings.Join(ltxt, "_")) + } + } + } +} diff --git a/service/roomrank/room.go b/service/roomrank/room.go index c243915..19582ec 100644 --- a/service/roomrank/room.go +++ b/service/roomrank/room.go @@ -318,6 +318,10 @@ func TryResetRobot(room *Room, config *confroomrank.ActivityConfig) { confRobot, hasConfRobot := config.Robot[roomPlayer.RobotConfigId] if hasConfRobot { roomPlayer.Score = GetRobotScoreCurrent(&confRobot, percent) + // 机器人分数最低是报名分数 + if roomPlayer.Score < config.OpenScore { + roomPlayer.Score = config.OpenScore + } } } } diff --git a/util/zconvert/list.go b/util/zconvert/list.go index 26e8f44..02d802b 100644 --- a/util/zconvert/list.go +++ b/util/zconvert/list.go @@ -14,6 +14,13 @@ func ListNumberToListNumber[T1 ztype.UtNumber, T2 ztype.UtNumber](in []T1) (out return } +func ListIntegerToListString[T1 ztype.UtInteger](in []T1) (out []string) { + for _, t1 := range in { + out = append(out, ToStr(t1)) + } + return +} + /* ----- list -> list ----- */ func ListStrToListNumber[T ztype.UtNumber](list []string) []T { -- libgit2 0.21.0