Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOProUnity_V2
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
赤子奈落
YGOProUnity_V2
Commits
78589240
Commit
78589240
authored
Apr 20, 2018
by
mercury233
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wtf fix
parent
9b77ddb9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
9 deletions
+10
-9
Assets/SibylSystem/Ocgcore/Ocgcore.cs
Assets/SibylSystem/Ocgcore/Ocgcore.cs
+10
-9
No files found.
Assets/SibylSystem/Ocgcore/Ocgcore.cs
View file @
78589240
...
@@ -3384,11 +3384,11 @@ public class Ocgcore : ServantWithCardDescription
...
@@ -3384,11 +3384,11 @@ public class Ocgcore : ServantWithCardDescription
}
}
destroy(waitObject, 0, false, true);
destroy(waitObject, 0, false, true);
player = localPlayer(r.ReadByte());
player = localPlayer(r.ReadByte());
bool
finish
=
(
r
.
ReadByte
()
!=
0
);
bool finish
able
= (r.ReadByte() != 0);
cancalable
=
(
r
.
ReadByte
()
!=
0
);
cancalable = (r.ReadByte() != 0)
|| finishable
;
ES_min = r.ReadByte();
ES_min = r.ReadByte();
ES_max = r.ReadByte();
ES_max = r.ReadByte();
ES_min
=
finish
?
0
:
1
;
// SelectUnselectCard can actually always select 1 card
ES_min = finish
able
? 0 : 1; // SelectUnselectCard can actually always select 1 card
ES_max = 1; // SelectUnselectCard can actually always select 1 card
ES_max = 1; // SelectUnselectCard can actually always select 1 card
ES_level = 0;
ES_level = 0;
count = r.ReadByte();
count = r.ReadByte();
...
@@ -3421,14 +3421,10 @@ public class Ocgcore : ServantWithCardDescription
...
@@ -3421,14 +3421,10 @@ public class Ocgcore : ServantWithCardDescription
allCardsInSelectMessage.Add(card);
allCardsInSelectMessage.Add(card);
}*/
}*/
}
}
if
(
cancalable
)
if (cancalable
&& !finishable
)
{
{
gameInfo.addHashedButton("cancleSelected", -1, superButtonType.no, InterString.Get("取消选择@ui"));
gameInfo.addHashedButton("cancleSelected", -1, superButtonType.no, InterString.Get("取消选择@ui"));
}
}
else
if
(
finish
)
{
gameInfo
.
addHashedButton
(
"cancleSelected"
,
-
1
,
superButtonType
.
no
,
"完成选择"
);
}
realizeCardsForSelect();
realizeCardsForSelect();
if (ES_selectHint != "")
if (ES_selectHint != "")
{
{
...
@@ -6203,6 +6199,12 @@ public class Ocgcore : ServantWithCardDescription
...
@@ -6203,6 +6199,12 @@ public class Ocgcore : ServantWithCardDescription
case GameMessage.SelectTribute:
case GameMessage.SelectTribute:
case GameMessage.SelectSum:
case GameMessage.SelectSum:
m = new BinaryMaster();
m = new BinaryMaster();
if (currentMessage == GameMessage.SelectUnselectCard && cardsSelected.Count == 0)
{
m.writer.Write((Int32)(-1));
sendReturn(m.get());
break;
}
m.writer.Write((byte)(cardsMustBeSelected.Count + cardsSelected.Count));
m.writer.Write((byte)(cardsMustBeSelected.Count + cardsSelected.Count));
for (int i = 0; i < cardsMustBeSelected.Count; i++)
for (int i = 0; i < cardsMustBeSelected.Count; i++)
{
{
...
@@ -6216,7 +6218,6 @@ public class Ocgcore : ServantWithCardDescription
...
@@ -6216,7 +6218,6 @@ public class Ocgcore : ServantWithCardDescription
}
}
sendReturn(m.get());
sendReturn(m.get());
break;
break;
}
}
}
}
...
...
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