Merge branch 'main' into release

CHANGELOG.md

@@ -1,2 +1,20 @@
+## [0.2.0]
+還是測試版，目前還在想要新增什麼功能
+
+### 新增
+- 設定新增開起存檔及暫存資料夾的按鈕，以便使用者備份或移機
+- 設定新增版本顯示
+- 裝備染色表格，預覽當前裝備色相、飽和或亮度的變化
+- 高清化(Anime4K) 現在將會直接套用在預覽角色身上
+
+### 修改
+- 修正皇家神獸學院裝備無法載入的問題(no slot/vslot at info)
+- 修正啟用篩選染色時會導致髮型及臉型也被套用的問題
+- 修正一些鞋子渲染錯誤
+- 修正部分披風渲染時會有部件消失的問題
+- 小修改一些 UI
+- 升級一些套件
+
+
 ## [0.1.0]
 - 首次發布測試版

package.json

@@ -1,6 +1,6 @@
 {
   "name": "maplecharactercreator",
-  "version": "0.0.0",
+  "version": "0.2.0",
   "description": "",
   "type": "module",
   "scripts": {
@@ -17,7 +17,7 @@
     "@ark-ui/solid": "^3.5.0",
     "@nanostores/solid": "^0.4.2",
     "@pdf-lib/upng": "^1.0.1",
-    "@tanstack/solid-virtual": "^3.5.1",
+    "@tanstack/solid-virtual": "^3.10.6",
     "@tauri-apps/api": ">=2.0.0-rc.0",
     "@tauri-apps/plugin-dialog": "^2.0.0-rc.0",
     "@tauri-apps/plugin-fs": "^2.0.0-rc.0",
@@ -30,11 +30,11 @@
     "lucide-solid": "^0.394.0",
     "mingcute_icon": "^2.9.4",
     "modern-gif": "^2.0.3",
-    "nanostores": "^0.10.3",
+    "nanostores": "^0.11.3",
     "p-queue": "^8.0.1",
     "pixi-filters": "^6.0.3",
     "pixi-viewport": "^5.0.3",
-    "pixi.js": "^8.3.3",
+    "pixi.js": "^8.3.4",
     "solid-js": "^1.7.8",
     "throttle-debounce": "^5.0.0",
     "wasm-webp": "^0.0.2"

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "maplesalon2"
-version = "0.1.0"
+version = "0.2.0"
 description = "MapleSalon2 - A tool for preview hair, face and item dye using MapleStory wz files."
 authors = ["Leo"]
 edition = "2021"

src-tauri/tauri.conf.json

@@ -1,6 +1,6 @@
 {
   "productName": "MapleSalon2",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "identifier": "com.maplesalon.io",
   "build": {
     "beforeDevCommand": "npm run dev",

src/components/AppContainer.tsx

@@ -18,7 +18,7 @@ export const AppContainer = (props: AppContainerProps) => {
       class={css({
         position: 'relative',
         mx: { base: 0, lg: 2 },
-        mt: 4,
+        mt: 11,
         paddingLeft: isLeftDrawerPin()
           ? { base: 2, lg: '{sizes.xs}' }
           : { base: 2, '2xl': '{sizes.xs}' },

src/components/CharacterPreview/ActionSelect.tsx

@@ -3,101 +3,17 @@ import { useStore } from '@nanostores/solid';
 import { $currentCharacterInfo } from '@/store/character/store';
 import { $currentAction } from '@/store/character/selector';
 
-import { SimpleSelect, type ValueChangeDetails } from '@/components/ui/select';
+import { ActionSelect as BaseActionSelect } from '@/components/elements/ActionSelect';
 
-import { CharacterAction } from '@/const/actions';
-
-const options = [
-  {
-    label: '站立',
-    value: CharacterAction.Stand1,
-  },
-  {
-    label: '坐下',
-    value: CharacterAction.Sit,
-  },
-  {
-    label: '走路',
-    value: CharacterAction.Walk1,
-  },
-  {
-    label: '跳躍',
-    value: CharacterAction.Jump,
-  },
-  {
-    label: '飛行/游泳',
-    value: CharacterAction.Fly,
-  },
-  {
-    label: '攀爬(梯子)',
-    value: CharacterAction.Ladder,
-  },
-  {
-    label: '攀爬(繩子)',
-    value: CharacterAction.Rope,
-  },
-  {
-    label: '警戒',
-    value: CharacterAction.Alert,
-  },
-  {
-    label: '施放',
-    value: CharacterAction.Heal,
-  },
-  {
-    label: '趴下',
-    value: CharacterAction.Prone,
-  },
-  {
-    label: '趴下攻擊',
-    value: CharacterAction.ProneStab,
-  },
-  ...[
-    CharacterAction.Shoot1,
-    CharacterAction.Shoot2,
-    CharacterAction.ShootF,
-    CharacterAction.Sit,
-    CharacterAction.StabO1,
-    CharacterAction.StabO2,
-    CharacterAction.StabOF,
-    CharacterAction.StabT1,
-    CharacterAction.StabT2,
-    CharacterAction.StabTF,
-    CharacterAction.SwingO1,
-    CharacterAction.SwingO2,
-    CharacterAction.SwingO3,
-    CharacterAction.SwingOF,
-    CharacterAction.SwingP1,
-    CharacterAction.SwingP2,
-    CharacterAction.SwingPF,
-    CharacterAction.SwingT1,
-    CharacterAction.SwingT2,
-    CharacterAction.SwingT3,
-    CharacterAction.SwingTF,
-  ].map((value) => ({
-    label: value,
-    value,
-  })),
-];
+import type { CharacterAction } from '@/const/actions';
 
 export const ActionSelect = () => {
   const action = useStore($currentAction);
-  function handleActionChange(details: ValueChangeDetails) {
-    const firstItem = details.value?.[0];
-    firstItem &&
-      $currentCharacterInfo.setKey('action', firstItem as CharacterAction);
+  function handleActionChange(action: CharacterAction | undefined) {
+    action && $currentCharacterInfo.setKey('action', action);
   }
 
   return (
-    <SimpleSelect
-      positioning={{
-        sameWidth: true,
-      }}
-      items={options}
-      value={[action()]}
-      onValueChange={handleActionChange}
-      groupTitle="角色動作"
-      maxHeight="20rem"
-    />
+    <BaseActionSelect value={action()} onValueChange={handleActionChange} />
   );
 };