From fc74efac2dca3d497e72b24b3a9228e9bc678816 Mon Sep 17 00:00:00 2001
From: yupi <592789970@qq.com>
Date: Sat, 17 Sep 2022 23:32:26 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=8A=A8=E7=89=A9=E5=9B=BE=E6=A1=88=E3=80=81=E9=9A=8F?=
 =?UTF-8?q?=E6=9C=BA=E5=8C=BA=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue              |  7 +++-
 src/core/game.ts         | 24 ++++++------
 src/pages/ConfigPage.vue | 29 ++++++++++++++-
 src/pages/GamePage.vue   | 80 ++++++++++++++++++++++------------------
 4 files changed, 91 insertions(+), 49 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 8b442bb..d22022b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,9 +8,14 @@
 <script setup lang="ts"></script>
 <style scoped>
 #app {
-  padding: 16px 16px 50px;
   background: url("assets/bg.jpeg");
+  padding: 16px 16px 50px;
   min-height: 100vh;
   background-size: 100% 100%;
 }
+
+.content {
+  max-width: 480px;
+  margin: 0 auto;
+}
 </style>
diff --git a/src/core/game.ts b/src/core/game.ts
index df99183..9f55388 100644
--- a/src/core/game.ts
+++ b/src/core/game.ts
@@ -28,10 +28,10 @@ const useGame = () => {
   const blockData: Record<number, BlockType> = {};
 
   // 总块数
-  let totalBlockNum = 0;
+  let totalBlockNum = ref(0);
 
   // 已消除块数
-  let clearBlockNum = 0;
+  let clearBlockNum = ref(0);
 
   // 总共划分 24 x 24 的格子，每个块占 3 x 3 的格子，生成的起始 x 和 y 坐标范围均为 0 ~ 21
   const boxWidthNum = 24;
@@ -99,12 +99,12 @@ const useGame = () => {
 
     // 补齐到 blockNumUnit 的倍数
     // e.g. minBlockNum = 14, blockNumUnit = 6, 补到 18
-    totalBlockNum = minBlockNum;
-    if (totalBlockNum % blockNumUnit !== 0) {
-      totalBlockNum =
+    totalBlockNum.value = minBlockNum;
+    if (totalBlockNum.value % blockNumUnit !== 0) {
+      totalBlockNum.value =
         (Math.floor(minBlockNum / blockNumUnit) + 1) * blockNumUnit;
     }
-    console.log("总块数", totalBlockNum);
+    console.log("总块数", totalBlockNum.value);
 
     // 2. 初始化块，随机生成块的内容
     // 保存所有块的数组
@@ -112,14 +112,14 @@ const useGame = () => {
     // 需要用到的动物数组
     const needAnimals = gameConfig.animals.slice(0, gameConfig.typeNum);
     // 依次把块塞到数组里
-    for (let i = 0; i < totalBlockNum; i++) {
+    for (let i = 0; i < totalBlockNum.value; i++) {
       animalBlocks.push(needAnimals[i % gameConfig.typeNum]);
     }
     // 打乱数组
     const randomAnimalBlocks = _.shuffle(animalBlocks);
 
     // 初始化
-    for (let i = 0; i < totalBlockNum; i++) {
+    for (let i = 0; i < totalBlockNum.value; i++) {
       const newBlock = {
         id: i,
         status: 0,
@@ -146,7 +146,7 @@ const useGame = () => {
     });
 
     // 剩余块数
-    let leftBlockNum = totalBlockNum - totalRandomBlockNum;
+    let leftBlockNum = totalBlockNum.value - totalRandomBlockNum;
 
     // 4. 计算有层级关系的块
     const levelBlocks: BlockType[] = [];
@@ -337,7 +337,7 @@ const useGame = () => {
         // 块状态改为已消除
         slotBlock.status = 2;
         // 已消除块数 +1
-        clearBlockNum++;
+        clearBlockNum.value++;
         // 清除操作记录，防止撤回
         opHistory = [];
         return;
@@ -353,7 +353,7 @@ const useGame = () => {
         alert("你输了");
       }, 2000);
     }
-    if (clearBlockNum >= totalBlockNum) {
+    if (clearBlockNum.value >= totalBlockNum.value) {
       gameStatus.value = 3;
     }
   };
@@ -467,6 +467,8 @@ const useGame = () => {
     heightUnit,
     currSlotNum,
     opHistory,
+    totalBlockNum,
+    clearBlockNum,
     doClickBlock,
     doStart,
     doShuffle,
diff --git a/src/pages/ConfigPage.vue b/src/pages/ConfigPage.vue
index 23e11fc..2516ce7 100644
--- a/src/pages/ConfigPage.vue
+++ b/src/pages/ConfigPage.vue
@@ -20,6 +20,9 @@
       <a-form-item label="动物数" name="typeNum">
         <a-input-number v-model:value="config.typeNum" />
       </a-form-item>
+      <a-form-item label="动物图案" name="animalStr">
+        <a-input v-model:value="config.animalStr" />
+      </a-form-item>
       <a-form-item label="总层数" name="levelNum">
         <a-input-number v-model:value="config.levelNum" />
       </a-form-item>
@@ -29,6 +32,12 @@
       <a-form-item label="边界收缩" name="borderStep">
         <a-input-number v-model:value="config.borderStep" />
       </a-form-item>
+      <a-form-item label="随机区数" name="randomAreaNum">
+        <a-input-number v-model:value="config.randomAreaNum" />
+      </a-form-item>
+      <a-form-item label="随机区块数" name="randomBlockNum">
+        <a-input-number v-model:value="config.randomBlockNum" />
+      </a-form-item>
       <a-form-item>
         <a-button
           type="primary"
@@ -53,9 +62,25 @@ import { defaultGameConfig } from "../core/gameConfig";
 const formRef = ref<FormInstance>();
 const router = useRouter();
 const { setGameConfig, setCustomConfig } = useGlobalStore();
-const config = reactive<GameConfigType>({ ...defaultGameConfig });
+const initConfig = {
+  ...defaultGameConfig,
+  randomAreaNum: 2,
+  randomBlockNum: 8,
+  animalStr: defaultGameConfig.animals.join(""),
+};
+const config = reactive<any>(initConfig);
 
-const handleFinish = (values: GameConfigType) => {
+/**
+ * 表单提交
+ * @param values
+ */
+const handleFinish = (values: any) => {
+  config.randomBlocks = new Array(values.randomAreaNum).fill(
+    values.randomBlockNum
+  );
+  if (values.animalStr) {
+    config.animals = Array.from(values.animalStr);
+  }
   setGameConfig(config);
   setCustomConfig(config);
   router.push("/game");
diff --git a/src/pages/GamePage.vue b/src/pages/GamePage.vue
index 0deac2b..f54a7b1 100644
--- a/src/pages/GamePage.vue
+++ b/src/pages/GamePage.vue
@@ -1,13 +1,18 @@
 <template>
   <div id="gamePage">
-    <a-button style="margin-bottom: 8px" @click="doBack"> 返回</a-button>
+    <a-row align="space-between">
+      <a-button style="margin-bottom: 8px" @click="doBack"> 返回</a-button>
+      <a-button>块数：{{ clearBlockNum }} / {{ totalBlockNum }}</a-button>
+    </a-row>
+    <!-- 胜利 -->
     <a-row align="center">
-      <!-- 胜利 -->
       <div v-if="gameStatus === 3" style="text-align: center">
         <h2>恭喜，你赢啦！🎉</h2>
         <img alt="程序员鱼皮" src="../assets/kunkun.png" />
       </div>
-      <!-- 分层选块 -->
+    </a-row>
+    <!-- 分层选块 -->
+    <a-row align="center">
       <div v-show="gameStatus > 0" class="level-board">
         <div v-for="(block, idx) in levelBlocksVal" :key="idx">
           <div
@@ -26,47 +31,45 @@
           </div>
         </div>
       </div>
-      <!-- 随机选块 -->
-      <div class="random-board">
+    </a-row>
+    <!-- 随机选块 -->
+    <a-row align="space-between" class="random-board">
+      <div
+        v-for="(randomBlock, index) in randomBlocksVal"
+        :key="index"
+        class="random-area"
+      >
         <div
-          v-for="(randomBlock, index) in randomBlocksVal"
-          :key="index"
-          class="random-area"
-        >
-          <div
-            v-if="randomBlock.length > 0"
-            :data-id="randomBlock[0].id"
-            class="block"
-            @click="() => doClickBlock(randomBlock[0], index)"
-          >
-            {{ randomBlock[0].type }}
-          </div>
-          <!-- 隐藏 -->
-          <div
-            v-for="num in Math.max(randomBlock.length - 1, 0)"
-            :key="num"
-            class="block disabled"
-          ></div>
-        </div>
-      </div>
-      <!-- 槽位 -->
-      <div v-if="slotAreaVal.length > 0" class="slot-board">
-        <div
-          v-for="(slotBlock, index) in slotAreaVal"
-          :key="index"
+          v-if="randomBlock.length > 0"
+          :data-id="randomBlock[0].id"
           class="block"
+          @click="() => doClickBlock(randomBlock[0], index)"
         >
-          {{ slotBlock?.type }}
+          {{ randomBlock[0].type }}
         </div>
+        <!-- 隐藏 -->
+        <div
+          v-for="num in Math.max(randomBlock.length - 1, 0)"
+          :key="num"
+          class="block disabled"
+        ></div>
       </div>
-      <!-- 技能 -->
-      <a-space style="margin-top: 16px">
+    </a-row>
+    <!-- 槽位 -->
+    <a-row v-if="slotAreaVal.length > 0" align="center" class="slot-board">
+      <div v-for="(slotBlock, index) in slotAreaVal" :key="index" class="block">
+        {{ slotBlock?.type }}
+      </div>
+    </a-row>
+    <!-- 技能 -->
+    <div class="skill-board">
+      <a-space>
         <a-button size="small" @click="doRevert">撤回</a-button>
         <a-button size="small" @click="doRemove">移出</a-button>
         <a-button size="small" @click="doShuffle">洗牌</a-button>
         <a-button size="small" @click="doBroke">破坏</a-button>
       </a-space>
-    </a-row>
+    </div>
   </div>
 </template>
 
@@ -84,6 +87,8 @@ const {
   slotAreaVal,
   widthUnit,
   heightUnit,
+  totalBlockNum,
+  clearBlockNum,
   doClickBlock,
   doStart,
   doShuffle,
@@ -122,8 +127,13 @@ onMounted(() => {
 }
 
 .slot-board {
-  margin-top: 24px;
   border: 10px solid saddlebrown;
+  margin: 16px auto;
+  width: fit-content;
+}
+
+.skill-board {
+  text-align: center;
 }
 
 .block {