Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
MDPro3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
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
Alexis_chen
MDPro3
Commits
b1d3b148
Commit
b1d3b148
authored
Apr 03, 2024
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
b2f7cc1e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
2 deletions
+26
-2
Assets/Scripts/MDPro3/Servants/OcgCore.cs
Assets/Scripts/MDPro3/Servants/OcgCore.cs
+26
-2
No files found.
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @
b1d3b148
...
@@ -4298,7 +4298,8 @@ namespace MDPro3
...
@@ -4298,7 +4298,8 @@ namespace MDPro3
card
.
selectPtr
=
i
;
card
.
selectPtr
=
i
;
card
.
levelForSelect_1
=
para
&
0xffff
;
card
.
levelForSelect_1
=
para
&
0xffff
;
card
.
levelForSelect_2
=
para
>>
16
;
card
.
levelForSelect_2
=
para
>>
16
;
if
(
card
.
levelForSelect_2
==
0
)
card
.
levelForSelect_2
=
card
.
levelForSelect_1
;
if
(
card
.
levelForSelect_2
==
0
)
card
.
levelForSelect_2
=
card
.
levelForSelect_1
;
cardsInSelection
.
Add
(
card
);
cardsInSelection
.
Add
(
card
);
cardsMustBeSelected
.
Add
(
card
);
cardsMustBeSelected
.
Add
(
card
);
}
}
...
@@ -4341,7 +4342,8 @@ namespace MDPro3
...
@@ -4341,7 +4342,8 @@ namespace MDPro3
card
.
selectPtr
=
i
;
card
.
selectPtr
=
i
;
card
.
levelForSelect_1
=
para
&
0xffff
;
card
.
levelForSelect_1
=
para
&
0xffff
;
card
.
levelForSelect_2
=
para
>>
16
;
card
.
levelForSelect_2
=
para
>>
16
;
if
(
card
.
levelForSelect_2
==
0
)
card
.
levelForSelect_2
=
card
.
levelForSelect_1
;
if
(
card
.
levelForSelect_2
==
0
)
card
.
levelForSelect_2
=
card
.
levelForSelect_1
;
cardsInSelection
.
Add
(
card
);
cardsInSelection
.
Add
(
card
);
}
}
}
}
...
@@ -5361,6 +5363,19 @@ namespace MDPro3
...
@@ -5361,6 +5363,19 @@ namespace MDPro3
place
.
CardInThisZoneUnselectable
();
place
.
CardInThisZoneUnselectable
();
}
}
}
}
else
if
(
currentMessage
==
GameMessage
.
SelectTribute
)
{
var
sum
=
0
;
foreach
(
var
c
in
selected
)
sum
+=
c
.
levelForSelect_1
;
if
(
selected
.
Count
>=
fieldMax
)
FieldSelectedSend
();
else
if
(
sum
>=
fieldMin
)
{
fieldSendable
=
true
;
RefreshButton
();
}
}
else
else
{
{
if
(
selected
.
Count
>=
fieldMin
)
if
(
selected
.
Count
>=
fieldMin
)
...
@@ -5423,6 +5438,15 @@ namespace MDPro3
...
@@ -5423,6 +5438,15 @@ namespace MDPro3
else
if
(
currentMessage
==
GameMessage
.
SelectCounter
)
else
if
(
currentMessage
==
GameMessage
.
SelectCounter
)
for
(
var
i
=
0
;
i
<
cardsInSelection
.
Count
;
i
++)
for
(
var
i
=
0
;
i
<
cardsInSelection
.
Count
;
i
++)
binaryMaster
.
writer
.
Write
((
short
)
cardsInSelection
[
i
].
counterSelected
);
binaryMaster
.
writer
.
Write
((
short
)
cardsInSelection
[
i
].
counterSelected
);
else
if
(
currentMessage
==
GameMessage
.
SelectSum
)
{
binaryMaster
.
writer
.
Write
((
byte
)
selected
.
Count
);
foreach
(
var
card
in
cardsMustBeSelected
)
binaryMaster
.
writer
.
Write
((
byte
)
card
.
selectPtr
);
foreach
(
var
card
in
selected
)
if
(!
cardsMustBeSelected
.
Contains
(
card
))
binaryMaster
.
writer
.
Write
((
byte
)
card
.
selectPtr
);
}
else
else
{
{
binaryMaster
.
writer
.
Write
((
byte
)
selected
.
Count
);
binaryMaster
.
writer
.
Write
((
byte
)
selected
.
Count
);
...
...
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