diff --git a/src/server/conf/mergeData/MergeDataCfg.go b/src/server/conf/mergeData/MergeDataCfg.go index c6e70e9b..13d88283 100644 --- a/src/server/conf/mergeData/MergeDataCfg.go +++ b/src/server/conf/mergeData/MergeDataCfg.go @@ -131,7 +131,7 @@ func GetChessIdByLvAndColor(Lv int, Color string) int { return Id } } - log.Debug("MergeDataCfg GetChessIdByLvAndColor lv:%v Color:%v not found", Lv, Color) + // log.Debug("MergeDataCfg GetChessIdByLvAndColor lv:%v Color:%v not found", Lv, Color) return 0 } diff --git a/src/server/game/Gm.go b/src/server/game/Gm.go index 82ec0460..31e3c3ce 100644 --- a/src/server/game/Gm.go +++ b/src/server/game/Gm.go @@ -386,6 +386,14 @@ func ReqGmCommand_(player *Player, Command string) error { DecorateMod.AreaId = S DecorateMod.FinishList = make(map[int]struct{}) DecorateMod.Progress = 0 + case "setDecorateProgress": + S, _ := strconv.Atoi(arg[1]) + DecorateMod := player.PlayMod.getDecorateMod() + DecorateMod.FinishList = make(map[int]struct{}) + for i := 1; i <= S; i++ { + DecorateMod.FinishList[i] = struct{}{} + } + DecorateMod.Progress = S case "resetCardSeasonFirst": CardMod := player.PlayMod.getCardMod() CardMod.SeasonFirst = false diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go index 38359867..3788beb0 100644 --- a/src/server/game/mod/order/OrderFunc.go +++ b/src/server/game/mod/order/OrderFunc.go @@ -570,6 +570,9 @@ func initReflectChess2(Color string, Start, End, Diff, adjust int) { for i := Start; i <= End; i++ { Lv := max(i-adjust, 1) ChessId := mergeDataCfg.GetChessIdByLvAndColor(Lv, Color) + if ChessId == 0 { + continue + } reflectChess[ChessId] = Diff } }