From 25f8ef86ea796be627997f98e7023809f08dd210 Mon Sep 17 00:00:00 2001
From: eee555 <2234208506@qq.com>
Date: Sun, 28 Jul 2024 21:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E5=BD=95=E5=83=8F?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                     | 2 +-
 base/Cargo.toml               | 2 +-
 base/src/utils.rs             | 4 ++--
 base/src/videos/base_video.rs | 9 +++++----
 wasm/Cargo.toml               | 2 +-
 wasm/src/board.rs             | 4 ++--
 wasm/www/index.js             | 2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 07eca7e..7bd2d08 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Algorithms for minesweeper, published on various platforms.
 
 python>=3.7, <=3.10 (适用于以下架构windows: x86, x64; linux: aarch64, armv7, ppc64le, s390x, x86, x86_64; macos: aarch64, x86_64): 1.4.10
 
-javascript/typescript (webpack等bundler): 1.4.6-alpha
+javascript/typescript (webpack等bundler): 1.4.7
 
 javascript/typescript (nodejs): 1.4.0-alpha
 
diff --git a/base/Cargo.toml b/base/Cargo.toml
index 6591ed8..9bb03de 100644
--- a/base/Cargo.toml
+++ b/base/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Wang Jianing <wangjianing@88.com>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-default = ["rs"]
+default = ["js"]
 js = ["getrandom", "web-sys"]
 py = ["rand", "tract-onnx"]
 rs = ["rand", "tract-onnx"]
diff --git a/base/src/utils.rs b/base/src/utils.rs
index 9526da0..9a598c9 100644
--- a/base/src/utils.rs
+++ b/base/src/utils.rs
@@ -438,13 +438,13 @@ pub trait js_shuffle {
 }
 
 #[cfg(feature = "js")]
-impl<T> js_shuffle for Vec<T> {
+impl js_shuffle for Vec<i32> {
     fn shuffle_(&mut self) {
         // 存疑！！！！！
         let l = self.len();
         for i in 1..l {
             let id = get_random_int(i + 1);
-            let t = self[i].clone();
+            let t = self[i];
             self[i] = self[id];
             self[id] = t;
         }
diff --git a/base/src/videos/base_video.rs b/base/src/videos/base_video.rs
index bea1fe7..01ed34a 100644
--- a/base/src/videos/base_video.rs
+++ b/base/src/videos/base_video.rs
@@ -671,9 +671,10 @@ impl BaseVideo<SafeBoard> {
                 }
             }
             GameBoardState::Playing => {
-                if self.mode != 9 && self.mode != 10 {
-                    return Err(());
-                }
+                // 不再限制模式，以防过于严格。
+                // if self.mode != 6 && self.mode != 7 && self.mode != 8 && self.mode != 9 && self.mode != 10 {
+                //     return Err(());
+                // }
                 if self.width != board[0].len() || self.height != board.len() {
                     return Err(());
                 }
@@ -2262,7 +2263,7 @@ impl<T> BaseVideo<T> {
                 return 1;
             }
         } else if self.software == "元3.2".as_bytes().to_vec()
-            || self.software == "元3.1.7".as_bytes().to_vec()
+            || self.software == "元3.1.9".as_bytes().to_vec()
         {
             if self.checksum.iter().all(|&e| e == self.checksum[0]) {
                 // 大概率是使用了测试用的校验和
diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
index a7300d1..0827e06 100644
--- a/wasm/Cargo.toml
+++ b/wasm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ms-toollib"
-version = "1.4.6-alpha"
+version = "1.4.7"
 authors = ["eee555 <50390200+eee555@users.noreply.github.com>"]
 edition = "2021"
 homepage = "https://github.com/eee555/ms-toollib"
diff --git a/wasm/src/board.rs b/wasm/src/board.rs
index a4aed12..71e6ac3 100644
--- a/wasm/src/board.rs
+++ b/wasm/src/board.rs
@@ -165,8 +165,8 @@ macro_rules! generate_video {
                     self.core.data.is_completed
                 }
                 #[wasm_bindgen(getter)]
-                pub fn get_is_offical(&self) -> bool {
-                    self.core.data.is_offical
+                pub fn get_is_official(&self) -> bool {
+                    self.core.data.is_official
                 }
                 #[wasm_bindgen(getter)]
                 pub fn get_is_fair(&self) -> bool {
diff --git a/wasm/www/index.js b/wasm/www/index.js
index dd160c7..fb47f66 100644
--- a/wasm/www/index.js
+++ b/wasm/www/index.js
@@ -42,7 +42,7 @@ request.onload = () => {
         console.log(video.events_x(i), video.events_y(i), video.events_mouse(i));
     }
     console.log(video.get_is_fair);
-    console.log(video.get_is_offical);
+    console.log(video.get_is_official);
     console.log(video.get_is_completed);
     console.log(video.is_valid());
 }