新增扩展包选择功能

CuteReimu · CuteReimu · commit 63ed21be1740 · 2026-03-31T18:15:41.000+08:00
diff --git a/src/main/kotlin/Game.kt b/src/main/kotlin/Game.kt
@@ -39,6 +39,8 @@ class Game(val id: Int, totalPlayerCount: Int, val actorRef: ActorRef) {
     @Volatile
     var isStarted = false
 
+    var extension = 3
+
     @Volatile
     var isEnd = false
         private set
@@ -136,6 +138,14 @@ class Game(val id: Int, totalPlayerCount: Int, val actorRef: ActorRef) {
         isStarted = true
         players = players.shuffled()
         players.forEachIndexed { i, p -> p!!.location = i }
+        val humanCount = players.count { it is HumanPlayer }
+        extension = run {
+            for (i in 3 downTo 1) {
+                if (players.count { it is HumanPlayer && it.roomExtension >= i } * 2 >= humanCount) return@run i
+            }
+            3
+        }
+
         QQPusher.notifyStart()
         val identities = ArrayList<color>()
         when (players.size) {
@@ -217,12 +227,18 @@ class Game(val id: Int, totalPlayerCount: Int, val actorRef: ActorRef) {
             else -> players.size - 4
         }
         possibleSecretTasks = tasks.take(possibleSecretTaskCount.coerceAtMost(tasks.size)).shuffled()
+        val n = if (extension == 1) players.size * 2 else players.size * 3
         val roleSkillsDataList = if (Config.IsGmEnable) RoleCache.getRandomRolesWithSpecific(
-            players.size * 3,
-            Config.DebugRoles
-        ) else RoleCache.getRandomRoles(players.size * 3)
+            n,
+            Config.DebugRoles,
+            extension
+        ) else RoleCache.getRandomRoles(n, extension)
         resolve(WaitForSelectRole(this, players.indices.map {
-            listOf(
+            if (extension == 1) listOf(
+                roleSkillsDataList[it],
+                roleSkillsDataList[it + players.size],
+            ).filter { r -> r.role != unknown }.toMutableList()
+            else listOf(
                 roleSkillsDataList[it],
                 roleSkillsDataList[it + players.size],
                 roleSkillsDataList[it + players.size * 2]
diff --git a/src/main/kotlin/HumanPlayer.kt b/src/main/kotlin/HumanPlayer.kt
@@ -47,6 +47,13 @@ class HumanPlayer(var channel: Channel, var needWaitLoad: Boolean = false, val n
     @Volatile
     var isReconnecting = false
 
+    /** 扩展包，1-只有基础，2-基础一扩，3-全部 */
+    @Volatile
+    var roomExtension = 3
+        set(value) {
+            field = if (value in 1..3) value else 3
+        }
+
     /**
      * 游戏结束重置
      */
diff --git a/src/main/kotlin/card/Deck.kt b/src/main/kotlin/card/Deck.kt
@@ -125,7 +125,7 @@ class Deck(private val game: Game) {
             })
     }
 
-    fun init(totalPlayerCount: Int) {
+    fun init(totalPlayerCount: Int, extension: Int) {
         cards.clear()
         if (totalPlayerCount <= 4) {
             cards.addAll(DefaultDeck.subList(0, 108))
@@ -140,6 +140,8 @@ class Deck(private val game: Game) {
                 shiTanIndex.forEach { cards.removeAt(it) }
             }
         }
+        if (extension < 3) cards = ArrayList(cards.filterNot { it is DiaoHuLiShan || it is YuQinGuZong })
+        if (extension < 2) cards = ArrayList(cards.filterNot { it is FengYunBianHuan || it is MiLing })
         for (card in cards) {
             val index =
                 if (card.colors.size == 1) card.colors.first().number * 4
diff --git a/src/main/kotlin/handler/JoinRoomTos.kt b/src/main/kotlin/handler/JoinRoomTos.kt
@@ -113,6 +113,7 @@ class JoinRoomTos : ProtoHandler {
                 }
             }
             player.playerName = playerName
+            player.roomExtension = pb.extension
             val count = PlayerGameCount(playerInfo.winCount, playerInfo.gameCount)
             if (!newGame.onPlayerJoinRoom(player, count)) {
                 Game.playerNameCache.remove(playerName) // 登录失败的话，要把注册清掉
@@ -121,6 +122,7 @@ class JoinRoomTos : ProtoHandler {
             }
             player.game = newGame
             player.send(getRoomInfoToc {
+                extension = player.roomExtension
                 myPosition = player.location
                 onlineCount = Game.onlineCount
                 inGameCount = Game.inGameCount
diff --git a/src/main/kotlin/handler/SetRoomExtensionTos.kt b/src/main/kotlin/handler/SetRoomExtensionTos.kt
@@ -0,0 +1,14 @@
+package com.fengsheng.handler
+
+import com.fengsheng.HumanPlayer
+import com.fengsheng.protos.Fengsheng
+import com.fengsheng.protos.setRoomExtensionToc
+
+class SetRoomExtensionTos : AbstractProtoHandler<Fengsheng.set_room_extension_tos>() {
+    override fun handle0(r: HumanPlayer, pb: Fengsheng.set_room_extension_tos) {
+        r.roomExtension = pb.extension
+        r.send(setRoomExtensionToc {
+            extension = r.roomExtension
+        })
+    }
+}
diff --git a/src/main/kotlin/phase/StartGame.kt b/src/main/kotlin/phase/StartGame.kt
@@ -14,7 +14,7 @@ class StartGame(val game: Game, override val whoseTurn: Player) : Fsm {
         logger.info("游戏开始了，场上的角色依次是：${players.joinToString()}")
         game.turn = 0
         game.realTurn = 0
-        game.deck.init(players.size)
+        game.deck.init(players.size, game.extension)
         for (i in players.indices) players[(whoseTurn + i) % players.size]!!.init()
         for (i in players.indices) players[(whoseTurn + i) % players.size]!!.draw(Config.HandCardCountBegin)
         GameExecutor.post(game, { game.resolve(DrawPhase(players[whoseTurn]!!)) }, 1, TimeUnit.SECONDS)
diff --git a/src/main/kotlin/phase/WaitForSelectRole.kt b/src/main/kotlin/phase/WaitForSelectRole.kt
@@ -112,6 +112,14 @@ class WaitForSelectRole(val game: Game, val options: List<MutableList<RoleSkills
             waitingSecond = ((endTime - System.currentTimeMillis()) / 1000.0).roundToInt().coerceAtLeast(1)
             possibleSecretTask.addAll(game.possibleSecretTasks)
         })
+        if (player.roomExtension != game.extension) {
+            val extensionName = when (game.extension) {
+                1 -> "标准包"
+                2 -> "标准包+一扩"
+                else -> "全部扩展包"
+            }
+            player.sendErrorMessage("根据投票结果，本次游戏使用$extensionName")
+        }
         if (game.players.size < 5)
             player.notifyIdentity()
     }
diff --git a/src/main/kotlin/skill/HouLaiRen.kt b/src/main/kotlin/skill/HouLaiRen.kt
@@ -57,7 +57,7 @@ class HouLaiRen : ActiveSkill {
         r.incrSeq()
         r.addSkillUseCount(skillId)
         g.playerSetRoleFaceUp(r, true)
-        val roles = RoleCache.getRandomRoles(3, g.players.map { it!!.role }.toSet())
+        val roles = RoleCache.getRandomRoles(3, g.players.map { it!!.role }.toSet(), g.extension)
         val discardCards = r.messageCards.filter { it.id != message.remainCardId }
         logger.info("${r}发动了[后来人]，弃掉了${discardCards.joinToString()}")
         r.messageCards.clear()
diff --git a/src/main/kotlin/skill/RoleCache.kt b/src/main/kotlin/skill/RoleCache.kt
@@ -141,9 +141,14 @@ object RoleCache {
     /**
      * @return 长度为 `n` 的列表
      */
-    fun getRandomRoles(n: Int): List<RoleSkillsData> = runBlocking {
+    fun getRandomRoles(n: Int, extension: Int): List<RoleSkillsData> = runBlocking {
         mu.withLock {
-            val indexList = cache.indices.shuffled()
+            // TODO: 禁用角色再解禁的情况下会导致限制扩展包排序不对
+            val indexList = when (extension) {
+                2 -> 1..cache.indexOfFirst { it.role == sp_duan_mu_jing }
+                1 -> 1..cache.indexOfFirst { it.role == sp_li_ning_yu }
+                else -> cache.indices
+            }.shuffled()
             List(n) { i -> if (i < indexList.size) cache[indexList[i]] else RoleSkillsData() }
         }
     }
@@ -152,10 +157,15 @@ object RoleCache {
      * @param except 排除的角色
      * @return 长度为 `n` 的列表
      */
-    fun getRandomRoles(n: Int, except: Set<role>): List<RoleSkillsData> = runBlocking {
+    fun getRandomRoles(n: Int, except: Set<role>, extension: Int): List<RoleSkillsData> = runBlocking {
         mu.withLock {
+            // TODO: 禁用角色再解禁的情况下会导致限制扩展包排序不对
             val cache = this@RoleCache.cache.filterNot { it.role in except }
-            val indexList = cache.indices.shuffled()
+            val indexList = when (extension) {
+                2 -> 1..cache.indexOfFirst { it.role == sp_duan_mu_jing }
+                1 -> 1..cache.indexOfFirst { it.role == sp_li_ning_yu }
+                else -> cache.indices
+            }.shuffled()
             List(n) { i -> if (i < indexList.size) cache[indexList[i]] else RoleSkillsData() }
         }
     }
@@ -164,8 +174,8 @@ object RoleCache {
      * @param roles 返回数组的前几个角色强行指定
      * @return 长度为 `n` 的列表
      */
-    fun getRandomRolesWithSpecific(n: Int, roles: List<role>): List<RoleSkillsData> {
-        val roleSkillsDataList = getRandomRoles(n).toMutableList()
+    fun getRandomRolesWithSpecific(n: Int, roles: List<role>, extension: Int): List<RoleSkillsData> {
+        val roleSkillsDataList = getRandomRoles(n, extension).toMutableList()
         var roleIndex = 0
         while (roleIndex < roles.size && roleIndex < n) {
             val index = roleSkillsDataList.indexOfFirst { it.role == roles[roleIndex] }
diff --git a/src/main/proto/fengsheng.proto b/src/main/proto/fengsheng.proto
@@ -73,6 +73,7 @@ message join_room_tos {
   string name = 2; // 玩家的名字
   string password = 4; // 密码，建议客户端先加密一下再发过来
   uint32 player_count = 6; // （创房）房间内的总人数
+  uint32 extension = 7; // 扩展包，1-只有基础，2-基础一扩，3-全部，0-默认全部
 }
 
 // 返回房间所有人的信息
@@ -87,6 +88,15 @@ message get_room_info_toc {
   string          notice = 8; // 房间公告
   uint32          room_id = 9; // 房间号
   uint32          in_game_count = 10; // 正在进行游戏的桌数
+  uint32          extension = 11; // 扩展包，1-只有基础，2-基础一扩，3-全部
+}
+
+message set_room_extension_tos {
+  uint32 extension = 1; // 扩展包，1-只有基础，2-基础一扩，3-全部
+}
+
+message set_room_extension_toc {
+  uint32 extension = 1; // 扩展包，1-只有基础，2-基础一扩，3-全部
 }
 
 // 通知房间倒计时

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ class Deck(private val game: Game) {`
`125`	`125`	`})`
`126`	`126`	`}`
`127`	`127`
`128`		`- fun init(totalPlayerCount: Int) {`
	`128`	`+ fun init(totalPlayerCount: Int, extension: Int) {`
`129`	`129`	`cards.clear()`
`130`	`130`	`if (totalPlayerCount <= 4) {`
`131`	`131`	`cards.addAll(DefaultDeck.subList(0, 108))`
`@@ -140,6 +140,8 @@ class Deck(private val game: Game) {`
`140`	`140`	`shiTanIndex.forEach { cards.removeAt(it) }`
`141`	`141`	`}`
`142`	`142`	`}`
	`143`	`+ if (extension < 3) cards = ArrayList(cards.filterNot { it is DiaoHuLiShan \|\| it is YuQinGuZong })`
	`144`	`+ if (extension < 2) cards = ArrayList(cards.filterNot { it is FengYunBianHuan \|\| it is MiLing })`
`143`	`145`	`for (card in cards) {`
`144`	`146`	`val index =`
`145`	`147`	`if (card.colors.size == 1) card.colors.first().number * 4`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ class JoinRoomTos : ProtoHandler {`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`player.playerName = playerName`
	`116`	`+ player.roomExtension = pb.extension`
`116`	`117`	`val count = PlayerGameCount(playerInfo.winCount, playerInfo.gameCount)`
`117`	`118`	`if (!newGame.onPlayerJoinRoom(player, count)) {`
`118`	`119`	`Game.playerNameCache.remove(playerName) // 登录失败的话，要把注册清掉`
`@@ -121,6 +122,7 @@ class JoinRoomTos : ProtoHandler {`
`121`	`122`	`}`
`122`	`123`	`player.game = newGame`
`123`	`124`	`player.send(getRoomInfoToc {`
	`125`	`+ extension = player.roomExtension`
`124`	`126`	`myPosition = player.location`
`125`	`127`	`onlineCount = Game.onlineCount`
`126`	`128`	`inGameCount = Game.inGameCount`