Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
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
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
MyCard
ygopro
Commits
d08852b5
Commit
d08852b5
authored
Dec 21, 2024
by
wind2009
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/master' into develop
parents
9b4b1072
aa33999f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
gframe/data_manager.cpp
gframe/data_manager.cpp
+4
-4
strings.conf
strings.conf
+2
-2
No files found.
gframe/data_manager.cpp
View file @
d08852b5
...
...
@@ -398,19 +398,19 @@ unsigned char* DataManager::ScriptReaderEx(const char* script_name, int* slen) {
char
expansions_path
[
1024
]{};
std
::
snprintf
(
expansions_path
,
sizeof
expansions_path
,
"./expansions/%s"
,
script_name
+
2
);
if
(
mainGame
->
gameConf
.
prefer_expansion_script
)
{
if
(
ScriptReader
(
script_name
,
slen
))
if
(
DefaultScriptReader
(
expansions_path
,
slen
))
return
scriptBuffer
;
else
if
(
DefaultScriptReader
(
expansions_path
,
slen
))
else
if
(
ScriptReader
(
script_name
,
slen
))
return
scriptBuffer
;
else
if
(
DefaultScriptReader
(
script_name
,
slen
))
return
scriptBuffer
;
}
else
{
if
(
DefaultScriptReader
(
script_name
,
slen
))
return
scriptBuffer
;
else
if
(
ScriptReader
(
script_name
,
slen
))
return
scriptBuffer
;
else
if
(
DefaultScriptReader
(
expansions_path
,
slen
))
return
scriptBuffer
;
else
if
(
ScriptReader
(
script_name
,
slen
))
return
scriptBuffer
;
}
return
nullptr
;
}
...
...
strings.conf
View file @
d08852b5
...
...
@@ -660,7 +660,7 @@
!
counter
0
x68
指示物(图腾柱)
!
counter
0
x69
指示物(吠陀-优婆尼沙昙)
!
counter
0
x6a
响鸣指示物
!
counter
0
x6b
狂爱指示物
!
counter
0
x
10
6b
狂爱指示物
!
counter
0
x6c
访问指示物
!
counter
0
x6d
祝台指示物
#setnames, using tab for comment
...
...
@@ -1243,5 +1243,5 @@
!
setname
0
x1be
雷火沸动 ライゼオル
!
setname
0
x1bf
码丽丝
M
∀
LICE
!
setname
0
x1c0
龙华 竜華
!
setname
0
x1c1
阿
耳戈视☆将
星
ARG
☆
S
!
setname
0
x1c1
阿
尔戈☆群
星
ARG
☆
S
!
setname
0
x1c2
喷水引擎 アクア・ジェット
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