+ class:border-r={borderRight}
+ class:border-r-4={borderRightBold}
+ class:border-b={borderBottom}
+ class:border-b-4={borderBottomBold}>
{#if !disabled}
-
-
-
+ class:user-number={userNumber}
+ class:selected={selected}
+ class:same-area={sameArea}
+ class:same-number={sameNumber}
+ class:conflicting-number={conflictingNumber}>
+
+ {#if hint && !value }
+
+
+ {:else}
+
+
+ {/if}
{/if}
@@ -70,6 +106,10 @@
@apply leading-full text-base;
}
+ .hint-number{
+ @apply text-yellow-600;
+ }
+
@media (min-width: 300px) {
.cell-text {
@apply text-lg;
diff --git a/src/components/Board/index.svelte b/src/components/Board/index.svelte
index 6fcf65f5..6cfe21df 100644
--- a/src/components/Board/index.svelte
+++ b/src/components/Board/index.svelte
@@ -5,7 +5,9 @@
import { settings } from '@sudoku/stores/settings';
import { cursor } from '@sudoku/stores/cursor';
import { candidates } from '@sudoku/stores/candidates';
+ import { strategySolution } from '@sudoku/stores/grid';
import Cell from './Cell.svelte';
+ import { showHints } from '@sudoku/stores/hints'
function isSelected(cursorStore, x, y) {
return cursorStore.x === x && cursorStore.y === y;
@@ -42,7 +44,8 @@
h.x === x && h.y === y)?.candidates : 0}
disabled={$gamePaused}
selected={isSelected($cursor, x, y)}
userNumber={$grid[y][x] === 0}
diff --git a/src/components/Controls/ActionBar/Actions.svelte b/src/components/Controls/ActionBar/Actions.svelte
index 2fdaee54..ae26a552 100644
--- a/src/components/Controls/ActionBar/Actions.svelte
+++ b/src/components/Controls/ActionBar/Actions.svelte
@@ -2,55 +2,61 @@
import { candidates } from '@sudoku/stores/candidates';
import { userGrid } from '@sudoku/stores/grid';
import { cursor } from '@sudoku/stores/cursor';
- import { hints } from '@sudoku/stores/hints';
import { notes } from '@sudoku/stores/notes';
import { settings } from '@sudoku/stores/settings';
import { keyboardDisabled } from '@sudoku/stores/keyboard';
import { gamePaused } from '@sudoku/stores/game';
+ import { showHints } from '@sudoku/stores/hints';
+ import { backtrack } from '@sudoku/stores/backtrack';
+ import { UndoRedoManager } from '@sudoku/stores/UndoRedoManager';
- $: hintsAvailable = $hints > 0;
- function handleHint() {
- if (hintsAvailable) {
- if ($candidates.hasOwnProperty($cursor.x + ',' + $cursor.y)) {
- candidates.clear($cursor);
- }
-
- userGrid.applyHint($cursor);
+ function handleStrategy() {
+ candidates.syncWithStrategy();
+ if (showHints.get() === 0){
+ showHints.set(1);
+ }else{
+ showHints.set(0);
}
}
+
+ function handleUndo() {
+ UndoRedoManager.undo();
+ }
+
+ function handleRedo() {
+ UndoRedoManager.redo();
+ }
+
+ function handleBacktrack() {
+
+ }
diff --git a/src/components/Controls/Keyboard.svelte b/src/components/Controls/Keyboard.svelte
index f0e7a90b..8f489ccd 100644
--- a/src/components/Controls/Keyboard.svelte
+++ b/src/components/Controls/Keyboard.svelte
@@ -3,9 +3,11 @@
import { cursor } from '@sudoku/stores/cursor';
import { notes } from '@sudoku/stores/notes';
import { candidates } from '@sudoku/stores/candidates';
+ import { stateManager } from '@sudoku/stores/stateManager'
// TODO: Improve keyboardDisabled
import { keyboardDisabled } from '@sudoku/stores/keyboard';
+ import { UndoRedoManager } from '@sudoku/stores/UndoRedoManager';
function handleKeyButton(num) {
if (!$keyboardDisabled) {
@@ -22,6 +24,11 @@
}
userGrid.set($cursor, num);
+ stateManager.add_state(userGrid.get()); // 添加状态
+ UndoRedoManager.newAction(stateManager.get_index(userGrid.get()));
+ // console.log('keyboard input');
+ // console.log(userGrid.get());
+ // console.log(stateManager.get_state_dict());
}
}
}
diff --git a/src/components/Header/index.svelte b/src/components/Header/index.svelte
index 584bcd60..d7fbed10 100644
--- a/src/components/Header/index.svelte
+++ b/src/components/Header/index.svelte
@@ -1,4 +1,4 @@
-
diff --git a/src/components/Modal/Types/Settings.svelte b/src/components/Modal/Types/Settings.svelte
index f21ffeff..8cbe155d 100644
--- a/src/components/Modal/Types/Settings.svelte
+++ b/src/components/Modal/Types/Settings.svelte
@@ -46,7 +46,11 @@
|