Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
N
Neos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Neos
Commits
9750ad07
Commit
9750ad07
authored
Mar 23, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feat/select_sum' into 'main'
Feat/select sum See merge request
mycard/Neos!151
parents
5c851ecc
a1f9891e
Pipeline
#20893
passed with stages
in 16 minutes and 52 seconds
Changes
14
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
988 additions
and
5 deletions
+988
-5
neos-protobuf
neos-protobuf
+1
-1
src/api/ocgcore/idl/ocgcore.ts
src/api/ocgcore/idl/ocgcore.ts
+547
-3
src/api/ocgcore/ocgAdapter/bufferIO.ts
src/api/ocgcore/ocgAdapter/bufferIO.ts
+12
-0
src/api/ocgcore/ocgAdapter/protoDecl.ts
src/api/ocgcore/ocgAdapter/protoDecl.ts
+1
-0
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts
+6
-0
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectSum.ts
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectSum.ts
+66
-0
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectTribute.ts
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectTribute.ts
+1
-0
src/reducers/duel/mod.ts
src/reducers/duel/mod.ts
+31
-0
src/reducers/duel/modal/checkCardModalV3Slice.ts
src/reducers/duel/modal/checkCardModalV3Slice.ts
+135
-0
src/reducers/duel/modal/mod.ts
src/reducers/duel/modal/mod.ts
+30
-1
src/service/duel/gameMsg.ts
src/service/duel/gameMsg.ts
+6
-0
src/service/duel/selectSum.ts
src/service/duel/selectSum.ts
+31
-0
src/ui/Duel/checkCardModalV3.tsx
src/ui/Duel/checkCardModalV3.tsx
+119
-0
src/ui/Duel/main.tsx
src/ui/Duel/main.tsx
+2
-0
No files found.
neos-protobuf
@
3090fbcb
Subproject commit
4f6cdd7ccc3b11b39ff8aa649e423bcf401f7ad5
Subproject commit
3090fbcb9d0c51fa7aa20b3e313917d971cf15ca
src/api/ocgcore/idl/ocgcore.ts
View file @
9750ad07
...
...
@@ -5446,7 +5446,7 @@ export namespace ygopro {
#one_of_decls: number[][] = [
[
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21
,
22
,
23
,
24
,
21, 22, 23, 24,
25,
],
];
constructor(
...
...
@@ -5478,6 +5478,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5504,6 +5505,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5530,6 +5532,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5556,6 +5559,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5582,6 +5586,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5608,6 +5613,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5634,6 +5640,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5660,6 +5667,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5686,6 +5694,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5712,6 +5721,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5738,6 +5748,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5764,6 +5775,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5790,6 +5802,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5816,6 +5829,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5842,6 +5856,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5868,6 +5883,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5894,6 +5910,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5920,6 +5937,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5946,6 +5964,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5972,6 +5991,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -5998,6 +6018,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -6024,6 +6045,7 @@ export namespace ygopro {
unimplemented?: StocGameMessage.MsgUnimplemented;
update_data?: never;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -6050,6 +6072,7 @@ export namespace ygopro {
unimplemented?: never;
update_data?: StocGameMessage.MsgUpdateData;
reload_field?: never;
select_sum?: never;
}
| {
start?: never;
...
...
@@ -6076,6 +6099,34 @@ export namespace ygopro {
unimplemented?: never;
update_data?: never;
reload_field?: StocGameMessage.MsgReloadField;
select_sum?: 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?: never;
update_data?: never;
reload_field?: never;
select_sum?: StocGameMessage.MsgSelectSum;
}
))
) {
...
...
@@ -6167,6 +6218,9 @@ export namespace ygopro {
if ("reload_field" in data && data.reload_field != undefined) {
this.reload_field = data.reload_field;
}
if ("select_sum" in data && data.select_sum != undefined) {
this.select_sum = data.select_sum;
}
}
}
get start() {
...
...
@@ -6481,6 +6535,19 @@ export namespace ygopro {
get has_reload_field() {
return pb_1.Message.getField(this, 24) != null;
}
get select_sum() {
return pb_1.Message.getWrapperField(
this,
StocGameMessage.MsgSelectSum,
25
) as StocGameMessage.MsgSelectSum;
}
set select_sum(value: StocGameMessage.MsgSelectSum) {
pb_1.Message.setOneofWrapperField(this, 25, this.#one_of_decls[0], value);
}
get has_select_sum() {
return pb_1.Message.getField(this, 25) != null;
}
get gameMsg() {
const cases: {
[index: number]:
...
...
@@ -6508,7 +6575,8 @@ export namespace ygopro {
| "wait"
| "unimplemented"
| "update_data"
|
"
reload_field
"
;
| "reload_field"
| "select_sum";
} = {
0: "none",
1: "start",
...
...
@@ -6535,13 +6603,14 @@ export namespace ygopro {
22: "unimplemented",
23: "update_data",
24: "reload_field",
25: "select_sum",
};
return cases[
pb_1.Message.computeOneofCase(
this,
[
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20
,
21
,
22
,
23
,
24
,
20, 21, 22, 23, 24,
25,
]
)
];
...
...
@@ -6607,6 +6676,9 @@ export namespace ygopro {
reload_field?: ReturnType<
typeof StocGameMessage.MsgReloadField.prototype.toObject
>;
select_sum?: ReturnType<
typeof StocGameMessage.MsgSelectSum.prototype.toObject
>;
}): StocGameMessage {
const message = new StocGameMessage({});
if (data.start != null) {
...
...
@@ -6715,6 +6787,11 @@ export namespace ygopro {
data.reload_field
);
}
if (data.select_sum != null) {
message.select_sum = StocGameMessage.MsgSelectSum.fromObject(
data.select_sum
);
}
return message;
}
toObject() {
...
...
@@ -6779,6 +6856,9 @@ export namespace ygopro {
reload_field?: ReturnType<
typeof StocGameMessage.MsgReloadField.prototype.toObject
>;
select_sum?: ReturnType<
typeof StocGameMessage.MsgSelectSum.prototype.toObject
>;
} = {};
if (this.start != null) {
data.start = this.start.toObject();
...
...
@@ -6852,6 +6932,9 @@ export namespace ygopro {
if (this.reload_field != null) {
data.reload_field = this.reload_field.toObject();
}
if (this.select_sum != null) {
data.select_sum = this.select_sum.toObject();
}
return data;
}
serialize(): Uint8Array;
...
...
@@ -6942,6 +7025,10 @@ export namespace ygopro {
writer.writeMessage(24, this.reload_field, () =>
this.reload_field.serialize(writer)
);
if (this.has_select_sum)
writer.writeMessage(25, this.select_sum, () =>
this.select_sum.serialize(writer)
);
if (!w) return writer.getResultBuffer();
}
static deserialize(bytes: Uint8Array | pb_1.BinaryReader): StocGameMessage {
...
...
@@ -7134,6 +7221,14 @@ export namespace ygopro {
StocGameMessage.MsgReloadField.deserialize(reader))
);
break;
case 25:
reader.readMessage(
message.select_sum,
() =>
(message.select_sum =
StocGameMessage.MsgSelectSum.deserialize(reader))
);
break;
default:
reader.skipField();
}
...
...
@@ -11335,6 +11430,455 @@ export namespace ygopro {
}
}
}
export class MsgSelectSum extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(
data?:
| any[]
| {
overflow?: number;
player?: number;
level_sum?: number;
min?: number;
max?: number;
must_select_cards?: StocGameMessage.MsgSelectSum.Info[];
selectable_cards?: StocGameMessage.MsgSelectSum.Info[];
}
) {
super();
pb_1.Message.initialize(
this,
Array.isArray(data) ? data : [],
0,
-1,
[6, 7],
this.#one_of_decls
);
if (!Array.isArray(data) && typeof data == "object") {
if ("overflow" in data && data.overflow != undefined) {
this.overflow = data.overflow;
}
if ("player" in data && data.player != undefined) {
this.player = data.player;
}
if ("level_sum" in data && data.level_sum != undefined) {
this.level_sum = data.level_sum;
}
if ("min" in data && data.min != undefined) {
this.min = data.min;
}
if ("max" in data && data.max != undefined) {
this.max = data.max;
}
if (
"must_select_cards" in data &&
data.must_select_cards != undefined
) {
this.must_select_cards = data.must_select_cards;
}
if (
"selectable_cards" in data &&
data.selectable_cards != undefined
) {
this.selectable_cards = data.selectable_cards;
}
}
}
get overflow() {
return pb_1.Message.getFieldWithDefault(this, 1, 0) as number;
}
set overflow(value: number) {
pb_1.Message.setField(this, 1, value);
}
get player() {
return pb_1.Message.getFieldWithDefault(this, 2, 0) as number;
}
set player(value: number) {
pb_1.Message.setField(this, 2, value);
}
get level_sum() {
return pb_1.Message.getFieldWithDefault(this, 3, 0) as number;
}
set level_sum(value: number) {
pb_1.Message.setField(this, 3, value);
}
get min() {
return pb_1.Message.getFieldWithDefault(this, 4, 0) as number;
}
set min(value: number) {
pb_1.Message.setField(this, 4, value);
}
get max() {
return pb_1.Message.getFieldWithDefault(this, 5, 0) as number;
}
set max(value: number) {
pb_1.Message.setField(this, 5, value);
}
get must_select_cards() {
return pb_1.Message.getRepeatedWrapperField(
this,
StocGameMessage.MsgSelectSum.Info,
6
) as StocGameMessage.MsgSelectSum.Info[];
}
set must_select_cards(value: StocGameMessage.MsgSelectSum.Info[]) {
pb_1.Message.setRepeatedWrapperField(this, 6, value);
}
get selectable_cards() {
return pb_1.Message.getRepeatedWrapperField(
this,
StocGameMessage.MsgSelectSum.Info,
7
) as StocGameMessage.MsgSelectSum.Info[];
}
set selectable_cards(value: StocGameMessage.MsgSelectSum.Info[]) {
pb_1.Message.setRepeatedWrapperField(this, 7, value);
}
static fromObject(data: {
overflow?: number;
player?: number;
level_sum?: number;
min?: number;
max?: number;
must_select_cards?: ReturnType<
typeof StocGameMessage.MsgSelectSum.Info.prototype.toObject
>[];
selectable_cards?: ReturnType<
typeof StocGameMessage.MsgSelectSum.Info.prototype.toObject
>[];
}): MsgSelectSum {
const message = new MsgSelectSum({});
if (data.overflow != null) {
message.overflow = data.overflow;
}
if (data.player != null) {
message.player = data.player;
}
if (data.level_sum != null) {
message.level_sum = data.level_sum;
}
if (data.min != null) {
message.min = data.min;
}
if (data.max != null) {
message.max = data.max;
}
if (data.must_select_cards != null) {
message.must_select_cards = data.must_select_cards.map((item) =>
StocGameMessage.MsgSelectSum.Info.fromObject(item)
);
}
if (data.selectable_cards != null) {
message.selectable_cards = data.selectable_cards.map((item) =>
StocGameMessage.MsgSelectSum.Info.fromObject(item)
);
}
return message;
}
toObject() {
const data: {
overflow?: number;
player?: number;
level_sum?: number;
min?: number;
max?: number;
must_select_cards?: ReturnType<
typeof StocGameMessage.MsgSelectSum.Info.prototype.toObject
>[];
selectable_cards?: ReturnType<
typeof StocGameMessage.MsgSelectSum.Info.prototype.toObject
>[];
} = {};
if (this.overflow != null) {
data.overflow = this.overflow;
}
if (this.player != null) {
data.player = this.player;
}
if (this.level_sum != null) {
data.level_sum = this.level_sum;
}
if (this.min != null) {
data.min = this.min;
}
if (this.max != null) {
data.max = this.max;
}
if (this.must_select_cards != null) {
data.must_select_cards = this.must_select_cards.map(
(item: StocGameMessage.MsgSelectSum.Info) => item.toObject()
);
}
if (this.selectable_cards != null) {
data.selectable_cards = this.selectable_cards.map(
(item: StocGameMessage.MsgSelectSum.Info) => item.toObject()
);
}
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.overflow != 0) writer.writeInt32(1, this.overflow);
if (this.player != 0) writer.writeInt32(2, this.player);
if (this.level_sum != 0) writer.writeInt32(3, this.level_sum);
if (this.min != 0) writer.writeInt32(4, this.min);
if (this.max != 0) writer.writeInt32(5, this.max);
if (this.must_select_cards.length)
writer.writeRepeatedMessage(
6,
this.must_select_cards,
(item: StocGameMessage.MsgSelectSum.Info) => item.serialize(writer)
);
if (this.selectable_cards.length)
writer.writeRepeatedMessage(
7,
this.selectable_cards,
(item: StocGameMessage.MsgSelectSum.Info) => item.serialize(writer)
);
if (!w) return writer.getResultBuffer();
}
static deserialize(bytes: Uint8Array | pb_1.BinaryReader): MsgSelectSum {
const reader =
bytes instanceof pb_1.BinaryReader
? bytes
: new pb_1.BinaryReader(bytes),
message = new MsgSelectSum();
while (reader.nextField()) {
if (reader.isEndGroup()) break;
switch (reader.getFieldNumber()) {
case 1:
message.overflow = reader.readInt32();
break;
case 2:
message.player = reader.readInt32();
break;
case 3:
message.level_sum = reader.readInt32();
break;
case 4:
message.min = reader.readInt32();
break;
case 5:
message.max = reader.readInt32();
break;
case 6:
reader.readMessage(message.must_select_cards, () =>
pb_1.Message.addToRepeatedWrapperField(
message,
6,
StocGameMessage.MsgSelectSum.Info.deserialize(reader),
StocGameMessage.MsgSelectSum.Info
)
);
break;
case 7:
reader.readMessage(message.selectable_cards, () =>
pb_1.Message.addToRepeatedWrapperField(
message,
7,
StocGameMessage.MsgSelectSum.Info.deserialize(reader),
StocGameMessage.MsgSelectSum.Info
)
);
break;
default:
reader.skipField();
}
}
return message;
}
serializeBinary(): Uint8Array {
return this.serialize();
}
static deserializeBinary(bytes: Uint8Array): MsgSelectSum {
return MsgSelectSum.deserialize(bytes);
}
}
export namespace MsgSelectSum {
export class Info extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(
data?:
| any[]
| {
code?: number;
location?: CardLocation;
level1?: number;
level2?: number;
response?: 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 ("code" in data && data.code != undefined) {
this.code = data.code;
}
if ("location" in data && data.location != undefined) {
this.location = data.location;
}
if ("level1" in data && data.level1 != undefined) {
this.level1 = data.level1;
}
if ("level2" in data && data.level2 != undefined) {
this.level2 = data.level2;
}
if ("response" in data && data.response != undefined) {
this.response = data.response;
}
}
}
get code() {
return pb_1.Message.getFieldWithDefault(this, 1, 0) as number;
}
set code(value: number) {
pb_1.Message.setField(this, 1, value);
}
get location() {
return pb_1.Message.getWrapperField(
this,
CardLocation,
2
) as CardLocation;
}
set location(value: CardLocation) {
pb_1.Message.setWrapperField(this, 2, value);
}
get has_location() {
return pb_1.Message.getField(this, 2) != null;
}
get level1() {
return pb_1.Message.getFieldWithDefault(this, 3, 0) as number;
}
set level1(value: number) {
pb_1.Message.setField(this, 3, value);
}
get level2() {
return pb_1.Message.getFieldWithDefault(this, 4, 0) as number;
}
set level2(value: number) {
pb_1.Message.setField(this, 4, value);
}
get response() {
return pb_1.Message.getFieldWithDefault(this, 5, 0) as number;
}
set response(value: number) {
pb_1.Message.setField(this, 5, value);
}
static fromObject(data: {
code?: number;
location?: ReturnType<typeof CardLocation.prototype.toObject>;
level1?: number;
level2?: number;
response?: number;
}): Info {
const message = new Info({});
if (data.code != null) {
message.code = data.code;
}
if (data.location != null) {
message.location = CardLocation.fromObject(data.location);
}
if (data.level1 != null) {
message.level1 = data.level1;
}
if (data.level2 != null) {
message.level2 = data.level2;
}
if (data.response != null) {
message.response = data.response;
}
return message;
}
toObject() {
const data: {
code?: number;
location?: ReturnType<typeof CardLocation.prototype.toObject>;
level1?: number;
level2?: number;
response?: number;
} = {};
if (this.code != null) {
data.code = this.code;
}
if (this.location != null) {
data.location = this.location.toObject();
}
if (this.level1 != null) {
data.level1 = this.level1;
}
if (this.level2 != null) {
data.level2 = this.level2;
}
if (this.response != null) {
data.response = this.response;
}
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.code != 0) writer.writeInt32(1, this.code);
if (this.has_location)
writer.writeMessage(2, this.location, () =>
this.location.serialize(writer)
);
if (this.level1 != 0) writer.writeInt32(3, this.level1);
if (this.level2 != 0) writer.writeInt32(4, this.level2);
if (this.response != 0) writer.writeInt32(5, this.response);
if (!w) return writer.getResultBuffer();
}
static deserialize(bytes: Uint8Array | pb_1.BinaryReader): Info {
const reader =
bytes instanceof pb_1.BinaryReader
? bytes
: new pb_1.BinaryReader(bytes),
message = new Info();
while (reader.nextField()) {
if (reader.isEndGroup()) break;
switch (reader.getFieldNumber()) {
case 1:
message.code = reader.readInt32();
break;
case 2:
reader.readMessage(
message.location,
() => (message.location = CardLocation.deserialize(reader))
);
break;
case 3:
message.level1 = reader.readInt32();
break;
case 4:
message.level2 = reader.readInt32();
break;
case 5:
message.response = reader.readInt32();
break;
default:
reader.skipField();
}
}
return message;
}
serializeBinary(): Uint8Array {
return this.serialize();
}
static deserializeBinary(bytes: Uint8Array): Info {
return Info.deserialize(bytes);
}
}
}
export class MsgSelectYesNo extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(
...
...
src/api/ocgcore/ocgAdapter/bufferIO.ts
View file @
9750ad07
...
...
@@ -49,4 +49,16 @@ export class BufferReaderExt {
});
}
}
readCardShortLocation
():
ygopro
.
CardLocation
{
const
controler
=
this
.
inner
.
readUint8
();
const
location
=
this
.
inner
.
readUint8
();
const
sequence
=
this
.
inner
.
readUint8
();
return
new
ygopro
.
CardLocation
({
controler
,
location
:
numberToCardZone
(
location
),
sequence
,
});
}
}
src/api/ocgcore/ocgAdapter/protoDecl.ts
View file @
9750ad07
...
...
@@ -51,3 +51,4 @@ export const MSG_WIN = 5;
export
const
MSG_WAITING
=
3
;
export
const
MSG_UPDATE_DATA
=
6
;
export
const
MSG_RELOAD_FIELD
=
162
;
export
const
MSG_SELECT_SUM
=
23
;
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts
View file @
9750ad07
...
...
@@ -27,6 +27,7 @@ import MsgRecover from "./recover";
import
MsgWin
from
"
./win
"
;
import
MsgUpdateDataAdapter
from
"
./updateData
"
;
import
MsgReloadFieldAdapter
from
"
./reloadField
"
;
import
MsgSelectSum
from
"
./selectSum
"
;
import
PENETRATE
from
"
./penetrate
"
;
/*
...
...
@@ -160,6 +161,11 @@ export default class GameMsgAdapter implements StocAdapter {
break
;
}
case
GAME_MSG
.
MSG_SELECT_SUM
:
{
gameMsg
.
select_sum
=
MsgSelectSum
(
gameData
);
break
;
}
default
:
{
gameMsg
.
unimplemented
=
new
ygopro
.
StocGameMessage
.
MsgUnimplemented
({
command
:
func
,
...
...
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectSum.ts
0 → 100644
View file @
9750ad07
import
{
ygopro
}
from
"
../../../idl/ocgcore
"
;
import
{
BufferReaderExt
}
from
"
../../bufferIO
"
;
import
MsgSelectSum
=
ygopro
.
StocGameMessage
.
MsgSelectSum
;
/*
* Msg Select Sum
*
* @param -
*
* @usage -
* */
export
default
(
data
:
Uint8Array
)
=>
{
const
reader
=
new
BufferReaderExt
(
data
);
const
overflow
=
reader
.
inner
.
readUint8
();
const
player
=
reader
.
inner
.
readUint8
();
const
level
=
reader
.
inner
.
readInt32
();
const
min
=
reader
.
inner
.
readUint8
();
const
max
=
reader
.
inner
.
readUint8
();
const
msg
=
new
MsgSelectSum
({
overflow
,
player
,
level_sum
:
level
,
min
,
max
,
must_select_cards
:
[],
selectable_cards
:
[],
});
const
mustCount
=
reader
.
inner
.
readUint8
();
for
(
let
i
=
0
;
i
<
mustCount
;
i
++
)
{
const
code
=
reader
.
inner
.
readInt32
();
const
location
=
reader
.
readCardShortLocation
();
const
para
=
reader
.
inner
.
readInt32
();
msg
.
must_select_cards
.
push
(
new
MsgSelectSum
.
Info
({
code
,
location
,
level1
:
para
&
0xffff
,
level2
:
para
>>
16
,
response
:
i
,
})
);
}
const
selectAbleCount
=
reader
.
inner
.
readUint8
();
for
(
let
i
=
0
;
i
<
selectAbleCount
;
i
++
)
{
const
code
=
reader
.
inner
.
readInt32
();
const
location
=
reader
.
readCardShortLocation
();
const
para
=
reader
.
inner
.
readInt32
();
msg
.
selectable_cards
.
push
(
new
MsgSelectSum
.
Info
({
code
,
location
,
level1
:
para
&
0xffff
,
level2
:
para
>>
16
,
response
:
i
,
})
);
}
return
msg
;
};
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectTribute.ts
View file @
9750ad07
...
...
@@ -10,6 +10,7 @@ import MsgSelectCard = ygopro.StocGameMessage.MsgSelectCard;
* */
export
default
(
data
:
Uint8Array
)
=>
{
// FIXME: handle it correctly
const
reader
=
new
BufferReaderExt
(
data
);
const
player
=
reader
.
inner
.
readUint8
();
...
...
src/reducers/duel/mod.ts
View file @
9750ad07
...
...
@@ -53,6 +53,14 @@ import {
resetCheckCardModalV2Impl
,
setCheckCardModalV2ResponseAbleImpl
,
checkCardModalV2Case
,
setCheckCardModalV3IsOpenImpl
,
setCheckCardModalV3MinMaxImpl
,
setCheckCardModalV3AllLevelImpl
,
setCheckCardModalV3OverFlowImpl
,
setCheckCardModalV3ResponseAbleImpl
,
resetCheckCardModalV3Impl
,
setCheckCardModalV3SelectedImpl
,
checkCardModalV3Case
,
}
from
"
./modal/mod
"
;
import
{
MonsterState
,
...
...
@@ -168,6 +176,14 @@ const initialState: DuelState = {
selectableOptions
:
[],
selectedOptions
:
[],
},
checkCardModalV3
:
{
isOpen
:
false
,
overflow
:
false
,
allLevel
:
0
,
mustSelectList
:
[],
selectAbleList
:
[],
selectedList
:
[],
},
},
};
...
...
@@ -254,6 +270,13 @@ const duelSlice = createSlice({
setCheckCardModalV2IsOpen
:
setCheckCardModalV2IsOpenImpl
,
resetCheckCardModalV2
:
resetCheckCardModalV2Impl
,
setCheckCardModalV2ResponseAble
:
setCheckCardModalV2ResponseAbleImpl
,
setCheckCardModalV3IsOpen
:
setCheckCardModalV3IsOpenImpl
,
setCheckCardModalV3MinMax
:
setCheckCardModalV3MinMaxImpl
,
setCheckCardModalV3AllLevel
:
setCheckCardModalV3AllLevelImpl
,
setCheckCardModalV3OverFlow
:
setCheckCardModalV3OverFlowImpl
,
setCheckCardModalV3ResponseAble
:
setCheckCardModalV3ResponseAbleImpl
,
resetCheckCardModalV3
:
resetCheckCardModalV3Impl
,
setCheckCardModalV3Selected
:
setCheckCardModalV3SelectedImpl
,
// 通用的`Reducer`
clearAllIdleInteractivities
:
clearAllIdleInteractivitiesImpl
,
...
...
@@ -288,6 +311,7 @@ const duelSlice = createSlice({
YesNoModalCase
(
builder
);
optionModalCase
(
builder
);
checkCardModalV2Case
(
builder
);
checkCardModalV3Case
(
builder
);
},
});
...
...
@@ -358,6 +382,13 @@ export const {
setUnimplemented
,
updateFieldData
,
reloadField
,
setCheckCardModalV3IsOpen
,
setCheckCardModalV3MinMax
,
setCheckCardModalV3AllLevel
,
setCheckCardModalV3OverFlow
,
setCheckCardModalV3ResponseAble
,
resetCheckCardModalV3
,
setCheckCardModalV3Selected
,
}
=
duelSlice
.
actions
;
export
const
selectDuelHsStart
=
(
state
:
RootState
)
=>
{
return
state
.
duel
.
meInitInfo
!=
null
;
...
...
src/reducers/duel/modal/checkCardModalV3Slice.ts
0 → 100644
View file @
9750ad07
import
{
DuelState
}
from
"
../mod
"
;
import
{
DuelReducer
}
from
"
../generic
"
;
import
{
ActionReducerMapBuilder
,
CaseReducer
,
createAsyncThunk
,
}
from
"
@reduxjs/toolkit
"
;
import
{
CardMeta
,
fetchCard
}
from
"
../../../api/cards
"
;
import
{
RootState
}
from
"
../../../store
"
;
// 更新打开状态
export
const
setCheckCardModalV3IsOpenImpl
:
DuelReducer
<
boolean
>
=
(
state
,
action
)
=>
{
state
.
modalState
.
checkCardModalV3
.
isOpen
=
action
.
payload
;
};
// 更新选择数目
export
const
setCheckCardModalV3MinMaxImpl
:
DuelReducer
<
{
min
:
number
;
max
:
number
;
}
>
=
(
state
,
action
)
=>
{
state
.
modalState
.
checkCardModalV3
.
selectMin
=
action
.
payload
.
min
;
state
.
modalState
.
checkCardModalV3
.
selectMax
=
action
.
payload
.
max
;
};
export
const
setCheckCardModalV3AllLevelImpl
:
DuelReducer
<
number
>
=
(
state
,
action
)
=>
{
state
.
modalState
.
checkCardModalV3
.
allLevel
=
action
.
payload
;
};
export
const
setCheckCardModalV3OverFlowImpl
:
DuelReducer
<
boolean
>
=
(
state
,
action
)
=>
{
state
.
modalState
.
checkCardModalV3
.
overflow
=
action
.
payload
;
};
export
const
setCheckCardModalV3ResponseAbleImpl
:
DuelReducer
<
boolean
>
=
(
state
,
action
)
=>
{
state
.
modalState
.
checkCardModalV3
.
responseable
=
action
.
payload
;
};
export
const
setCheckCardModalV3SelectedImpl
:
DuelReducer
<
{
meta
:
CardMeta
;
level1
:
number
;
level2
:
number
;
response
:
number
;
}[]
>
=
(
state
,
action
)
=>
{
state
.
modalState
.
checkCardModalV3
.
selectedList
=
action
.
payload
;
};
// 增加卡牌选项
export
const
fetchCheckCardMetasV3
=
createAsyncThunk
(
"
duel/fetchCheckCardMetaV3
"
,
async
(
param
:
{
mustSelect
:
boolean
;
options
:
{
code
:
number
;
level1
:
number
;
level2
:
number
;
response
:
number
;
}[];
})
=>
{
const
metas
=
await
Promise
.
all
(
param
.
options
.
map
(
async
(
option
)
=>
{
return
await
fetchCard
(
option
.
code
,
true
);
})
);
const
response
=
{
mustSelect
:
param
.
mustSelect
,
metas
,
};
return
response
;
}
);
export
const
checkCardModalV3Case
=
(
builder
:
ActionReducerMapBuilder
<
DuelState
>
)
=>
{
builder
.
addCase
(
fetchCheckCardMetasV3
.
pending
,
(
state
,
action
)
=>
{
const
mustSelect
=
action
.
meta
.
arg
.
mustSelect
;
const
options
=
action
.
meta
.
arg
.
options
.
map
((
option
)
=>
{
return
{
meta
:
{
id
:
option
.
code
,
data
:
{},
text
:
{}
},
level1
:
option
.
level1
,
level2
:
option
.
level2
,
response
:
option
.
response
,
};
});
if
(
mustSelect
)
{
state
.
modalState
.
checkCardModalV3
.
mustSelectList
=
options
;
}
else
{
state
.
modalState
.
checkCardModalV3
.
selectAbleList
=
options
;
}
});
builder
.
addCase
(
fetchCheckCardMetasV3
.
fulfilled
,
(
state
,
action
)
=>
{
const
mustSelect
=
action
.
payload
.
mustSelect
;
const
metas
=
action
.
payload
.
metas
;
const
options
=
mustSelect
?
state
.
modalState
.
checkCardModalV3
.
mustSelectList
:
state
.
modalState
.
checkCardModalV3
.
selectAbleList
;
options
.
forEach
((
option
)
=>
{
metas
.
forEach
((
meta
)
=>
{
if
(
option
.
meta
.
id
==
meta
.
id
)
{
option
.
meta
=
meta
;
}
});
});
});
};
export
const
resetCheckCardModalV3Impl
:
CaseReducer
<
DuelState
>
=
(
state
)
=>
{
const
modalState
=
state
.
modalState
.
checkCardModalV3
;
modalState
.
isOpen
=
false
;
modalState
.
overflow
=
false
;
modalState
.
allLevel
=
0
;
modalState
.
responseable
=
undefined
;
modalState
.
mustSelectList
=
[];
modalState
.
selectAbleList
=
[];
modalState
.
selectedList
=
[];
};
export
const
selectCheckCardModalV3
=
(
state
:
RootState
)
=>
state
.
duel
.
modalState
.
checkCardModalV3
;
src/reducers/duel/modal/mod.ts
View file @
9750ad07
...
...
@@ -57,7 +57,7 @@ export interface ModalState {
finishAble
:
boolean
;
selectMin
?:
number
;
selectMax
?:
number
;
responseable
:
boolean
;
responseable
?
:
boolean
;
selectableOptions
:
{
code
:
number
;
name
?:
string
;
...
...
@@ -71,6 +71,34 @@ export interface ModalState {
response
:
number
;
}[];
};
// 卡牌选择弹窗V3
checkCardModalV3
:
{
isOpen
:
boolean
;
overflow
:
boolean
;
allLevel
:
number
;
selectMin
?:
number
;
selectMax
?:
number
;
responseable
?:
boolean
;
mustSelectList
:
{
meta
:
CardMeta
;
level1
:
number
;
level2
:
number
;
response
:
number
;
}[];
selectAbleList
:
{
meta
:
CardMeta
;
level1
:
number
;
level2
:
number
;
response
:
number
;
}[];
// TODO: remove this prop
selectedList
:
{
meta
:
CardMeta
;
level1
:
number
;
level2
:
number
;
response
:
number
;
}[];
};
}
export
*
from
"
./cardModalSlice
"
;
...
...
@@ -80,3 +108,4 @@ export * from "./yesNoModalSlice";
export
*
from
"
./positionModalSlice
"
;
export
*
from
"
./optionModalSlice
"
;
export
*
from
"
./checkCardModalV2Slice
"
;
export
*
from
"
./checkCardModalV3Slice
"
;
src/service/duel/gameMsg.ts
View file @
9750ad07
...
...
@@ -24,6 +24,7 @@ import onMsgWait from "./wait";
import
onUnimplemented
from
"
./unimplemented
"
;
import
onMsgUpdateData
from
"
./updateData
"
;
import
onMsgReloadField
from
"
./reloadField
"
;
import
onMsgSelectSum
from
"
./selectSum
"
;
import
{
setWaiting
}
from
"
../../reducers/duel/mod
"
;
const
ActiveList
=
[
...
...
@@ -163,6 +164,11 @@ export default function handleGameMsg(pb: ygopro.YgoStocMsg) {
break
;
}
case
"
select_sum
"
:
{
onMsgSelectSum
(
msg
.
select_sum
,
dispatch
);
break
;
}
case
"
unimplemented
"
:
{
onUnimplemented
(
msg
.
unimplemented
,
dispatch
);
...
...
src/service/duel/selectSum.ts
0 → 100644
View file @
9750ad07
import
{
ygopro
}
from
"
../../api/ocgcore/idl/ocgcore
"
;
import
{
setCheckCardModalV3AllLevel
,
setCheckCardModalV3IsOpen
,
setCheckCardModalV3MinMax
,
setCheckCardModalV3OverFlow
,
}
from
"
../../reducers/duel/mod
"
;
import
{
fetchCheckCardMetasV3
}
from
"
../../reducers/duel/modal/checkCardModalV3Slice
"
;
import
{
AppDispatch
}
from
"
../../store
"
;
import
MsgSelectSum
=
ygopro
.
StocGameMessage
.
MsgSelectSum
;
export
default
(
selectSum
:
MsgSelectSum
,
dispatch
:
AppDispatch
)
=>
{
dispatch
(
setCheckCardModalV3OverFlow
(
selectSum
.
overflow
!=
0
));
dispatch
(
setCheckCardModalV3AllLevel
(
selectSum
.
level_sum
));
dispatch
(
setCheckCardModalV3MinMax
({
min
:
selectSum
.
min
,
max
:
selectSum
.
max
})
);
dispatch
(
fetchCheckCardMetasV3
({
mustSelect
:
true
,
options
:
selectSum
.
must_select_cards
,
})
);
dispatch
(
fetchCheckCardMetasV3
({
mustSelect
:
false
,
options
:
selectSum
.
selectable_cards
,
})
);
dispatch
(
setCheckCardModalV3IsOpen
(
true
));
};
src/ui/Duel/checkCardModalV3.tsx
0 → 100644
View file @
9750ad07
import
React
,
{
useState
}
from
"
react
"
;
import
{
useAppSelector
}
from
"
../../hook
"
;
import
{
store
}
from
"
../../store
"
;
import
{
Modal
,
Button
,
Card
,
Row
,
Col
}
from
"
antd
"
;
import
{
CheckCard
}
from
"
@ant-design/pro-components
"
;
import
{
sendSelectCardResponse
}
from
"
../../api/ocgcore/ocgHelper
"
;
import
{
resetCheckCardModalV3
,
setCheckCardModalV3IsOpen
,
setCheckCardModalV3ResponseAble
,
}
from
"
../../reducers/duel/mod
"
;
import
NeosConfig
from
"
../../../neos.config.json
"
;
import
{
selectCheckCardModalV3
}
from
"
../../reducers/duel/modal/checkCardModalV3Slice
"
;
const
CheckCardModalV3
=
()
=>
{
const
dispatch
=
store
.
dispatch
;
const
state
=
useAppSelector
(
selectCheckCardModalV3
);
const
isOpen
=
state
.
isOpen
;
const
min
=
state
.
selectMin
||
0
;
const
max
=
state
.
selectMax
||
0
;
const
mustSelectOptions
=
state
.
mustSelectList
;
const
selectAbleOptions
=
state
.
selectAbleList
;
const
[
selectedOptions
,
setSelectedOptions
]
=
useState
(
state
.
selectedList
);
const
overflow
=
state
.
overflow
;
const
LevelSum
=
state
.
allLevel
;
const
Level1Sum
=
mustSelectOptions
.
concat
(
selectedOptions
)
.
map
((
option
)
=>
option
.
level1
)
.
reduce
((
sum
,
current
)
=>
sum
+
current
,
0
);
const
Level2Sum
=
mustSelectOptions
.
concat
(
selectedOptions
)
.
map
((
option
)
=>
option
.
level2
)
.
reduce
((
sum
,
current
)
=>
sum
+
current
,
0
);
const
responseable
=
(
overflow
?
Level1Sum
>=
LevelSum
||
Level2Sum
>=
LevelSum
:
Level1Sum
==
LevelSum
||
Level2Sum
==
LevelSum
)
&&
selectedOptions
.
length
<=
max
&&
selectedOptions
.
length
>=
min
;
const
onFinish
=
()
=>
{
sendSelectCardResponse
(
mustSelectOptions
.
concat
(
selectedOptions
).
map
((
option
)
=>
option
.
response
)
);
dispatch
(
setCheckCardModalV3IsOpen
(
false
));
dispatch
(
resetCheckCardModalV3
());
dispatch
(
setCheckCardModalV3ResponseAble
(
false
));
};
return
(
<
Modal
title=
{
`请选择卡片,最少${min}张,最多${max}张`
}
open=
{
isOpen
}
closable=
{
false
}
footer=
{
<>
<
Button
disabled=
{
!
responseable
}
onClick=
{
onFinish
}
>
finish
</
Button
>
</>
}
width=
{
800
}
>
<
CheckCard
.
Group
bordered
size=
"small"
multiple=
{
true
}
onChange=
{
(
values
:
any
)
=>
{
console
.
log
(
values
);
setSelectedOptions
(
values
);
}
}
>
<
Row
>
{
selectAbleOptions
.
map
((
option
,
idx
)
=>
{
return
(
<
Col
span=
{
4
}
key=
{
idx
}
>
<
CheckCard
title=
{
option
.
meta
.
text
.
name
}
description=
{
option
.
meta
.
text
.
desc
}
style=
{
{
width
:
120
}
}
cover=
{
<
img
alt=
{
option
.
meta
.
id
.
toString
()
}
src=
{
`${NeosConfig.cardImgUrl}/${option.meta.id}.jpg`
}
style=
{
{
width
:
100
}
}
/>
}
value=
{
option
}
/>
</
Col
>
);
})
}
</
Row
>
</
CheckCard
.
Group
>
<
p
>
必须选择的卡片
</
p
>
<
Row
>
{
mustSelectOptions
.
map
((
option
,
idx
)
=>
{
return
(
<
Col
span=
{
4
}
key=
{
idx
}
>
<
Card
hoverable
style=
{
{
width
:
120
}
}
cover=
{
<
img
alt=
{
option
.
meta
.
id
.
toString
()
}
src=
{
`${NeosConfig.cardImgUrl}/${option.meta.id}.jpg`
}
/>
}
/>
</
Col
>
);
})
}
</
Row
>
</
Modal
>
);
};
export
default
CheckCardModalV3
;
src/ui/Duel/main.tsx
View file @
9750ad07
...
...
@@ -26,6 +26,7 @@ import { Row } from "antd";
import
SendBox
from
"
./sendBox
"
;
import
PlayerStatus
from
"
./status
"
;
import
Alert
from
"
./alert
"
;
import
CheckCardModalV3
from
"
./checkCardModalV3
"
;
// Ref: https://github.com/brianzinn/react-babylonjs/issues/126
const
NeosDuel
=
()
=>
{
...
...
@@ -46,6 +47,7 @@ const NeosDuel = () => {
<
PositionModal
/>
<
OptionModal
/>
<
CheckCardModalV2
/>
<
CheckCardModalV3
/>
</>
);
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment