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
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Merge Requests
4
Merge Requests
4
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
赤子奈落
MDPro3
Commits
b2ce24c3
Commit
b2ce24c3
authored
Mar 10, 2026
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert CardImageLoader.cs
parent
7bc5d9bb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
32 deletions
+5
-32
Assets/Scripts/MDPro3/Utility/CardImageLoader.cs
Assets/Scripts/MDPro3/Utility/CardImageLoader.cs
+5
-32
No files found.
Assets/Scripts/MDPro3/Utility/CardImageLoader.cs
View file @
b2ce24c3
...
...
@@ -90,7 +90,7 @@ namespace MDPro3.Utility
Interlocked
.
Increment
(
ref
entry
.
ReferenceCount
);
entry
.
IsPersistent
|=
persistent
;
}
else
if
(!
HasOverFrameArtFile
(
code
))
else
Debug
.
LogError
(
$"Art texture is null for code
{
code
}
"
);
return
entry
.
Texture
;
...
...
@@ -115,7 +115,7 @@ namespace MDPro3.Utility
cachedArts
.
TryRemove
(
code
,
out
_
);
throw
ex
;
}
if
(
newEntry
.
Texture
==
null
&&
!
HasOverFrameArtFile
(
code
)
)
if
(
newEntry
.
Texture
==
null
)
Debug
.
LogError
(
$"
{
code
}
art is null"
);
newEntry
.
LoadingTask
=
null
;
...
...
@@ -288,7 +288,6 @@ namespace MDPro3.Utility
cachedCardNames
.
Clear
();
ClearArtVideos
();
knownOverFrameArts
.
Clear
();
}
#
endregion
...
...
@@ -324,7 +323,7 @@ namespace MDPro3.Utility
}
if
(
art
==
null
)
{
lastCardFoundArt
=
HasOverFrameArtFile
(
code
)
;
lastCardFoundArt
=
false
;
return
null
;
}
...
...
@@ -426,8 +425,7 @@ namespace MDPro3.Utility
if
(
art
==
null
)
{
if
(!
HasOverFrameArtFile
(
data
.
Id
))
Debug
.
LogError
(
$"Get null from ArtLoad for Card
{
data
.
Id
}
:"
);
Debug
.
LogError
(
$"Get null from ArtLoad for Card
{
data
.
Id
}
:"
);
art
=
TextureManager
.
container
.
unknownArt
.
texture
;
}
...
...
@@ -473,8 +471,7 @@ namespace MDPro3.Utility
if
(
art
==
null
)
{
if
(!
HasOverFrameArtFile
(
data
.
Id
))
Debug
.
LogError
(
$"Get null from ArtLoad for Card
{
data
.
Id
}
:"
);
Debug
.
LogError
(
$"Get null from ArtLoad for Card
{
data
.
Id
}
:"
);
art
=
TextureManager
.
container
.
unknownArt
.
texture
;
}
...
...
@@ -636,30 +633,6 @@ namespace MDPro3.Utility
#
region
Art
File
List
Cache
private
static
bool
HasOverFrameArtFile
(
int
code
)
{
if
(
knownOverFrameArts
.
ContainsKey
(
code
))
return
true
;
var
fileName
=
code
+
Program
.
EXPANSION_PNG
;
#if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS)
var
overFramePath
=
Path
.
Combine
(
Application
.
persistentDataPath
,
"Picture"
,
"OverFrame"
,
fileName
);
var
overframePath
=
Path
.
Combine
(
Application
.
persistentDataPath
,
"Picture"
,
"Overframe"
,
fileName
);
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_STANDALONE_LINUX
var
overFramePath
=
Path
.
Combine
(
Environment
.
CurrentDirectory
,
"Picture"
,
"OverFrame"
,
fileName
);
var
overframePath
=
Path
.
Combine
(
Environment
.
CurrentDirectory
,
"Picture"
,
"Overframe"
,
fileName
);
#else
var
overFramePath
=
Path
.
Combine
(
Environment
.
CurrentDirectory
,
"Picture"
,
"OverFrame"
,
fileName
);
var
overframePath
=
Path
.
Combine
(
Environment
.
CurrentDirectory
,
"Picture"
,
"Overframe"
,
fileName
);
#endif
var
exists
=
File
.
Exists
(
overFramePath
)
||
File
.
Exists
(
overframePath
);
if
(
exists
)
knownOverFrameArts
.
TryAdd
(
code
,
0
);
return
exists
;
}
private
static
readonly
List
<
int
>
artFileList
=
new
();
private
static
readonly
Dictionary
<
int
,
string
>
artAltFileList
=
new
();
private
static
bool
artFileListInitialized
;
...
...
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