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
Dark_Zane
MDPro3
Commits
8d29331c
Commit
8d29331c
authored
Apr 17, 2024
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more strict summon material check
parent
b8e83af3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
10 deletions
+39
-10
Assets/Scripts/MDPro3/Duel/GameCard.cs
Assets/Scripts/MDPro3/Duel/GameCard.cs
+4
-1
Assets/Scripts/MDPro3/Managers/TimeLineManager.cs
Assets/Scripts/MDPro3/Managers/TimeLineManager.cs
+6
-5
Assets/Scripts/MDPro3/Servants/OcgCore.cs
Assets/Scripts/MDPro3/Servants/OcgCore.cs
+29
-4
No files found.
Assets/Scripts/MDPro3/Duel/GameCard.cs
View file @
8d29331c
...
@@ -1092,7 +1092,10 @@ namespace MDPro3
...
@@ -1092,7 +1092,10 @@ namespace MDPro3
&&
Config
.
Get
(
"ReplaySummon"
,
"1"
)
==
"0"
)
&&
Config
.
Get
(
"ReplaySummon"
,
"1"
)
==
"0"
)
summonEffect
=
false
;
summonEffect
=
false
;
if
(
summonEffect
&&
Program
.
I
().
ocgcore
.
materialCards
.
Count
>
0
)
if
(
summonEffect
&&
Program
.
I
().
ocgcore
.
materialCards
.
Count
>
0
&&
(
OcgCore
.
TypeMatchReason
(
data
.
Type
,
(
int
)
Program
.
I
().
ocgcore
.
materialCards
[
0
].
p
.
reason
)
||
OcgCore
.
TypeMatchReason
(
data
.
Type
,
Program
.
I
().
ocgcore
.
materialCards
[
0
].
GetData
().
Reason
)))
{
{
Program
.
I
().
ocgcore
.
description
.
Hide
();
Program
.
I
().
ocgcore
.
description
.
Hide
();
Program
.
I
().
ocgcore
.
list
.
Hide
();
Program
.
I
().
ocgcore
.
list
.
Hide
();
...
...
Assets/Scripts/MDPro3/Managers/TimeLineManager.cs
View file @
8d29331c
...
@@ -136,14 +136,15 @@ namespace MDPro3
...
@@ -136,14 +136,15 @@ namespace MDPro3
void
SyncSummonTimeline
()
void
SyncSummonTimeline
()
{
{
if
((
reason
&
(
uint
)
CardReason
.
Ritual
)
>
0
)
var
type
=
CardsManager
.
Get
(
summonCard
).
Type
;
if
((
reason
&
(
uint
)
CardReason
.
Ritual
)
>
0
&&
(
type
&
(
uint
)
CardType
.
Ritual
)
>
0
)
StartCoroutine
(
SummonRitual
());
StartCoroutine
(
SummonRitual
());
else
if
((
reason
&
(
uint
)
CardReason
.
Synchro
)
>
0
)
else
if
((
reason
&
(
uint
)
CardReason
.
Synchro
)
>
0
&&
(
type
&
(
uint
)
CardType
.
Synchro
)
>
0
)
StartCoroutine
(
SummonSynchro
());
StartCoroutine
(
SummonSynchro
());
else
if
((
reason
&
(
uint
)
CardReason
.
Link
)
>
0
)
else
if
((
reason
&
(
uint
)
CardReason
.
Xyz
)
>
0
&&
(
type
&
(
uint
)
CardType
.
Xyz
)
>
0
)
StartCoroutine
(
SummonLink
());
else
if
((
reason
&
(
uint
)
CardReason
.
Xyz
)
>
0
)
StartCoroutine
(
SummonXyz
());
StartCoroutine
(
SummonXyz
());
else
if
((
reason
&
(
uint
)
CardReason
.
Link
)
>
0
&&
(
type
&
(
uint
)
CardType
.
Link
)
>
0
)
StartCoroutine
(
SummonLink
());
else
else
{
{
CameraManager
.
BlackIn
(
0f
,
0.3f
);
CameraManager
.
BlackIn
(
0f
,
0.3f
);
...
...
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @
8d29331c
...
@@ -1219,11 +1219,11 @@ namespace MDPro3
...
@@ -1219,11 +1219,11 @@ namespace MDPro3
private
string
ES_turnString
=
""
;
private
string
ES_turnString
=
""
;
public
bool
duelEnded
;
public
bool
duelEnded
;
int
summonedMonsterController
;
int
spSummonedMonsterController
;
//For single duel end
//For single duel end
//Program.I().room.duelEnded: For match End;
//Program.I().room.duelEnded: For match End;
bool
needDamageResponseInstant
;
public
void
CoreReset
()
public
void
CoreReset
()
{
{
if
(
cards
.
Count
>
0
)
if
(
cards
.
Count
>
0
)
...
@@ -1252,6 +1252,7 @@ namespace MDPro3
...
@@ -1252,6 +1252,7 @@ namespace MDPro3
surrended
=
false
;
surrended
=
false
;
deckReserved
=
false
;
deckReserved
=
false
;
cantCheckGrave
=
false
;
cantCheckGrave
=
false
;
needDamageResponseInstant
=
false
;
if
(
condition
==
Condition
.
Replay
)
if
(
condition
==
Condition
.
Replay
)
{
{
replayButtons
.
SetActive
(
true
);
replayButtons
.
SetActive
(
true
);
...
@@ -1447,7 +1448,10 @@ namespace MDPro3
...
@@ -1447,7 +1448,10 @@ namespace MDPro3
case
GameMessage
.
ChainDisabled
:
case
GameMessage
.
ChainDisabled
:
return
true
;
return
true
;
case
GameMessage
.
Damage
:
case
GameMessage
.
Damage
:
return
false
;
if
(
needDamageResponseInstant
)
return
false
;
else
return
true
;
case
GameMessage
.
Hint
:
case
GameMessage
.
Hint
:
int
type
=
r
.
ReadChar
();
int
type
=
r
.
ReadChar
();
if
(
type
==
8
)
return
true
;
if
(
type
==
8
)
return
true
;
...
@@ -2719,7 +2723,8 @@ namespace MDPro3
...
@@ -2719,7 +2723,8 @@ namespace MDPro3
break
;
break
;
case
GameMessage
.
Battle
:
case
GameMessage
.
Battle
:
attackLine
.
SetActive
(
false
);
attackLine
.
SetActive
(
false
);
Destroy
(
duelFinalBlow
,
0.5f
);
Destroy
(
duelFinalBlow
);
needDamageResponseInstant
=
true
;
var
gpsAttacker
=
r
.
ReadShortGPS
();
var
gpsAttacker
=
r
.
ReadShortGPS
();
r
.
ReadByte
();
r
.
ReadByte
();
...
@@ -2951,6 +2956,10 @@ namespace MDPro3
...
@@ -2951,6 +2956,10 @@ namespace MDPro3
quence
.
Append
(
attackTransform
.
DOMove
(
attackPosition
,
0.3f
).
SetEase
(
Ease
.
InQuad
));
quence
.
Append
(
attackTransform
.
DOMove
(
attackPosition
,
0.3f
).
SetEase
(
Ease
.
InQuad
));
quence
.
Join
(
Program
.
I
().
camera_
.
cameraMain
.
transform
.
DOMove
(
new
Vector3
(
0
,
95
,
-
37
),
0.3f
));
quence
.
Join
(
Program
.
I
().
camera_
.
cameraMain
.
transform
.
DOMove
(
new
Vector3
(
0
,
95
,
-
37
),
0.3f
));
quence
.
Join
(
attackTransform
.
DORotate
(
attackAngle
,
0.3f
).
SetEase
(
Ease
.
InQuad
));
quence
.
Join
(
attackTransform
.
DORotate
(
attackAngle
,
0.3f
).
SetEase
(
Ease
.
InQuad
));
quence
.
OnComplete
(()
=>
{
needDamageResponseInstant
=
false
;
});
Sleep
(
125
);
Sleep
(
125
);
}
}
AudioManager
.
PlaySE
(
sound1
);
AudioManager
.
PlaySE
(
sound1
);
...
@@ -4793,6 +4802,22 @@ namespace MDPro3
...
@@ -4793,6 +4802,22 @@ namespace MDPro3
return
returnValue
;
return
returnValue
;
}
}
public
static
bool
TypeMatchReason
(
int
type
,
int
reason
)
{
bool
returnValue
=
false
;
if
((
type
&
(
uint
)
CardType
.
Ritual
)
>
0
&&
(
reason
&
(
uint
)
CardReason
.
Ritual
)
>
0
)
return
true
;
if
((
type
&
(
uint
)
CardType
.
Fusion
)
>
0
&&
(
reason
&
(
uint
)
CardReason
.
Fusion
)
>
0
)
return
true
;
if
((
type
&
(
uint
)
CardType
.
Synchro
)
>
0
&&
(
reason
&
(
uint
)
CardReason
.
Synchro
)
>
0
)
return
true
;
if
((
type
&
(
uint
)
CardType
.
Xyz
)
>
0
&&
(
reason
&
(
uint
)
CardReason
.
Xyz
)
>
0
)
return
true
;
if
((
type
&
(
uint
)
CardType
.
Link
)
>
0
&&
(
reason
&
(
uint
)
CardReason
.
Link
)
>
0
)
return
true
;
return
returnValue
;
}
public
GameCard
GCS_Create
(
GPS
p
)
public
GameCard
GCS_Create
(
GPS
p
)
{
{
GameCard
c
=
null
;
GameCard
c
=
null
;
...
...
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