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
Surveil
MDPro3
Commits
4d4a785c
Commit
4d4a785c
authored
Apr 12, 2024
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new chain animation
parent
5ca11d69
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
2222 additions
and
335 deletions
+2222
-335
Assets/Main.unity
Assets/Main.unity
+1474
-37
Assets/ScriptableObjects/TextureContainer.asset
Assets/ScriptableObjects/TextureContainer.asset
+10
-0
Assets/ScriptableObjects/TextureContainer.cs
Assets/ScriptableObjects/TextureContainer.cs
+11
-0
Assets/Scripts/MDPro3/Duel/GameCard.cs
Assets/Scripts/MDPro3/Duel/GameCard.cs
+14
-14
Assets/Scripts/MDPro3/Managers/TextureManager.cs
Assets/Scripts/MDPro3/Managers/TextureManager.cs
+29
-0
Assets/Scripts/MDPro3/Servants/OcgCore.cs
Assets/Scripts/MDPro3/Servants/OcgCore.cs
+634
-282
Assets/Scripts/MDPro3/Servants/Setting.cs
Assets/Scripts/MDPro3/Servants/Setting.cs
+49
-0
ProjectSettings/ProjectSettings.asset
ProjectSettings/ProjectSettings.asset
+1
-2
No files found.
Assets/Main.unity
View file @
4d4a785c
This diff is collapsed.
Click to expand it.
Assets/ScriptableObjects/TextureContainer.asset
View file @
4d4a785c
...
...
@@ -318,6 +318,16 @@ MonoBehaviour:
chainCircleNum7
:
{
fileID
:
21300000
,
guid
:
e2cc2a0a0f2a1524fb739254e1996861
,
type
:
3
}
chainCircleNum8
:
{
fileID
:
21300000
,
guid
:
1ae27ae278d3e40428cda309541918c1
,
type
:
3
}
chainCircleNum9
:
{
fileID
:
21300000
,
guid
:
ce56843701b6d914c869db7269627599
,
type
:
3
}
chainNumSet0
:
{
fileID
:
21300000
,
guid
:
998945db525e3384cb41bbb21b4bfa94
,
type
:
3
}
chainNumSet1
:
{
fileID
:
21300000
,
guid
:
91d89d9a5dd8e7843a0f9a6c02d9cb1d
,
type
:
3
}
chainNumSet2
:
{
fileID
:
21300000
,
guid
:
1bcc2f307bdff8844984f0879f7555eb
,
type
:
3
}
chainNumSet3
:
{
fileID
:
21300000
,
guid
:
d1fd175f95778444e8af57633c02cb22
,
type
:
3
}
chainNumSet4
:
{
fileID
:
21300000
,
guid
:
71bf23486bf63a94bb58b0fe72f645a6
,
type
:
3
}
chainNumSet5
:
{
fileID
:
21300000
,
guid
:
d2a151a24e93eb048844c6e884f6015e
,
type
:
3
}
chainNumSet6
:
{
fileID
:
21300000
,
guid
:
f51cae04dc114a34eb0f5765a668c831
,
type
:
3
}
chainNumSet7
:
{
fileID
:
21300000
,
guid
:
5a4b900ee24dc5546861d48ce2e42150
,
type
:
3
}
chainNumSet8
:
{
fileID
:
21300000
,
guid
:
0ac64bc140f9d204886aed6f0dcf8eeb
,
type
:
3
}
chainNumSet9
:
{
fileID
:
21300000
,
guid
:
1514e0f4855cc744587659ea7eb86465
,
type
:
3
}
toggleM
:
{
fileID
:
21300000
,
guid
:
b4b6f990bf52e9e41a3157d2c0701a28
,
type
:
3
}
toggleM_On
:
{
fileID
:
21300000
,
guid
:
77342bb8b8bac73418a111be27a694e5
,
type
:
3
}
toggleM_Over
:
{
fileID
:
21300000
,
guid
:
03c22d822bdf72e4680c02fb6caa13a5
,
type
:
3
}
...
...
Assets/ScriptableObjects/TextureContainer.cs
View file @
4d4a785c
...
...
@@ -263,6 +263,17 @@ public class TextureContainer : ScriptableObject
public
Sprite
chainCircleNum7
;
public
Sprite
chainCircleNum8
;
public
Sprite
chainCircleNum9
;
[
Header
(
"Chain Num Set"
)]
public
Sprite
chainNumSet0
;
public
Sprite
chainNumSet1
;
public
Sprite
chainNumSet2
;
public
Sprite
chainNumSet3
;
public
Sprite
chainNumSet4
;
public
Sprite
chainNumSet5
;
public
Sprite
chainNumSet6
;
public
Sprite
chainNumSet7
;
public
Sprite
chainNumSet8
;
public
Sprite
chainNumSet9
;
[
Header
(
"Window"
)]
public
Sprite
toggleM
;
public
Sprite
toggleM_On
;
...
...
Assets/Scripts/MDPro3/Duel/GameCard.cs
View file @
4d4a785c
...
...
@@ -1518,7 +1518,7 @@ namespace MDPro3
public
void
AnimationNegate
()
{
AudioManager
.
PlaySE
(
"SE_EFFECT_INVALID"
);
CameraManager
.
BlackInOut
(
0f
,
0.
3f
,
0.4
f
,
0.3f
);
CameraManager
.
BlackInOut
(
0f
,
0.
2f
,
0.5
f
,
0.3f
);
ElementObjectManager
manager
;
GameObject
model
;
if
(
ThisLocationShouldHaveModel
(
p
))
...
...
@@ -1545,11 +1545,11 @@ namespace MDPro3
||
(
p
.
location
&
(
uint
)
CardLocation
.
Deck
)
>
0
)
{
HideLabel
();
sequence
.
Append
(
offset
.
DOLocalMoveY
(
5
,
0.1
5
f
));
sequence
.
Append
(
offset
.
DOLocalMoveY
(
5
,
0.1f
));
sequence
.
AppendInterval
(
0.5f
);
sequence
.
Append
(
offset
.
DOLocalMoveY
(
0f
,
0.2f
));
sequence
.
Insert
(
0
,
pivot
.
DOScale
(
1f
,
0.1
5
f
));
sequence
.
Insert
(
0.6
5
f
,
pivot
.
DOScale
(
scale
,
0.2f
));
sequence
.
Insert
(
0
,
pivot
.
DOScale
(
1f
,
0.1f
));
sequence
.
Insert
(
0.6f
,
pivot
.
DOScale
(
scale
,
0.2f
));
sequence
.
OnComplete
(()
=>
{
Tools
.
ChangeLayer
(
model
,
"Default"
);
...
...
@@ -1566,18 +1566,18 @@ namespace MDPro3
manager
.
GetElement
<
Transform
>(
"Turn"
).
DOLocalRotate
(
Vector3
.
zero
,
0.1f
);
var
originRotaion
=
pivot
.
localEulerAngles
;
sequence
.
Append
(
offset
.
DOLocalMoveY
(
1
,
0.1
5
f
));
sequence
.
Join
(
offset
.
DOLocalMoveZ
(
5
,
0.1
5
f
));
sequence
.
Join
(
offset
.
DOLocalRotate
(
Vector3
.
zero
,
0.1
5
f
));
sequence
.
Join
(
pivot
.
DOLocalRotate
(
Vector3
.
zero
,
0.1
5
f
));
sequence
.
Join
(
manager
.
GetElement
<
Transform
>(
"Turn"
).
DOLocalRotate
(
Vector3
.
zero
,
0.1
5
f
));
sequence
.
Append
(
offset
.
DOLocalMoveY
(
1
,
0.1f
));
sequence
.
Join
(
offset
.
DOLocalMoveZ
(
5
,
0.1f
));
sequence
.
Join
(
offset
.
DOLocalRotate
(
Vector3
.
zero
,
0.1f
));
sequence
.
Join
(
pivot
.
DOLocalRotate
(
Vector3
.
zero
,
0.1f
));
sequence
.
Join
(
manager
.
GetElement
<
Transform
>(
"Turn"
).
DOLocalRotate
(
Vector3
.
zero
,
0.1f
));
sequence
.
Append
(
offset
.
DOLocalMoveY
(
1.2f
,
0.5f
));
sequence
.
Join
(
offset
.
DOLocalMoveZ
(
5.5f
,
0.5f
));
sequence
.
Append
(
offset
.
DOLocalMoveY
(
0f
,
0.2f
));
sequence
.
Join
(
offset
.
DOLocalMoveZ
(
0f
,
0.2f
));
sequence
.
Join
(
pivot
.
DOLocalRotate
(
originRotaion
,
0.15f
));
sequence
.
Insert
(
0
,
pivot
.
DOScale
(
1.2f
,
0.
65
f
));
sequence
.
Insert
(
0.6
5
f
,
pivot
.
DOScale
(
scale
,
0.2f
));
sequence
.
Insert
(
0
,
pivot
.
DOScale
(
1.2f
,
0.
2
f
));
sequence
.
Insert
(
0.6f
,
pivot
.
DOScale
(
scale
,
0.2f
));
sequence
.
OnComplete
(()
=>
{
Tools
.
ChangeLayer
(
model
,
"Default"
);
...
...
@@ -1589,11 +1589,11 @@ namespace MDPro3
||
(
p
.
location
&
(
uint
)
CardLocation
.
Removed
)
>
0
)
{
offset
.
localPosition
=
new
Vector3
(
0
,
-
5
,
0
);
sequence
.
Append
(
offset
.
DOLocalMoveY
(
0
,
0.1
5
f
));
sequence
.
Append
(
offset
.
DOLocalMoveY
(
0
,
0.1f
));
sequence
.
AppendInterval
(
0.5f
);
sequence
.
Append
(
offset
.
DOLocalMoveY
(-
5f
,
0.2f
));
sequence
.
Insert
(
0
,
offset
.
DOScale
(
1f
,
0.1
5
f
));
sequence
.
Insert
(
0.6
5f
,
offset
.
DOScale
(
Vector3
.
zero
,
0.2f
));
sequence
.
Insert
(
0
,
offset
.
DOScale
(
1f
,
0.1f
));
sequence
.
Insert
(
0.6
f
,
offset
.
DOScale
(
Vector3
.
one
*
0.2f
,
0.2f
));
sequence
.
OnComplete
(()
=>
{
Destroy
(
model
);
...
...
Assets/Scripts/MDPro3/Managers/TextureManager.cs
View file @
4d4a785c
...
...
@@ -737,5 +737,34 @@ namespace MDPro3
returnValue
.
Apply
();
return
returnValue
;
}
public
static
Sprite
GetChainNumSprite
(
int
num
)
{
switch
(
num
)
{
case
0
:
return
container
.
chainNumSet0
;
case
1
:
return
container
.
chainNumSet1
;
case
2
:
return
container
.
chainNumSet2
;
case
3
:
return
container
.
chainNumSet3
;
case
4
:
return
container
.
chainNumSet4
;
case
5
:
return
container
.
chainNumSet5
;
case
6
:
return
container
.
chainNumSet6
;
case
7
:
return
container
.
chainNumSet7
;
case
8
:
return
container
.
chainNumSet8
;
case
9
:
return
container
.
chainNumSet9
;
default
:
return
container
.
chainNumSet0
;
}
}
}
}
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @
4d4a785c
This diff is collapsed.
Click to expand it.
Assets/Scripts/MDPro3/Servants/Setting.cs
View file @
4d4a785c
...
...
@@ -66,6 +66,8 @@ namespace MDPro3
public
Text
duelCutinValue
;
public
Button
duelEffect
;
public
Text
duelEffectValue
;
public
Button
duelChain
;
public
Text
duelChainValue
;
public
Button
duelDice
;
public
Text
duelDiceValue
;
public
Button
duelCoin
;
...
...
@@ -92,6 +94,8 @@ namespace MDPro3
public
Text
watchCutinValue
;
public
Button
watchEffect
;
public
Text
watchEffectValue
;
public
Button
watchChain
;
public
Text
watchChainValue
;
public
Button
watchDice
;
public
Text
watchDiceValue
;
public
Button
watchCoin
;
...
...
@@ -116,6 +120,8 @@ namespace MDPro3
public
Text
replayCutinValue
;
public
Button
replayEffect
;
public
Text
replayEffectValue
;
public
Button
replayChain
;
public
Text
replayChainValue
;
public
Button
replayDice
;
public
Text
replayDiceValue
;
public
Button
replayCoin
;
...
...
@@ -176,6 +182,9 @@ namespace MDPro3
duelEffect
.
onClick
.
AddListener
(
OnDuelEffectClick
);
watchEffect
.
onClick
.
AddListener
(
OnWatchEffectClick
);
replayEffect
.
onClick
.
AddListener
(
OnReplayEffectClick
);
duelChain
.
onClick
.
AddListener
(
OnDuelChainClick
);
watchChain
.
onClick
.
AddListener
(
OnWatchChainClick
);
replayChain
.
onClick
.
AddListener
(
OnReplayChainClick
);
duelDice
.
onClick
.
AddListener
(
OnDuelDiceClick
);
watchDice
.
onClick
.
AddListener
(
OnWatchDiceClick
);
replayDice
.
onClick
.
AddListener
(
OnReplayDiceClick
);
...
...
@@ -275,6 +284,9 @@ namespace MDPro3
Config
.
Set
(
"DuelEffect"
,
SaveBool
(
duelEffectValue
.
text
));
Config
.
Set
(
"WatchEffect"
,
SaveBool
(
watchEffectValue
.
text
));
Config
.
Set
(
"ReplayEffect"
,
SaveBool
(
replayEffectValue
.
text
));
Config
.
Set
(
"DuelChain"
,
SaveBool
(
duelChainValue
.
text
));
Config
.
Set
(
"WatchChain"
,
SaveBool
(
watchChainValue
.
text
));
Config
.
Set
(
"ReplayChain"
,
SaveBool
(
replayChainValue
.
text
));
Config
.
Set
(
"DuelDice"
,
SaveBool
(
duelDiceValue
.
text
));
Config
.
Set
(
"WatchDice"
,
SaveBool
(
watchDiceValue
.
text
));
Config
.
Set
(
"ReplayDice"
,
SaveBool
(
replayDiceValue
.
text
));
...
...
@@ -800,6 +812,22 @@ namespace MDPro3
else
replayEffectValue
.
text
=
InterString
.
Get
(
"开"
);
value
=
Config
.
Get
(
"DuelChain"
,
"1"
);
if
(
value
==
"0"
)
duelChainValue
.
text
=
InterString
.
Get
(
"关"
);
else
duelChainValue
.
text
=
InterString
.
Get
(
"开"
);
value
=
Config
.
Get
(
"WatchChain"
,
"1"
);
if
(
value
==
"0"
)
watchChainValue
.
text
=
InterString
.
Get
(
"关"
);
else
watchChainValue
.
text
=
InterString
.
Get
(
"开"
);
value
=
Config
.
Get
(
"ReplayChain"
,
"1"
);
if
(
value
==
"0"
)
replayChainValue
.
text
=
InterString
.
Get
(
"关"
);
else
replayChainValue
.
text
=
InterString
.
Get
(
"开"
);
value
=
Config
.
Get
(
"DuelDice"
,
"1"
);
if
(
value
==
"0"
)
duelDiceValue
.
text
=
InterString
.
Get
(
"关"
);
...
...
@@ -1022,6 +1050,27 @@ namespace MDPro3
else
replayEffectValue
.
text
=
InterString
.
Get
(
"开"
);
}
public
void
OnDuelChainClick
()
{
if
(
duelChainValue
.
text
==
InterString
.
Get
(
"开"
))
duelChainValue
.
text
=
InterString
.
Get
(
"关"
);
else
duelChainValue
.
text
=
InterString
.
Get
(
"开"
);
}
public
void
OnWatchChainClick
()
{
if
(
watchChainValue
.
text
==
InterString
.
Get
(
"开"
))
watchChainValue
.
text
=
InterString
.
Get
(
"关"
);
else
watchChainValue
.
text
=
InterString
.
Get
(
"开"
);
}
public
void
OnReplayChainClick
()
{
if
(
replayChainValue
.
text
==
InterString
.
Get
(
"开"
))
replayChainValue
.
text
=
InterString
.
Get
(
"关"
);
else
replayChainValue
.
text
=
InterString
.
Get
(
"开"
);
}
public
void
OnDuelDiceClick
()
{
if
(
duelDiceValue
.
text
==
InterString
.
Get
(
"开"
))
...
...
ProjectSettings/ProjectSettings.asset
View file @
4d4a785c
...
...
@@ -135,8 +135,7 @@ PlayerSettings:
16:9:
1
Others
:
1
bundleVersion
:
1.0.5.1
preloadedAssets
:
-
{
fileID
:
11400000
,
guid
:
5fb02d2098f52054b89ce4a9f63ba9ee
,
type
:
2
}
preloadedAssets
:
[]
metroInputSource
:
0
wsaTransparentSwapchain
:
0
m_HolographicPauseOnTrackingLoss
:
1
...
...
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