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
c220392c
Commit
c220392c
authored
Apr 12, 2024
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new items & fix bugs
parent
4d4a785c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
106 additions
and
34 deletions
+106
-34
Assets/ScriptableObjects/Items.asset
Assets/ScriptableObjects/Items.asset
+80
-17
Assets/Scripts/MDPro3/Managers/TextureManager.cs
Assets/Scripts/MDPro3/Managers/TextureManager.cs
+2
-0
Assets/Scripts/MDPro3/Servants/OcgCore.cs
Assets/Scripts/MDPro3/Servants/OcgCore.cs
+16
-15
Assets/Scripts/MDPro3/UI/Function/EventSEPlayer.cs
Assets/Scripts/MDPro3/UI/Function/EventSEPlayer.cs
+5
-0
ProjectSettings/ProjectSettings.asset
ProjectSettings/ProjectSettings.asset
+3
-2
No files found.
Assets/ScriptableObjects/Items.asset
View file @
c220392c
...
@@ -223,6 +223,13 @@ MonoBehaviour:
...
@@ -223,6 +223,13 @@ MonoBehaviour:
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
0
diy
:
0
-
id
:
1130031
m_name
:
m_description
:
path
:
Wallpaper/front0031
functional
:
0
secondFace
:
0
diy
:
0
-
id
:
1130032
-
id
:
1130032
m_name
:
m_name
:
m_description
:
m_description
:
...
@@ -236,35 +243,42 @@ MonoBehaviour:
...
@@ -236,35 +243,42 @@ MonoBehaviour:
path
:
Wallpaper/front0033
path
:
Wallpaper/front0033
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
1
diy
:
0
-
id
:
1130034
-
id
:
1130034
m_name
:
m_name
:
m_description
:
m_description
:
path
:
Wallpaper/front0034
path
:
Wallpaper/front0034
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
1
diy
:
0
-
id
:
1130035
-
id
:
1130035
m_name
:
m_name
:
m_description
:
m_description
:
path
:
Wallpaper/front0035
path
:
Wallpaper/front0035
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
1
diy
:
0
-
id
:
1130036
m_name
:
m_description
:
path
:
Wallpaper/front0036
functional
:
0
secondFace
:
0
diy
:
0
-
id
:
1130037
-
id
:
1130037
m_name
:
m_name
:
m_description
:
m_description
:
path
:
Wallpaper/front0037
path
:
Wallpaper/front0037
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
1
diy
:
0
-
id
:
1130038
-
id
:
1130038
m_name
:
m_name
:
m_description
:
m_description
:
path
:
Wallpaper/front0038
path
:
Wallpaper/front0038
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
1
diy
:
0
-
id
:
1130039
-
id
:
1130039
m_name
:
m_name
:
m_description
:
m_description
:
...
@@ -278,7 +292,7 @@ MonoBehaviour:
...
@@ -278,7 +292,7 @@ MonoBehaviour:
path
:
Wallpaper/front0040
path
:
Wallpaper/front0040
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
1
diy
:
0
-
id
:
1130041
-
id
:
1130041
m_name
:
m_name
:
m_description
:
m_description
:
...
@@ -287,28 +301,28 @@ MonoBehaviour:
...
@@ -287,28 +301,28 @@ MonoBehaviour:
secondFace
:
0
secondFace
:
0
diy
:
0
diy
:
0
-
id
:
1135001
-
id
:
1135001
m_name
:
m_name
:
"
\u8FF7\u5BAB\u57CE\u7684\u767D\u94F6\u59EC
"
m_description
:
"
Bilibili@
\u5E7D\u4E16\u4E4B\u5BFA\u4EBA
"
m_description
:
"
Bilibili@
\u5E7D\u4E16\u4E4B\u5BFA\u4EBA
"
path
:
Wallpaper/81497285
path
:
Wallpaper/81497285
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
1
diy
:
1
-
id
:
1135002
-
id
:
1135002
m_name
:
m_name
:
"
I
\uFF1A
P
\u4F2A\u88C5\u821E\u4F1A\u83B1\u5A1C
"
m_description
:
"
Bilibili@
\u5E7D\u4E16\u4E4B\u5BFA\u4EBA
"
m_description
:
"
Bilibili@
\u5E7D\u4E16\u4E4B\u5BFA\u4EBA
"
path
:
Wallpaper/65741786
path
:
Wallpaper/65741786
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
1
diy
:
1
-
id
:
1135003
-
id
:
1135003
m_name
:
m_name
:
"
I
\uFF1A
P
\u4F2A\u88C5\u821E\u4F1A\u83B1\u5A1C
\u5F02\u753B
"
m_description
:
"
Bilibili@
\u5E7D\u4E16\u4E4B\u5BFA\u4EBA
"
m_description
:
"
Bilibili@
\u5E7D\u4E16\u4E4B\u5BFA\u4EBA
"
path
:
Wallpaper/65741787
path
:
Wallpaper/65741787
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
1
diy
:
1
-
id
:
1135004
-
id
:
1135004
m_name
:
m_name
:
"
\u8D85\u9B54\u5BFC\u9F99\u9A91\u58EB
-
\u771F\u7EA2\u773C\u9F99\u9A91\u58EB
"
m_description
:
"
Bilibili@
\u5192\u724C\u82F1\u96C4
-
\u6D1B\u90AA
"
m_description
:
"
Bilibili@
\u5192\u724C\u82F1\u96C4
-
\u6D1B\u90AA
"
path
:
Wallpaper/37818794
path
:
Wallpaper/37818794
functional
:
0
functional
:
0
...
@@ -707,6 +721,13 @@ MonoBehaviour:
...
@@ -707,6 +721,13 @@ MonoBehaviour:
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
0
diy
:
0
-
id
:
1010063
m_name
:
m_description
:
path
:
functional
:
0
secondFace
:
0
diy
:
0
-
id
:
1011001
-
id
:
1011001
m_name
:
m_name
:
m_description
:
m_description
:
...
@@ -1387,6 +1408,13 @@ MonoBehaviour:
...
@@ -1387,6 +1408,13 @@ MonoBehaviour:
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
0
diy
:
0
-
id
:
1030024
m_name
:
m_description
:
path
:
functional
:
0
secondFace
:
0
diy
:
0
-
id
:
1030014
-
id
:
1030014
m_name
:
"
\u5149\u5C5E\u6027\u8FB9\u6846
"
m_name
:
"
\u5149\u5C5E\u6027\u8FB9\u6846
"
m_description
:
m_description
:
...
@@ -1429,13 +1457,6 @@ MonoBehaviour:
...
@@ -1429,13 +1457,6 @@ MonoBehaviour:
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
0
diy
:
0
-
id
:
1030024
m_name
:
"
\u8FDE\u63A5\u9EC4\u91D1
"
m_description
:
path
:
functional
:
0
secondFace
:
0
diy
:
0
-
id
:
1030026
-
id
:
1030026
m_name
:
"
\u8FDE\u63A5\u5927\u5E08
"
m_name
:
"
\u8FDE\u63A5\u5927\u5E08
"
m_description
:
m_description
:
...
@@ -2046,6 +2067,13 @@ MonoBehaviour:
...
@@ -2046,6 +2067,13 @@ MonoBehaviour:
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
0
diy
:
0
-
id
:
1070075
m_name
:
m_description
:
path
:
functional
:
0
secondFace
:
0
diy
:
0
-
id
:
1070076
-
id
:
1070076
m_name
:
m_name
:
m_description
:
m_description
:
...
@@ -2067,6 +2095,13 @@ MonoBehaviour:
...
@@ -2067,6 +2095,13 @@ MonoBehaviour:
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
0
diy
:
0
-
id
:
1070079
m_name
:
m_description
:
path
:
functional
:
0
secondFace
:
0
diy
:
0
-
id
:
1070085
-
id
:
1070085
m_name
:
m_name
:
m_description
:
m_description
:
...
@@ -2734,6 +2769,13 @@ MonoBehaviour:
...
@@ -2734,6 +2769,13 @@ MonoBehaviour:
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
0
diy
:
0
-
id
:
1101010
m_name
:
m_description
:
path
:
Grave/grave_u018
functional
:
0
secondFace
:
0
diy
:
0
-
id
:
1101011
-
id
:
1101011
m_name
:
m_name
:
m_description
:
m_description
:
...
@@ -3057,6 +3099,13 @@ MonoBehaviour:
...
@@ -3057,6 +3099,13 @@ MonoBehaviour:
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
0
diy
:
0
-
id
:
1111024
m_name
:
m_description
:
path
:
Avatarstand/avatarstand_u024
functional
:
0
secondFace
:
0
diy
:
0
-
id
:
1113001
-
id
:
1113001
m_name
:
m_name
:
m_description
:
m_description
:
...
@@ -3247,6 +3296,13 @@ MonoBehaviour:
...
@@ -3247,6 +3296,13 @@ MonoBehaviour:
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
0
diy
:
0
-
id
:
1000030
m_name
:
m_description
:
path
:
Mate/m18003_model
functional
:
0
secondFace
:
1
diy
:
0
-
id
:
1000032
-
id
:
1000032
m_name
:
m_name
:
m_description
:
m_description
:
...
@@ -3401,6 +3457,13 @@ MonoBehaviour:
...
@@ -3401,6 +3457,13 @@ MonoBehaviour:
functional
:
0
functional
:
0
secondFace
:
0
secondFace
:
0
diy
:
0
diy
:
0
-
id
:
1001021
m_name
:
m_description
:
path
:
Mate/m13346_model
functional
:
0
secondFace
:
1
diy
:
0
-
id
:
1001022
-
id
:
1001022
m_name
:
m_name
:
m_description
:
m_description
:
...
...
Assets/Scripts/MDPro3/Managers/TextureManager.cs
View file @
c220392c
...
@@ -111,6 +111,8 @@ namespace MDPro3
...
@@ -111,6 +111,8 @@ namespace MDPro3
public
IEnumerator
LoadDummyCard
(
ElementObjectManager
manager
,
int
code
,
bool
active
=
false
)
public
IEnumerator
LoadDummyCard
(
ElementObjectManager
manager
,
int
code
,
bool
active
=
false
)
{
{
if
(
active
)
manager
.
gameObject
.
SetActive
(
false
);
var
ie
=
LoadCardAsync
(
code
,
true
);
var
ie
=
LoadCardAsync
(
code
,
true
);
while
(
ie
.
MoveNext
())
while
(
ie
.
MoveNext
())
yield
return
null
;
yield
return
null
;
...
...
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @
c220392c
...
@@ -19,7 +19,6 @@ using MDPro3.YGOSharp;
...
@@ -19,7 +19,6 @@ using MDPro3.YGOSharp;
using
MDPro3.YGOSharp.OCGWrapper.Enums
;
using
MDPro3.YGOSharp.OCGWrapper.Enums
;
using
static
YgomGame
.
Bg
.
BgEffectSettingInner
;
using
static
YgomGame
.
Bg
.
BgEffectSettingInner
;
using
MDPro3.UI
;
using
MDPro3.UI
;
using
static
MDPro3
.
GameCard
;
namespace
MDPro3
namespace
MDPro3
{
{
...
@@ -2278,11 +2277,13 @@ namespace MDPro3
...
@@ -2278,11 +2277,13 @@ namespace MDPro3
controllerInChain
.
Add
(
card
.
p
.
controller
);
controllerInChain
.
Add
(
card
.
p
.
controller
);
card
.
AnimationActivate
();
card
.
AnimationActivate
();
float
extraSleep
=
0f
;
float
extraSleep
=
0f
;
if
(
cardsInChain
.
Count
>
1
)
if
(
CheckChain
())
extraSleep
=
1.44f
;
{
if
(
cardsInChain
.
Count
>
3
)
if
(
cardsInChain
.
Count
>
1
)
extraSleep
=
2.1f
;
extraSleep
=
1.44f
;
else
if
(
cardsInChain
.
Count
>
3
)
extraSleep
=
2.1f
;
}
DOTween
.
To
(
v
=>
{
},
0
,
0
,
1f
).
OnComplete
(()
=>
DOTween
.
To
(
v
=>
{
},
0
,
0
,
1f
).
OnComplete
(()
=>
{
{
ShowChainStack
();
ShowChainStack
();
...
@@ -6121,9 +6122,9 @@ namespace MDPro3
...
@@ -6121,9 +6122,9 @@ namespace MDPro3
bool
config
=
true
;
bool
config
=
true
;
if
(
condition
==
Condition
.
Duel
&&
Config
.
Get
(
"DuelChain"
,
"1"
)
==
"0"
)
if
(
condition
==
Condition
.
Duel
&&
Config
.
Get
(
"DuelChain"
,
"1"
)
==
"0"
)
config
=
false
;
config
=
false
;
if
(
condition
==
Condition
.
Watch
&&
Config
.
Get
(
"WatchChain"
,
"1"
)
==
"0"
)
else
if
(
condition
==
Condition
.
Watch
&&
Config
.
Get
(
"WatchChain"
,
"1"
)
==
"0"
)
config
=
false
;
config
=
false
;
if
(
condition
==
Condition
.
Replay
&&
Config
.
Get
(
"ReplayChain"
,
"1"
)
==
"0"
)
else
if
(
condition
==
Condition
.
Replay
&&
Config
.
Get
(
"ReplayChain"
,
"1"
)
==
"0"
)
config
=
false
;
config
=
false
;
return
config
;
return
config
;
}
}
...
@@ -6184,7 +6185,7 @@ namespace MDPro3
...
@@ -6184,7 +6185,7 @@ namespace MDPro3
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumDR_Tens"
),
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumDR_Tens"
),
chain
);
chain
);
}
}
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardD
,
codesInChain
[
chain
-
1
]));
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardD
,
codesInChain
[
chain
-
1
]
,
true
));
if
(
controllerInChain
[
chain
-
1
]
==
controllerInChain
[
chain
-
2
])
if
(
controllerInChain
[
chain
-
1
]
==
controllerInChain
[
chain
-
2
])
{
{
...
@@ -6219,7 +6220,7 @@ namespace MDPro3
...
@@ -6219,7 +6220,7 @@ namespace MDPro3
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumCR_Tens"
),
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumCR_Tens"
),
chain
-
1
);
chain
-
1
);
}
}
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardC
,
codesInChain
[
chain
-
2
]));
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardC
,
codesInChain
[
chain
-
2
]
,
true
));
if
(
chain
>
3
)
if
(
chain
>
3
)
{
{
...
@@ -6256,7 +6257,7 @@ namespace MDPro3
...
@@ -6256,7 +6257,7 @@ namespace MDPro3
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumBR_Tens"
),
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumBR_Tens"
),
chain
-
2
);
chain
-
2
);
}
}
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardB
,
codesInChain
[
chain
-
3
]));
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardB
,
codesInChain
[
chain
-
3
]
,
true
));
if
(
controllerInChain
[
chain
-
3
]
==
controllerInChain
[
chain
-
4
])
if
(
controllerInChain
[
chain
-
3
]
==
controllerInChain
[
chain
-
4
])
{
{
...
@@ -6291,7 +6292,7 @@ namespace MDPro3
...
@@ -6291,7 +6292,7 @@ namespace MDPro3
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumAR_Tens"
),
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumAR_Tens"
),
chain
-
3
);
chain
-
3
);
}
}
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardA
,
codesInChain
[
chain
-
4
]));
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardA
,
codesInChain
[
chain
-
4
]
,
true
));
}
}
}
}
float
ShowChainResolve
(
int
chain
)
float
ShowChainResolve
(
int
chain
)
...
@@ -6337,7 +6338,7 @@ namespace MDPro3
...
@@ -6337,7 +6338,7 @@ namespace MDPro3
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumDR_Tens"
),
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumDR_Tens"
),
chain
);
chain
);
}
}
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardD
,
codesInChain
[
chain
-
1
]));
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardD
,
codesInChain
[
chain
-
1
]
,
true
));
if
(
chain
>
1
)
if
(
chain
>
1
)
{
{
...
@@ -6375,7 +6376,7 @@ namespace MDPro3
...
@@ -6375,7 +6376,7 @@ namespace MDPro3
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumCR_Tens"
),
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumCR_Tens"
),
chain
-
1
);
chain
-
1
);
}
}
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardC
,
codesInChain
[
chain
-
2
]));
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardC
,
codesInChain
[
chain
-
2
]
,
true
));
}
}
if
(
chain
>
2
)
if
(
chain
>
2
)
...
@@ -6414,7 +6415,7 @@ namespace MDPro3
...
@@ -6414,7 +6415,7 @@ namespace MDPro3
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumBR_Tens"
),
manager
.
GetElement
<
SpriteRenderer
>(
"ChainNumBR_Tens"
),
chain
-
2
);
chain
-
2
);
}
}
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardB
,
codesInChain
[
chain
-
3
]));
StartCoroutine
(
Program
.
I
().
texture_
.
LoadDummyCard
(
targetCardB
,
codesInChain
[
chain
-
3
]
,
true
));
}
}
if
(
chain
==
1
)
if
(
chain
==
1
)
...
...
Assets/Scripts/MDPro3/UI/Function/EventSEPlayer.cs
View file @
c220392c
...
@@ -8,5 +8,10 @@ namespace MDPro3.UI
...
@@ -8,5 +8,10 @@ namespace MDPro3.UI
{
{
AudioManager
.
PlaySE
(
se
,
0.4f
);
AudioManager
.
PlaySE
(
se
,
0.4f
);
}
}
void
NewEvent
(
string
se
)
{
AudioManager
.
PlaySE
(
se
,
0.4f
);
}
}
}
}
}
ProjectSettings/ProjectSettings.asset
View file @
c220392c
...
@@ -134,8 +134,9 @@ PlayerSettings:
...
@@ -134,8 +134,9 @@ PlayerSettings:
16:10:
1
16:10:
1
16:9:
1
16:9:
1
Others
:
1
Others
:
1
bundleVersion
:
1.0.5.1
bundleVersion
:
1.0.6
preloadedAssets
:
[]
preloadedAssets
:
-
{
fileID
:
11400000
,
guid
:
5fb02d2098f52054b89ce4a9f63ba9ee
,
type
:
2
}
metroInputSource
:
0
metroInputSource
:
0
wsaTransparentSwapchain
:
0
wsaTransparentSwapchain
:
0
m_HolographicPauseOnTrackingLoss
:
1
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