Merge origin/main into frontend parity worktree
This commit is contained in:
commit
f7311385ce
34 files changed
+2358
-244
No files matched your search
@@ -80,6 +80,17 @@ export type TurnDaemonCommand =
|
||||
}
|
||||
| { type: 'dropItem'; requestId?: string; generalId: number; itemType: string }
|
||||
| { type: 'auctionFinalize'; requestId?: string; auctionId: number }
|
||||
| {
|
||||
type: 'auctionOpen';
|
||||
requestId?: string;
|
||||
generalId: number;
|
||||
auctionType: 'BUY_RICE' | 'SELL_RICE' | 'UNIQUE_ITEM';
|
||||
amount: number;
|
||||
closeTurnCnt?: number;
|
||||
startBidAmount?: number;
|
||||
finishBidAmount?: number;
|
||||
itemKey?: string;
|
||||
}
|
||||
| {
|
||||
type: 'changePermission';
|
||||
requestId?: string;
|
||||
@@ -226,6 +237,17 @@ export type TurnDaemonCommandResult =
|
||||
generalId: number;
|
||||
reason: string;
|
||||
}
|
||||
| {
|
||||
type: 'auctionOpen';
|
||||
ok: true;
|
||||
auctionId: number;
|
||||
closeAt: string;
|
||||
}
|
||||
| {
|
||||
type: 'auctionOpen';
|
||||
ok: false;
|
||||
reason: string;
|
||||
}
|
||||
| {
|
||||
type: 'troopJoin';
|
||||
ok: true;
|
||||
|
||||
Reference in new issue
Block a user