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
Ricky
MDPro3
Commits
e589390d
Commit
e589390d
authored
Apr 20, 2024
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix selectUnselect hint bug
parent
15bccc0f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
11 deletions
+12
-11
Assets/Scripts/MDPro3/Servants/OcgCore.cs
Assets/Scripts/MDPro3/Servants/OcgCore.cs
+9
-7
Assets/Scripts/MDPro3/UI/Popup/PopupDuelSelectCard.cs
Assets/Scripts/MDPro3/UI/Popup/PopupDuelSelectCard.cs
+1
-2
ProjectSettings/ProjectSettings.asset
ProjectSettings/ProjectSettings.asset
+2
-2
No files found.
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @
e589390d
...
...
@@ -4399,10 +4399,15 @@ namespace MDPro3
allOnfield
=
false
;
break
;
}
if
(!
string
.
IsNullOrEmpty
(
ES_selectHint
))
ES_selectUnselectHint
=
ES_selectHint
;
if
(
string
.
IsNullOrEmpty
(
ES_selectUnselectHint
))
ES_selectUnselectHint
=
InterString
.
Get
(
"请选择卡片"
);
if
(
allOnfield
)
FieldSelect
(
ES_selectHint
,
cardsInSelection
,
1
,
1
,
cancelable
,
finishable
);
FieldSelect
(
ES_select
Unselect
Hint
,
cardsInSelection
,
1
,
1
,
cancelable
,
finishable
);
else
ShowPopupSelectCard
(
ES_selectHint
,
cardsInSelection
,
1
,
1
,
cancelable
,
finishable
);
ShowPopupSelectCard
(
ES_select
Unselect
Hint
,
cardsInSelection
,
1
,
1
,
cancelable
,
finishable
);
break
;
case
GameMessage
.
SelectSum
:
if
(
InIgnoranceReplay
())
break
;
...
...
@@ -5518,7 +5523,7 @@ namespace MDPro3
{
foreach
(
var
place
in
places
)
place
.
InitializeSelectCardInThisZone
(
cards
);
fieldHint
=
hint
;
fieldHint
=
string
.
IsNullOrEmpty
(
hint
)
?
InterString
.
Get
(
"请选择卡片"
)
:
hint
;
fieldMin
=
min
;
fieldMax
=
max
;
fieldExitable
=
exitable
;
...
...
@@ -5749,13 +5754,10 @@ namespace MDPro3
};
}
string
lastHint
=
string
.
Empty
;
public
void
ShowPopupSelectCard
(
string
hint
,
List
<
GameCard
>
cards
,
int
min
,
int
max
,
bool
exitable
,
bool
sendable
)
{
if
(
string
.
IsNullOrEmpty
(
hint
))
hint
=
lastHint
;
else
lastHint
=
hint
;
hint
=
InterString
.
Get
(
"请选择卡片"
);
var
handler
=
Addressables
.
InstantiateAsync
(
"PopupDuelSelectCard"
);
handler
.
Completed
+=
(
result
)
=>
{
...
...
Assets/Scripts/MDPro3/UI/Popup/PopupDuelSelectCard.cs
View file @
e589390d
...
...
@@ -328,14 +328,13 @@ namespace MDPro3.UI
break
;
case
GameMessage
.
AnnounceCard
:
foreach
(
var
mono
in
monos
)
{
if
(
mono
.
selected
)
{
binaryMaster
=
new
BinaryMaster
();
binaryMaster
.
writer
.
Write
(
mono
.
card
.
GetData
().
Id
);
Program
.
I
().
ocgcore
.
SendReturn
(
binaryMaster
.
Get
());
}
}
Program
.
I
().
ocgcore
.
ClearAnnounceCards
();
break
;
case
GameMessage
.
SortCard
:
case
GameMessage
.
SortChain
:
...
...
ProjectSettings/ProjectSettings.asset
View file @
e589390d
...
...
@@ -134,7 +134,7 @@ PlayerSettings:
16:10:
1
16:9:
1
Others
:
1
bundleVersion
:
1.0.
7
bundleVersion
:
1.0.
8
preloadedAssets
:
[]
metroInputSource
:
0
wsaTransparentSwapchain
:
0
...
...
@@ -529,7 +529,7 @@ PlayerSettings:
m_APIs
:
0b000000
m_Automatic
:
1
-
m_BuildTarget
:
WindowsStandaloneSupport
m_APIs
:
0
200000012000000150000000b
000000
m_APIs
:
0
b000000020000001200000015
000000
m_Automatic
:
0
m_BuildTargetVRSettings
:
-
m_BuildTarget
:
Standalone
...
...
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