Skip to content

N
Neos
Commit d6111209 authored by Chunchi Che's avatar Chunchi Che
Browse files
Options

Merge branch 'feat/callstack' into 'main' 

Feat/callstack

See merge request mycard/Neos!146
parents e9d1b91f 2ba135b6
Show whitespace changes
Inline Side-by-side
Showing with 485 additions and 172 deletions
neos-protobuf @ 91892bf3
Subproject commit 3973685c657030b845ef385e8a0610971c8c60b9 Subproject commit 91892bf33e2359f6617c82b0f5f3617ed36f3540
neos.config.json
View file @ d6111209
{ {
"version": 4948, "version":4948,
"servers": [ "servers":[
{ {
"ip": "koishi-r.momobako.com", "ip":"koishi-r.momobako.com",
"port": "7211" "port":"7211"
} }
], ],
"assetsPath": "/neos-assets", "assetsPath":"/neos-assets",
"cardImgUrl": "https://cdn02.moecube.com:444/images/ygopro-images-zh-CN", "cardImgUrl":"https://cdn02.moecube.com:444/images/ygopro-images-zh-CN",
"cardsDbUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb", "cardsDbUrl":"https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb",
"stringsUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/strings.conf", "stringsUrl":"https://cdn02.moecube.com:444/ygopro-database/zh-CN/strings.conf",
"ui": { "ui":{
"ground": { "ground":{
"width": 9.9, "width":9.9,
"height": 8 "height":8
}, },
"card": { "card":{
"transform": { "transform":{
"x": 0.8, "x":0.8,
"y": 1, "y":1,
"z": 0.05 "z":0.05
}, },
"rotation": { "rotation":{
"x": 1.55, "x":1.55,
"y": 0, "y":0,
"z": 0 "z":0
}, },
"reverseRotation": { "reverseRotation":{
"x": 1.55, "x":1.55,
"y": 3.1, "y":3.1,
"z": 0 "z":0
}, },
"defenceRotation": { "defenceRotation":{
"x": 1.55, "x":1.55,
"y": 1.55, "y":1.55,
"z": 0 "z":0
}, },
"handRotation": { "handRotation":{
"x": 1, "x":1,
"y": 0, "y":0,
"z": 0 "z":0
}, },
"handHoverScaling": { "handHoverScaling":{
"x": 1.2, "x":1.2,
"y": 1.2, "y":1.2,
"z": 1 "z":1
}, },
"floating": 0.02 "floating":0.02
}, },
"layout": { "layout":{
"header": { "header":{
"height": 80 "height":80
}, },
"content": { "content":{
"height": 800 "height":800
}, },
"sider": { "sider":{
"width": 300 "width":300
}, },
"footer": { "footer":{
"height": 80 "height":80
} }
}, },
"status": { "status":{
"avatarSize": 40, "avatarSize":40,
"meAvatarColor": "#0e63e1", "meAvatarColor":"#0e63e1",
"opAvatarColor": "#e10e68" "opAvatarColor":"#e10e68"
}, },
"hint": { "hint":{
"waitingDuration": 1.5 "waitingDuration":1.5
}
} }
},
"unimplementedWhiteList":[
1,
6,
7,
30,
31,
32,
34,
54,
55,
56,
60,
61,
62,
63,
64,
65,
70,
71,
72,
73,
74,
75,
76,
80,
81,
83,
93,
95,
96,
97,
101,
102,
110,
111,
112,
113,
114,
120,
121,
122,
123,
130,
131,
132,
133,
160,
161,
163,
164,
165,
170,
180
]
} }
neos.config.prod.json
View file @ d6111209
{ {
"version": 4948, "version":4948,
"servers": [ "servers":[
{ {
"ip": "koishi-r.momobako.com", "ip":"koishi-r.momobako.com",
"port": "7211" "port":"7211"
} }
], ],
"assetsPath": "https://cdn02.moecube.com:444/neos/neos-assets", "assetsPath":"/neos-assets",
"cardImgUrl": "https://cdn02.moecube.com:444/images/ygopro-images-zh-CN", "cardImgUrl":"https://cdn02.moecube.com:444/images/ygopro-images-zh-CN",
"cardsDbUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb", "cardsDbUrl":"https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb",
"stringsUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/strings.conf", "stringsUrl":"https://cdn02.moecube.com:444/ygopro-database/zh-CN/strings.conf",
"ui": { "ui":{
"ground": { "ground":{
"width": 9.9, "width":9.9,
"height": 8 "height":8
}, },
"card": { "card":{
"transform": { "transform":{
"x": 0.8, "x":0.8,
"y": 1, "y":1,
"z": 0.05 "z":0.05
}, },
"rotation": { "rotation":{
"x": 1.55, "x":1.55,
"y": 0, "y":0,
"z": 0 "z":0
}, },
"reverseRotation": { "reverseRotation":{
"x": 1.55, "x":1.55,
"y": 3.1, "y":3.1,
"z": 0 "z":0
}, },
"defenceRotation": { "defenceRotation":{
"x": 1.55, "x":1.55,
"y": 1.55, "y":1.55,
"z": 0 "z":0
}, },
"handRotation": { "handRotation":{
"x": 1, "x":1,
"y": 0, "y":0,
"z": 0 "z":0
}, },
"handHoverScaling": { "handHoverScaling":{
"x": 1.2, "x":1.2,
"y": 1.2, "y":1.2,
"z": 1 "z":1
}, },
"floating": 0.02 "floating":0.02
}, },
"layout": { "layout":{
"header": { "header":{
"height": 80 "height":80
}, },
"content": { "content":{
"height": 800 "height":800
}, },
"sider": { "sider":{
"width": 300 "width":300
}, },
"footer": { "footer":{
"height": 80 "height":80
} }
}, },
"status": { "status":{
"avatarSize": 40, "avatarSize":40,
"meAvatarColor": "#0e63e1", "meAvatarColor":"#0e63e1",
"opAvatarColor": "#e10e68" "opAvatarColor":"#e10e68"
}, },
"hint": { "hint":{
"waitingDuration": 1.5 "waitingDuration":1.5
}
} }
},
"unimplementedWhiteList":[
1,
6,
7,
30,
31,
32,
34,
54,
55,
56,
60,
61,
62,
63,
64,
65,
70,
71,
72,
73,
74,
75,
76,
80,
81,
83,
93,
95,
96,
97,
101,
102,
110,
111,
112,
113,
114,
120,
121,
122,
123,
130,
131,
132,
133,
160,
161,
163,
164,
165,
170,
180
]
} }
src/api/ocgcore/idl/ocgcore.ts
View file @ d6111209
...@@ -5446,7 +5446,7 @@ export namespace ygopro { ...@@ -5446,7 +5446,7 @@ export namespace ygopro {
#one_of_decls: number[][] = [ #one_of_decls: number[][] = [
[ [
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 21, 22,
], ],
]; ];
constructor( constructor(
...@@ -5475,6 +5475,7 @@ export namespace ygopro { ...@@ -5475,6 +5475,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5498,6 +5499,7 @@ export namespace ygopro { ...@@ -5498,6 +5499,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5521,6 +5523,7 @@ export namespace ygopro { ...@@ -5521,6 +5523,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5544,6 +5547,7 @@ export namespace ygopro { ...@@ -5544,6 +5547,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5567,6 +5571,7 @@ export namespace ygopro { ...@@ -5567,6 +5571,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5590,6 +5595,7 @@ export namespace ygopro { ...@@ -5590,6 +5595,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5613,6 +5619,7 @@ export namespace ygopro { ...@@ -5613,6 +5619,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5636,6 +5643,7 @@ export namespace ygopro { ...@@ -5636,6 +5643,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5659,6 +5667,7 @@ export namespace ygopro { ...@@ -5659,6 +5667,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5682,6 +5691,7 @@ export namespace ygopro { ...@@ -5682,6 +5691,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5705,6 +5715,7 @@ export namespace ygopro { ...@@ -5705,6 +5715,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5728,6 +5739,7 @@ export namespace ygopro { ...@@ -5728,6 +5739,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5751,6 +5763,7 @@ export namespace ygopro { ...@@ -5751,6 +5763,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5774,6 +5787,7 @@ export namespace ygopro { ...@@ -5774,6 +5787,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5797,6 +5811,7 @@ export namespace ygopro { ...@@ -5797,6 +5811,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5820,6 +5835,7 @@ export namespace ygopro { ...@@ -5820,6 +5835,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5843,6 +5859,7 @@ export namespace ygopro { ...@@ -5843,6 +5859,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5866,6 +5883,7 @@ export namespace ygopro { ...@@ -5866,6 +5883,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5889,6 +5907,7 @@ export namespace ygopro { ...@@ -5889,6 +5907,7 @@ export namespace ygopro {
update_hp?: StocGameMessage.MsgUpdateHp; update_hp?: StocGameMessage.MsgUpdateHp;
win?: never; win?: never;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5912,6 +5931,7 @@ export namespace ygopro { ...@@ -5912,6 +5931,7 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: StocGameMessage.MsgWin; win?: StocGameMessage.MsgWin;
wait?: never; wait?: never;
unimplemented?: never;
} }
| { | {
start?: never; start?: never;
...@@ -5935,6 +5955,31 @@ export namespace ygopro { ...@@ -5935,6 +5955,31 @@ export namespace ygopro {
update_hp?: never; update_hp?: never;
win?: never; win?: never;
wait?: StocGameMessage.MsgWait; wait?: StocGameMessage.MsgWait;
unimplemented?: never;
}
| {
start?: never;
draw?: never;
new_turn?: never;
new_phase?: never;
hint?: never;
select_idle_cmd?: never;
select_place?: never;
move?: never;
select_card?: never;
select_chain?: never;
select_effect_yn?: never;
select_position?: never;
select_option?: never;
shuffle_hand?: never;
select_battle_cmd?: never;
pos_change?: never;
select_unselect_card?: never;
select_yes_no?: never;
update_hp?: never;
win?: never;
wait?: never;
unimplemented?: StocGameMessage.MsgUnimplemented;
} }
)) ))
) { ) {
...@@ -6017,6 +6062,9 @@ export namespace ygopro { ...@@ -6017,6 +6062,9 @@ export namespace ygopro {
if ("wait" in data && data.wait != undefined) { if ("wait" in data && data.wait != undefined) {
this.wait = data.wait; this.wait = data.wait;
} }
if ("unimplemented" in data && data.unimplemented != undefined) {
this.unimplemented = data.unimplemented;
}
} }
} }
get start() { get start() {
...@@ -6292,6 +6340,19 @@ export namespace ygopro { ...@@ -6292,6 +6340,19 @@ export namespace ygopro {
get has_wait() { get has_wait() {
return pb_1.Message.getField(this, 21) != null; return pb_1.Message.getField(this, 21) != null;
} }
get unimplemented() {
return pb_1.Message.getWrapperField(
this,
StocGameMessage.MsgUnimplemented,
22
) as StocGameMessage.MsgUnimplemented;
}
set unimplemented(value: StocGameMessage.MsgUnimplemented) {
pb_1.Message.setOneofWrapperField(this, 22, this.#one_of_decls[0], value);
}
get has_unimplemented() {
return pb_1.Message.getField(this, 22) != null;
}
get gameMsg() { get gameMsg() {
const cases: { const cases: {
[index: number]: [index: number]:
...@@ -6316,7 +6377,8 @@ export namespace ygopro { ...@@ -6316,7 +6377,8 @@ export namespace ygopro {
| "select_yes_no" | "select_yes_no"
| "update_hp" | "update_hp"
| "win" | "win"
| "wait"; | "wait"
| "unimplemented";
} = { } = {
0: "none", 0: "none",
1: "start", 1: "start",
...@@ -6340,13 +6402,14 @@ export namespace ygopro { ...@@ -6340,13 +6402,14 @@ export namespace ygopro {
19: "update_hp", 19: "update_hp",
20: "win", 20: "win",
21: "wait", 21: "wait",
22: "unimplemented",
}; };
return cases[ return cases[
pb_1.Message.computeOneofCase( pb_1.Message.computeOneofCase(
this, this,
[ [
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 20, 21, 22,
] ]
) )
]; ];
...@@ -6403,6 +6466,9 @@ export namespace ygopro { ...@@ -6403,6 +6466,9 @@ export namespace ygopro {
>; >;
win?: ReturnType<typeof StocGameMessage.MsgWin.prototype.toObject>; win?: ReturnType<typeof StocGameMessage.MsgWin.prototype.toObject>;
wait?: ReturnType<typeof StocGameMessage.MsgWait.prototype.toObject>; wait?: ReturnType<typeof StocGameMessage.MsgWait.prototype.toObject>;
unimplemented?: ReturnType<
typeof StocGameMessage.MsgUnimplemented.prototype.toObject
>;
}): StocGameMessage { }): StocGameMessage {
const message = new StocGameMessage({}); const message = new StocGameMessage({});
if (data.start != null) { if (data.start != null) {
...@@ -6496,6 +6562,11 @@ export namespace ygopro { ...@@ -6496,6 +6562,11 @@ export namespace ygopro {
if (data.wait != null) { if (data.wait != null) {
message.wait = StocGameMessage.MsgWait.fromObject(data.wait); message.wait = StocGameMessage.MsgWait.fromObject(data.wait);
} }
if (data.unimplemented != null) {
message.unimplemented = StocGameMessage.MsgUnimplemented.fromObject(
data.unimplemented
);
}
return message; return message;
} }
toObject() { toObject() {
...@@ -6551,6 +6622,9 @@ export namespace ygopro { ...@@ -6551,6 +6622,9 @@ export namespace ygopro {
>; >;
win?: ReturnType<typeof StocGameMessage.MsgWin.prototype.toObject>; win?: ReturnType<typeof StocGameMessage.MsgWin.prototype.toObject>;
wait?: ReturnType<typeof StocGameMessage.MsgWait.prototype.toObject>; wait?: ReturnType<typeof StocGameMessage.MsgWait.prototype.toObject>;
unimplemented?: ReturnType<
typeof StocGameMessage.MsgUnimplemented.prototype.toObject
>;
} = {}; } = {};
if (this.start != null) { if (this.start != null) {
data.start = this.start.toObject(); data.start = this.start.toObject();
...@@ -6615,6 +6689,9 @@ export namespace ygopro { ...@@ -6615,6 +6689,9 @@ export namespace ygopro {
if (this.wait != null) { if (this.wait != null) {
data.wait = this.wait.toObject(); data.wait = this.wait.toObject();
} }
if (this.unimplemented != null) {
data.unimplemented = this.unimplemented.toObject();
}
return data; return data;
} }
serialize(): Uint8Array; serialize(): Uint8Array;
...@@ -6693,6 +6770,10 @@ export namespace ygopro { ...@@ -6693,6 +6770,10 @@ export namespace ygopro {
writer.writeMessage(20, this.win, () => this.win.serialize(writer)); writer.writeMessage(20, this.win, () => this.win.serialize(writer));
if (this.has_wait) if (this.has_wait)
writer.writeMessage(21, this.wait, () => this.wait.serialize(writer)); writer.writeMessage(21, this.wait, () => this.wait.serialize(writer));
if (this.has_unimplemented)
writer.writeMessage(22, this.unimplemented, () =>
this.unimplemented.serialize(writer)
);
if (!w) return writer.getResultBuffer(); if (!w) return writer.getResultBuffer();
} }
static deserialize(bytes: Uint8Array | pb_1.BinaryReader): StocGameMessage { static deserialize(bytes: Uint8Array | pb_1.BinaryReader): StocGameMessage {
...@@ -6861,6 +6942,14 @@ export namespace ygopro { ...@@ -6861,6 +6942,14 @@ export namespace ygopro {
() => (message.wait = StocGameMessage.MsgWait.deserialize(reader)) () => (message.wait = StocGameMessage.MsgWait.deserialize(reader))
); );
break; break;
case 22:
reader.readMessage(
message.unimplemented,
() =>
(message.unimplemented =
StocGameMessage.MsgUnimplemented.deserialize(reader))
);
break;
default: default:
reader.skipField(); reader.skipField();
} }
...@@ -11471,5 +11560,85 @@ export namespace ygopro { ...@@ -11471,5 +11560,85 @@ export namespace ygopro {
return MsgWait.deserialize(bytes); return MsgWait.deserialize(bytes);
} }
} }
export class MsgUnimplemented extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(
data?:
| any[]
| {
command?: number;
}
) {
super();
pb_1.Message.initialize(
this,
Array.isArray(data) ? data : [],
0,
-1,
[],
this.#one_of_decls
);
if (!Array.isArray(data) && typeof data == "object") {
if ("command" in data && data.command != undefined) {
this.command = data.command;
}
}
}
get command() {
return pb_1.Message.getFieldWithDefault(this, 1, 0) as number;
}
set command(value: number) {
pb_1.Message.setField(this, 1, value);
}
static fromObject(data: { command?: number }): MsgUnimplemented {
const message = new MsgUnimplemented({});
if (data.command != null) {
message.command = data.command;
}
return message;
}
toObject() {
const data: {
command?: number;
} = {};
if (this.command != null) {
data.command = this.command;
}
return data;
}
serialize(): Uint8Array;
serialize(w: pb_1.BinaryWriter): void;
serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
const writer = w || new pb_1.BinaryWriter();
if (this.command != 0) writer.writeInt32(1, this.command);
if (!w) return writer.getResultBuffer();
}
static deserialize(
bytes: Uint8Array | pb_1.BinaryReader
): MsgUnimplemented {
const reader =
bytes instanceof pb_1.BinaryReader
? bytes
: new pb_1.BinaryReader(bytes),
message = new MsgUnimplemented();
while (reader.nextField()) {
if (reader.isEndGroup()) break;
switch (reader.getFieldNumber()) {
case 1:
message.command = reader.readInt32();
break;
default:
reader.skipField();
}
}
return message;
}
serializeBinary(): Uint8Array {
return this.serialize();
}
static deserializeBinary(bytes: Uint8Array): MsgUnimplemented {
return MsgUnimplemented.deserialize(bytes);
}
}
} }
} }
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts
View file @ d6111209
...@@ -149,7 +149,9 @@ export default class GameMsgAdapter implements StocAdapter { ...@@ -149,7 +149,9 @@ export default class GameMsgAdapter implements StocAdapter {
break; break;
} }
default: { default: {
console.log("Unhandled GameMessage function=", func); gameMsg.unimplemented = new ygopro.StocGameMessage.MsgUnimplemented({
command: func,
});
break; break;
} }
......
src/reducers/duel/mod.ts
View file @ d6111209
...@@ -144,6 +144,8 @@ export interface DuelState { ...@@ -144,6 +144,8 @@ export interface DuelState {
waiting?: boolean; waiting?: boolean;
unimplemented?: number; // 未处理的`Message`
// UI相关 // UI相关
modalState: ModalState; modalState: ModalState;
} }
...@@ -264,6 +266,11 @@ const duelSlice = createSlice({ ...@@ -264,6 +266,11 @@ const duelSlice = createSlice({
setWaiting: (state, action: PayloadAction<boolean>) => { setWaiting: (state, action: PayloadAction<boolean>) => {
state.waiting = action.payload; state.waiting = action.payload;
}, },
// 未处理状态`Reducer`
setUnimplemented: (state, action: PayloadAction<number>) => {
state.unimplemented = action.payload;
},
}, },
extraReducers(builder) { extraReducers(builder) {
handsCase(builder); handsCase(builder);
...@@ -344,6 +351,7 @@ export const { ...@@ -344,6 +351,7 @@ export const {
clearAllPlaceInteractivities, clearAllPlaceInteractivities,
setResult, setResult,
setWaiting, setWaiting,
setUnimplemented,
} = duelSlice.actions; } = duelSlice.actions;
export const selectDuelHsStart = (state: RootState) => { export const selectDuelHsStart = (state: RootState) => {
return state.duel.meInitInfo != null; return state.duel.meInitInfo != null;
...@@ -354,4 +362,7 @@ export const selectDuelResult = (state: RootState) => { ...@@ -354,4 +362,7 @@ export const selectDuelResult = (state: RootState) => {
export const selectWaiting = (state: RootState) => { export const selectWaiting = (state: RootState) => {
return state.duel.waiting; return state.duel.waiting;
}; };
export const selectUnimplemented = (state: RootState) => {
return state.duel.unimplemented;
};
export default duelSlice.reducer; export default duelSlice.reducer;
src/service/duel/gameMsg.ts
View file @ d6111209
...@@ -21,6 +21,7 @@ import onMsgSelectYesNo from "./selectYesNo"; ...@@ -21,6 +21,7 @@ import onMsgSelectYesNo from "./selectYesNo";
import onMsgUpdateHp from "./updateHp"; import onMsgUpdateHp from "./updateHp";
import onMsgWin from "./win"; import onMsgWin from "./win";
import onMsgWait from "./wait"; import onMsgWait from "./wait";
import onUnimplemented from "./unimplemented";
import { setWaiting } from "../../reducers/duel/mod"; import { setWaiting } from "../../reducers/duel/mod";
const ActiveList = [ const ActiveList = [
...@@ -150,6 +151,11 @@ export default function handleGameMsg(pb: ygopro.YgoStocMsg) { ...@@ -150,6 +151,11 @@ export default function handleGameMsg(pb: ygopro.YgoStocMsg) {
break; break;
} }
case "unimplemented": {
onUnimplemented(msg.unimplemented, dispatch);
break;
}
default: { default: {
break; break;
} }
......
src/service/duel/unimplemented.ts 0 → 100644
View file @ d6111209
import { ygopro } from "../../api/ocgcore/idl/ocgcore";
import { setUnimplemented } from "../../reducers/duel/mod";
import { AppDispatch } from "../../store";
import NeosConfig from "../../../neos.config.json";
export default (
unimplemented: ygopro.StocGameMessage.MsgUnimplemented,
dispatch: AppDispatch
) => {
if (!NeosConfig.unimplementedWhiteList.includes(unimplemented.command)) {
dispatch(setUnimplemented(unimplemented.command));
}
};
src/ui/Duel/2d.tsx deleted 100644 → 0
View file @ e9d1b91f
import React from "react";
export const Button2D = (props: {
text: string;
left: number;
enable: boolean;
onClick: () => void;
}) => (
<adtFullscreenUi name="ui">
<rectangle
name="rect"
height="20px"
width="60px"
isEnabled={props.enable}
left={props.left}
>
<rectangle>
<babylon-button
name="close-icon"
onPointerDownObservable={props.onClick}
>
<textBlock
text={props.text}
fontFamily="FontAwesome"
fontStyle="bold"
fontSize={15}
color={props.enable ? "yellow" : "white"}
/>
</babylon-button>
</rectangle>
</rectangle>
</adtFullscreenUi>
);
src/ui/Duel/alert.tsx 0 → 100644
View file @ d6111209
import React from "react";
import { useNavigate } from "react-router-dom";
import { sendSurrender } from "../../api/ocgcore/ocgHelper";
import { useAppSelector } from "../../hook";
import { selectUnimplemented } from "../../reducers/duel/mod";
import { Alert } from "antd";
const NeosAlert = () => {
const unimplemented = useAppSelector(selectUnimplemented);
const navigate = useNavigate();
return (
<>
{unimplemented ? (
<Alert
message={`Unimplemented message with code=${unimplemented}`}
description="It seems that there's something unimplemented by Neos. Sincerely apologize for that. Contact use to fix this issue: <linuxgnulover@gmail.com>"
showIcon
type="error"
closable
banner
afterClose={() => {
// 发送投降信号
sendSurrender();
navigate("/");
}}
/>
) : (
<></>
)}
</>
);
};
export default NeosAlert;
src/ui/Duel/main.tsx
View file @ d6111209
...@@ -25,11 +25,13 @@ import DuelTimeLine from "./timeLine"; ...@@ -25,11 +25,13 @@ import DuelTimeLine from "./timeLine";
import { Row } from "antd"; import { Row } from "antd";
import SendBox from "./sendBox"; import SendBox from "./sendBox";
import PlayerStatus from "./status"; import PlayerStatus from "./status";
import Alert from "./alert";
// Ref: https://github.com/brianzinn/react-babylonjs/issues/126 // Ref: https://github.com/brianzinn/react-babylonjs/issues/126
const NeosDuel = () => { const NeosDuel = () => {
return ( return (
<> <>
<Alert />
<NeosLayout <NeosLayout
sider={<NeosSider />} sider={<NeosSider />}
header={<PlayerStatus />} header={<PlayerStatus />}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment