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
FSJK fsjk
MDPro3
Commits
f155bde6
Commit
f155bde6
authored
May 31, 2024
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new disquiet effect
parent
08b6b630
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
123 additions
and
33 deletions
+123
-33
Assets/Fonts/SourceHanSansSC-Medium SDF.asset
Assets/Fonts/SourceHanSansSC-Medium SDF.asset
+76
-18
Assets/Main.unity
Assets/Main.unity
+13
-13
Assets/Scripts/MDPro3/Duel/GameCard.cs
Assets/Scripts/MDPro3/Duel/GameCard.cs
+32
-2
Assets/Scripts/MDPro3/Servants/OcgCore.cs
Assets/Scripts/MDPro3/Servants/OcgCore.cs
+2
-0
No files found.
Assets/Fonts/SourceHanSansSC-Medium SDF.asset
View file @
f155bde6
This diff is collapsed.
Click to expand it.
Assets/Main.unity
View file @
f155bde6
...
@@ -13473,7 +13473,7 @@ MonoBehaviour:
...
@@ -13473,7 +13473,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1687306876}
m_HandleRect: {fileID: 1687306876}
m_Direction: 2
m_Direction: 2
m_Value: 1
m_Value: 1
m_Size:
0.99999994
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -18021,7 +18021,7 @@ MonoBehaviour:
...
@@ -18021,7 +18021,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1581995138}
m_HandleRect: {fileID: 1581995138}
m_Direction: 2
m_Direction: 2
m_Value: 0
m_Value: 0
m_Size:
0
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -21634,7 +21634,7 @@ MonoBehaviour:
...
@@ -21634,7 +21634,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 931169952}
m_HandleRect: {fileID: 931169952}
m_Direction: 2
m_Direction: 2
m_Value: 0
m_Value: 0
m_Size:
0.6103896
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -43822,7 +43822,7 @@ MonoBehaviour:
...
@@ -43822,7 +43822,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 476827028}
m_HandleRect: {fileID: 476827028}
m_Direction: 2
m_Direction: 2
m_Value: 1
m_Value: 1
m_Size: 0.
7211087
m_Size: 0.
620716
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -46153,7 +46153,7 @@ RectTransform:
...
@@ -46153,7 +46153,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0
.000061035156
}
m_SizeDelta: {x: 0, y: 840}
m_SizeDelta: {x: 0, y: 840}
m_Pivot: {x: 0, y: 1}
m_Pivot: {x: 0, y: 1}
--- !u!1 &824349623
--- !u!1 &824349623
...
@@ -54032,7 +54032,7 @@ MonoBehaviour:
...
@@ -54032,7 +54032,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1163139165}
m_HandleRect: {fileID: 1163139165}
m_Direction: 2
m_Direction: 2
m_Value: 1
m_Value: 1
m_Size:
0.99999994
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -58334,8 +58334,8 @@ MonoBehaviour:
...
@@ -58334,8 +58334,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 948258732}
m_TargetGraphic: {fileID: 948258732}
m_HandleRect: {fileID: 948258731}
m_HandleRect: {fileID: 948258731}
m_Direction: 2
m_Direction: 2
m_Value:
1
m_Value:
0
m_Size:
0.99999994
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -62479,7 +62479,7 @@ RectTransform:
...
@@ -62479,7 +62479,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0
.000030517578
}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 300}
m_SizeDelta: {x: 0, y: 300}
m_Pivot: {x: 0, y: 1}
m_Pivot: {x: 0, y: 1}
--- !u!1 &1110086322
--- !u!1 &1110086322
...
@@ -79172,7 +79172,7 @@ MonoBehaviour:
...
@@ -79172,7 +79172,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1714379351}
m_HandleRect: {fileID: 1714379351}
m_Direction: 2
m_Direction: 2
m_Value: 1
m_Value: 1
m_Size:
0.99999994
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -80818,7 +80818,7 @@ MonoBehaviour:
...
@@ -80818,7 +80818,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 761159127}
m_HandleRect: {fileID: 761159127}
m_Direction: 2
m_Direction: 2
m_Value: 0
m_Value: 0
m_Size:
0.6629213
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -85235,7 +85235,7 @@ MonoBehaviour:
...
@@ -85235,7 +85235,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 2083794100}
m_HandleRect: {fileID: 2083794100}
m_Direction: 2
m_Direction: 2
m_Value: 0
m_Value: 0
m_Size:
0.5588235
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -97387,7 +97387,7 @@ MonoBehaviour:
...
@@ -97387,7 +97387,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 677938099}
m_HandleRect: {fileID: 677938099}
m_Direction: 2
m_Direction: 2
m_Value: 1
m_Value: 1
m_Size:
0.99999994
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
Assets/Scripts/MDPro3/Duel/GameCard.cs
View file @
f155bde6
...
@@ -187,13 +187,13 @@ namespace MDPro3
...
@@ -187,13 +187,13 @@ namespace MDPro3
var
cardParmChange
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/eff_prm/fxp_cardparm_change_001"
,
true
);
var
cardParmChange
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/eff_prm/fxp_cardparm_change_001"
,
true
);
var
cardBuffActive
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/buff/fxp_bff_active_001"
,
true
);
var
cardBuffActive
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/buff/fxp_bff_active_001"
,
true
);
var
cardNegate
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/buff/fxp_bff_disable_001"
,
true
);
var
cardNegate
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/buff/fxp_bff_disable_001"
,
true
);
var
cardDisquiet
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/buff/fxp_bff_disquiet_001"
,
true
);
var
cardBlueHighlight
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/hitghlight/fxp_hl_set_001"
,
true
);
var
cardBlueHighlight
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/hitghlight/fxp_hl_set_001"
,
true
);
var
cardBlueHighlightSelect
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/hitghlight/fxp_hl_set_sct_001"
,
true
);
var
cardBlueHighlightSelect
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/hitghlight/fxp_hl_set_sct_001"
,
true
);
var
cardYellowHighlight
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/hitghlight/fxp_hl_spsom_001"
,
true
);
var
cardYellowHighlight
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/hitghlight/fxp_hl_spsom_001"
,
true
);
var
cardYellowHighlightSelect
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/hitghlight/fxp_hl_spsom_sct_001"
,
true
);
var
cardYellowHighlightSelect
=
ABLoader
.
LoadFromFile
(
"MasterDuel/Effects/hitghlight/fxp_hl_spsom_sct_001"
,
true
);
cardParmUp
.
transform
.
SetParent
(
manager
.
GetElement
<
Transform
>(
"Turn"
).
GetChild
(
1
),
false
);
cardParmUp
.
transform
.
SetParent
(
manager
.
GetElement
<
Transform
>(
"Turn"
).
GetChild
(
1
),
false
);
cardParmDown
.
transform
.
SetParent
(
manager
.
GetElement
<
Transform
>(
"Turn"
).
GetChild
(
1
),
false
);
cardParmDown
.
transform
.
SetParent
(
manager
.
GetElement
<
Transform
>(
"Turn"
).
GetChild
(
1
),
false
);
cardParmChange
.
transform
.
SetParent
(
manager
.
GetElement
<
Transform
>(
"Turn"
).
GetChild
(
1
),
false
);
cardParmChange
.
transform
.
SetParent
(
manager
.
GetElement
<
Transform
>(
"Turn"
).
GetChild
(
1
),
false
);
...
@@ -201,6 +201,9 @@ namespace MDPro3
...
@@ -201,6 +201,9 @@ namespace MDPro3
cardBuffActive
.
transform
.
localPosition
=
new
Vector3
(
0
,
0.1f
,
0
);
cardBuffActive
.
transform
.
localPosition
=
new
Vector3
(
0
,
0.1f
,
0
);
cardNegate
.
transform
.
SetParent
(
manager
.
GetElement
<
Transform
>(
"Turn"
).
GetChild
(
1
),
false
);
cardNegate
.
transform
.
SetParent
(
manager
.
GetElement
<
Transform
>(
"Turn"
).
GetChild
(
1
),
false
);
cardNegate
.
transform
.
localPosition
=
new
Vector3
(
0
,
0.1f
,
0
);
cardNegate
.
transform
.
localPosition
=
new
Vector3
(
0
,
0.1f
,
0
);
cardDisquiet
.
transform
.
SetParent
(
manager
.
GetElement
<
Transform
>(
"Turn"
).
GetChild
(
1
),
false
);
cardDisquiet
.
transform
.
localPosition
=
new
Vector3
(
0
,
0f
,
0
);
cardDisquiet
.
transform
.
localEulerAngles
=
new
Vector3
(
0f
,
0f
,
180f
);
var
highlight
=
new
GameObject
(
"Highlight"
);
var
highlight
=
new
GameObject
(
"Highlight"
);
cardBlueHighlight
.
transform
.
SetParent
(
highlight
.
transform
,
false
);
cardBlueHighlight
.
transform
.
SetParent
(
highlight
.
transform
,
false
);
...
@@ -221,7 +224,8 @@ namespace MDPro3
...
@@ -221,7 +224,8 @@ namespace MDPro3
e4
.
label
=
"EffectBuffActive"
;
e4
.
label
=
"EffectBuffActive"
;
var
e5
=
cardNegate
.
AddComponent
<
ElementObject
>();
var
e5
=
cardNegate
.
AddComponent
<
ElementObject
>();
e5
.
label
=
"EffectNegate"
;
e5
.
label
=
"EffectNegate"
;
var
e6
=
cardDisquiet
.
AddComponent
<
ElementObject
>();
e6
.
label
=
"EffectDisquiet"
;
var
e7
=
cardBlueHighlight
.
AddComponent
<
ElementObject
>();
var
e7
=
cardBlueHighlight
.
AddComponent
<
ElementObject
>();
e7
.
label
=
"EffectHighlightBlue"
;
e7
.
label
=
"EffectHighlightBlue"
;
...
@@ -241,6 +245,7 @@ namespace MDPro3
...
@@ -241,6 +245,7 @@ namespace MDPro3
list
.
Add
(
e3
);
list
.
Add
(
e3
);
list
.
Add
(
e4
);
list
.
Add
(
e4
);
list
.
Add
(
e5
);
list
.
Add
(
e5
);
list
.
Add
(
e6
);
list
.
Add
(
e7
);
list
.
Add
(
e7
);
list
.
Add
(
e8
);
list
.
Add
(
e8
);
...
@@ -254,6 +259,7 @@ namespace MDPro3
...
@@ -254,6 +259,7 @@ namespace MDPro3
cardParmChange
.
SetActive
(
false
);
cardParmChange
.
SetActive
(
false
);
cardBuffActive
.
SetActive
(
false
);
cardBuffActive
.
SetActive
(
false
);
cardNegate
.
SetActive
(
false
);
cardNegate
.
SetActive
(
false
);
cardDisquiet
.
SetActive
(
false
);
cardBlueHighlight
.
SetActive
(
false
);
cardBlueHighlight
.
SetActive
(
false
);
cardBlueHighlightSelect
.
SetActive
(
false
);
cardBlueHighlightSelect
.
SetActive
(
false
);
...
@@ -341,9 +347,13 @@ namespace MDPro3
...
@@ -341,9 +347,13 @@ namespace MDPro3
if
(
model
!=
null
)
if
(
model
!=
null
)
{
{
if
(
data
.
Id
>
0
)
if
(
data
.
Id
>
0
)
{
StartCoroutine
(
SetFace
());
StartCoroutine
(
SetFace
());
ShowFaceDownCardOrNot
(
NeedShowFaceDownCard
());
}
}
}
}
}
data
=
d
;
RefreshLabel
();
RefreshLabel
();
if
(
d
.
Id
>
0
)
if
(
d
.
Id
>
0
)
if
((
p
.
location
&
(
uint
)
CardLocation
.
Extra
)
>
0
)
if
((
p
.
location
&
(
uint
)
CardLocation
.
Extra
)
>
0
)
...
@@ -2802,10 +2812,14 @@ namespace MDPro3
...
@@ -2802,10 +2812,14 @@ namespace MDPro3
return
true
;
return
true
;
}
}
int
setTurn
=
0
;
public
void
ShowFaceDownCardOrNot
(
bool
show
)
public
void
ShowFaceDownCardOrNot
(
bool
show
)
{
{
if
(
model
==
null
)
if
(
model
==
null
)
return
;
return
;
if
(
show
)
setTurn
=
Program
.
I
().
ocgcore
.
turns
;
var
back
=
manager
.
GetElement
<
Transform
>(
"CardModel"
).
GetChild
(
0
).
GetComponent
<
Renderer
>();
var
back
=
manager
.
GetElement
<
Transform
>(
"CardModel"
).
GetChild
(
0
).
GetComponent
<
Renderer
>();
var
face
=
manager
.
GetElement
<
Transform
>(
"CardModel"
).
GetChild
(
1
).
GetComponent
<
Renderer
>();
var
face
=
manager
.
GetElement
<
Transform
>(
"CardModel"
).
GetChild
(
1
).
GetComponent
<
Renderer
>();
...
@@ -2828,8 +2842,24 @@ namespace MDPro3
...
@@ -2828,8 +2842,24 @@ namespace MDPro3
back
.
gameObject
.
SetActive
(
true
);
back
.
gameObject
.
SetActive
(
true
);
face
.
GetComponent
<
Animator
>().
SetBool
(
"Show"
,
false
);
face
.
GetComponent
<
Animator
>().
SetBool
(
"Show"
,
false
);
face
.
transform
.
localEulerAngles
=
new
Vector3
(
180f
,
0f
,
-
180f
);
face
.
transform
.
localEulerAngles
=
new
Vector3
(
180f
,
0f
,
-
180f
);
manager
.
GetElement
(
"EffectDisquiet"
).
SetActive
(
false
);
}
}
}
}
public
void
ShowDisquiet
()
{
if
(
model
==
null
)
return
;
if
(
setTurn
==
0
)
return
;
if
(
setTurn
>=
Program
.
I
().
ocgcore
.
turns
)
return
;
if
((
p
.
location
&
(
uint
)
CardLocation
.
SpellZone
)
==
0
)
return
;
if
((
p
.
position
&
(
uint
)
CardPosition
.
FaceDown
)
==
0
)
return
;
manager
.
GetElement
(
"EffectDisquiet"
).
SetActive
(
true
);
}
#
endregion
#
endregion
...
...
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @
f155bde6
...
@@ -4596,6 +4596,8 @@ namespace MDPro3
...
@@ -4596,6 +4596,8 @@ namespace MDPro3
PhaseButtonHandler
.
TurnChange
(
myTurn
,
turns
);
PhaseButtonHandler
.
TurnChange
(
myTurn
,
turns
);
TurnChangeBanner
(
myTurn
?
0
:
1
);
TurnChangeBanner
(
myTurn
?
0
:
1
);
PhaseButtonHandler
.
SetTextMain
(
""
);
PhaseButtonHandler
.
SetTextMain
(
""
);
foreach
(
var
c
in
cards
)
c
.
ShowDisquiet
();
break
;
break
;
case
GameMessage
.
NewPhase
:
case
GameMessage
.
NewPhase
:
attackLine
.
SetActive
(
false
);
attackLine
.
SetActive
(
false
);
...
...
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