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
SK
MDPro3
Commits
baddce33
Commit
baddce33
authored
Mar 03, 2025
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
7fcc8361
Changes
18
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
146 additions
and
126273 deletions
+146
-126273
Assets/Addressables/Text/UpdateContent.txt
Assets/Addressables/Text/UpdateContent.txt
+4
-0
Assets/Fonts/SourceHanSansSC-Bold.asset
Assets/Fonts/SourceHanSansSC-Bold.asset
+12
-36089
Assets/Fonts/SourceHanSansSC-Medium.asset
Assets/Fonts/SourceHanSansSC-Medium.asset
+71
-90168
Assets/Prefabs/ServantUI/DeckEditorUI.prefab
Assets/Prefabs/ServantUI/DeckEditorUI.prefab
+1
-0
Assets/Prefabs/ServantUI/DeckEditorUIMobile.prefab
Assets/Prefabs/ServantUI/DeckEditorUIMobile.prefab
+2
-1
Assets/Scripts/MDPro3/Managers/UIManager.cs
Assets/Scripts/MDPro3/Managers/UIManager.cs
+26
-3
Assets/Scripts/MDPro3/Servant/Servant.cs
Assets/Scripts/MDPro3/Servant/Servant.cs
+2
-0
Assets/Scripts/MDPro3/UI/ServantUI/AppearanceUI.cs
Assets/Scripts/MDPro3/UI/ServantUI/AppearanceUI.cs
+1
-1
Assets/Scripts/MDPro3/UI/ServantUI/CharacterSelectorUI.cs
Assets/Scripts/MDPro3/UI/ServantUI/CharacterSelectorUI.cs
+1
-1
Assets/Scripts/MDPro3/UI/ServantUI/DeckEditorUI.cs
Assets/Scripts/MDPro3/UI/ServantUI/DeckEditorUI.cs
+3
-1
Assets/Scripts/MDPro3/UI/ServantUI/DeckSelectorUI.cs
Assets/Scripts/MDPro3/UI/ServantUI/DeckSelectorUI.cs
+2
-2
Assets/Scripts/MDPro3/UI/ServantUI/OcgCoreUI.cs
Assets/Scripts/MDPro3/UI/ServantUI/OcgCoreUI.cs
+1
-1
Assets/Scripts/MDPro3/UI/ServantUI/OnlineServantUI.cs
Assets/Scripts/MDPro3/UI/ServantUI/OnlineServantUI.cs
+1
-1
Assets/Scripts/MDPro3/UI/ServantUI/RoomServantUI.cs
Assets/Scripts/MDPro3/UI/ServantUI/RoomServantUI.cs
+1
-1
Assets/Scripts/MDPro3/UI/ServantUI/ServantUI.cs
Assets/Scripts/MDPro3/UI/ServantUI/ServantUI.cs
+2
-2
Assets/Scripts/MDPro3/UI/ServantUI/SettingServantUI.cs
Assets/Scripts/MDPro3/UI/ServantUI/SettingServantUI.cs
+1
-1
Assets/Scripts/MDPro3/UI/ServantUI/SoloSelectorUI.cs
Assets/Scripts/MDPro3/UI/ServantUI/SoloSelectorUI.cs
+1
-1
Data/locales/ja-JP/translation.conf
Data/locales/ja-JP/translation.conf
+14
-0
No files found.
Assets/Addressables/Text/UpdateContent.txt
View file @
baddce33
MDPro3 v1.2.5.1更新:
1.修复系统语言为非中文时,主菜单字体不显示的错误。
2.修复分辨率比例16:9以下时,编辑卡组界面在编辑副卡组时显示不全的错误。
MDPro3 v1.2.5.1更新:
MDPro3 v1.2.5.1更新:
1.修复在线卡组搜索失效的错误。
1.修复在线卡组搜索失效的错误。
2.修复分辨率比例16:9以下时,编辑卡组界面显示不全的错误。
2.修复分辨率比例16:9以下时,编辑卡组界面显示不全的错误。
...
...
Assets/Fonts/SourceHanSansSC-Bold.asset
View file @
baddce33
This diff is collapsed.
Click to expand it.
Assets/Fonts/SourceHanSansSC-Medium.asset
View file @
baddce33
This diff is collapsed.
Click to expand it.
Assets/Prefabs/ServantUI/DeckEditorUI.prefab
View file @
baddce33
...
@@ -92657,6 +92657,7 @@ MonoBehaviour:
...
@@ -92657,6 +92657,7 @@ MonoBehaviour:
- {fileID: 4689671317571541554}
- {fileID: 4689671317571541554}
- {fileID: 4420769399430443410}
- {fileID: 4420769399430443410}
- {fileID: 8353873743859406989}
- {fileID: 8353873743859406989}
- {fileID: 9053682883534065444}
- {fileID: 7001212255668578964}
- {fileID: 7001212255668578964}
--- !u!1 &8100501309125588915
--- !u!1 &8100501309125588915
GameObject:
GameObject:
Assets/Prefabs/ServantUI/DeckEditorUIMobile.prefab
View file @
baddce33
...
@@ -14600,7 +14600,7 @@ MonoBehaviour:
...
@@ -14600,7 +14600,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 7446650972608614846}
m_HandleRect: {fileID: 7446650972608614846}
m_Direction: 2
m_Direction: 2
m_Value: 1
m_Value: 1
m_Size: 0.8
01
5
m_Size: 0.8
35
5
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -76048,6 +76048,7 @@ MonoBehaviour:
...
@@ -76048,6 +76048,7 @@ MonoBehaviour:
- {fileID: 4689671317571541554}
- {fileID: 4689671317571541554}
- {fileID: 4420769399430443410}
- {fileID: 4420769399430443410}
- {fileID: 8353873743859406989}
- {fileID: 8353873743859406989}
- {fileID: 9053682883534065444}
- {fileID: 7001212255668578964}
- {fileID: 7001212255668578964}
--- !u!1 &8166086360927241581
--- !u!1 &8166086360927241581
GameObject:
GameObject:
Assets/Scripts/MDPro3/Managers/UIManager.cs
View file @
baddce33
...
@@ -84,9 +84,32 @@ namespace MDPro3
...
@@ -84,9 +84,32 @@ namespace MDPro3
foreach
(
var
text
in
go
.
GetComponentsInChildren
<
Text
>(
true
))
foreach
(
var
text
in
go
.
GetComponentsInChildren
<
Text
>(
true
))
if
(
text
.
name
.
StartsWith
(
TRANSLATE_PREFIX
))
if
(
text
.
name
.
StartsWith
(
TRANSLATE_PREFIX
))
text
.
text
=
InterString
.
Get
(
text
.
text
.
Replace
(
"\r\n"
,
"@n"
));
text
.
text
=
InterString
.
Get
(
text
.
text
.
Replace
(
"\r\n"
,
"@n"
));
foreach
(
var
text
in
go
.
GetComponentsInChildren
<
TextMeshProUGUI
>(
true
))
foreach
(
var
tmp
in
go
.
GetComponentsInChildren
<
TextMeshProUGUI
>(
true
))
if
(
text
.
name
.
StartsWith
(
TRANSLATE_PREFIX
))
{
text
.
text
=
InterString
.
Get
(
text
.
text
.
Replace
(
"\r\n"
,
"@n"
));
if
(
tmp
.
name
.
StartsWith
(
TRANSLATE_PREFIX
))
tmp
.
text
=
InterString
.
Get
(
tmp
.
text
.
Replace
(
"\r\n"
,
"@n"
));
if
(
tmp
.
name
.
EndsWith
(
"Menu"
))
{
UIManager
instance
=
Program
.
instance
.
ui_
;
if
((
Language
.
GetConfig
()
==
Language
.
English
||
Language
.
GetConfig
()
==
Language
.
Japanese
))
{
tmp
.
font
=
instance
.
jpMenuTmpFont
;
tmp
.
fontSize
=
64f
;
}
else
if
(
Language
.
GetConfig
()
==
Language
.
SimplifiedChinese
)
{
tmp
.
font
=
instance
.
cnMenuTmpFont
;
tmp
.
fontSize
=
62f
;
}
else
{
tmp
.
font
=
instance
.
tmpFont
;
tmp
.
fontSize
=
60f
;
}
}
}
}
}
public
static
void
InitializeLanguage
()
public
static
void
InitializeLanguage
()
...
...
Assets/Scripts/MDPro3/Servant/Servant.cs
View file @
baddce33
...
@@ -173,6 +173,7 @@ namespace MDPro3.Servant
...
@@ -173,6 +173,7 @@ namespace MDPro3.Servant
if
(
fromDuel
)
if
(
fromDuel
)
{
{
servantUI
.
ShowEvent
();
DOTween
.
To
(
v
=>
{
},
0
,
0
,
Program
.
instance
.
ocgcore
.
TransitionTime
).
OnComplete
(()
=>
DOTween
.
To
(
v
=>
{
},
0
,
0
,
Program
.
instance
.
ocgcore
.
TransitionTime
).
OnComplete
(()
=>
{
{
servantUI
.
gameObject
.
SetActive
(
true
);
servantUI
.
gameObject
.
SetActive
(
true
);
...
@@ -190,6 +191,7 @@ namespace MDPro3.Servant
...
@@ -190,6 +191,7 @@ namespace MDPro3.Servant
UIManager
.
HideLine
(
0
);
UIManager
.
HideLine
(
0
);
UIManager
.
ShowBlackBack
(
BlackAlpha
,
0f
);
UIManager
.
ShowBlackBack
(
BlackAlpha
,
0f
);
servantUI
.
AfterShowEvent
();
AfterShowingEvent
();
AfterShowingEvent
();
});
});
}
}
...
...
Assets/Scripts/MDPro3/UI/ServantUI/AppearanceUI.cs
View file @
baddce33
...
@@ -211,7 +211,7 @@ namespace MDPro3.UI.ServantUI
...
@@ -211,7 +211,7 @@ namespace MDPro3.UI.ServantUI
Page00PlayerName
.
GetSelectable
().
Select
();
Page00PlayerName
.
GetSelectable
().
Select
();
}
}
p
rotected
override
void
ShowEvent
()
p
ublic
override
void
ShowEvent
()
{
{
base
.
ShowEvent
();
base
.
ShowEvent
();
...
...
Assets/Scripts/MDPro3/UI/ServantUI/CharacterSelectorUI.cs
View file @
baddce33
...
@@ -134,7 +134,7 @@ namespace MDPro3.UI.ServantUI
...
@@ -134,7 +134,7 @@ namespace MDPro3.UI.ServantUI
p
rotected
override
void
ShowEvent
()
p
ublic
override
void
ShowEvent
()
{
{
base
.
ShowEvent
();
base
.
ShowEvent
();
...
...
Assets/Scripts/MDPro3/UI/ServantUI/DeckEditorUI.cs
View file @
baddce33
...
@@ -187,7 +187,7 @@ namespace MDPro3.UI.ServantUI
...
@@ -187,7 +187,7 @@ namespace MDPro3.UI.ServantUI
CardCollectionView
.
SetCursor
(
_ResponseRegion
==
ResponseRegion
.
Collection
);
CardCollectionView
.
SetCursor
(
_ResponseRegion
==
ResponseRegion
.
Collection
);
}
}
p
rotected
override
void
ShowEvent
()
p
ublic
override
void
ShowEvent
()
{
{
base
.
ShowEvent
();
base
.
ShowEvent
();
...
@@ -197,6 +197,8 @@ namespace MDPro3.UI.ServantUI
...
@@ -197,6 +197,8 @@ namespace MDPro3.UI.ServantUI
ShowBackButton
();
ShowBackButton
();
else
else
HideBackButton
();
HideBackButton
();
}
}
else
else
{
{
...
...
Assets/Scripts/MDPro3/UI/ServantUI/DeckSelectorUI.cs
View file @
baddce33
...
@@ -89,7 +89,7 @@ namespace MDPro3.UI.ServantUI
...
@@ -89,7 +89,7 @@ namespace MDPro3.UI.ServantUI
public
Dictionary
<
string
,
Deck
>
decks
=
new
();
public
Dictionary
<
string
,
Deck
>
decks
=
new
();
public
bool
buttonLayoutSwitching
;
public
bool
buttonLayoutSwitching
;
p
rotected
override
void
ShowEvent
()
p
ublic
override
void
ShowEvent
()
{
{
base
.
ShowEvent
();
base
.
ShowEvent
();
...
@@ -117,7 +117,7 @@ namespace MDPro3.UI.ServantUI
...
@@ -117,7 +117,7 @@ namespace MDPro3.UI.ServantUI
ShowDefaultButtons
();
ShowDefaultButtons
();
}
}
p
rotected
override
void
AfterShowEvent
()
p
ublic
override
void
AfterShowEvent
()
{
{
base
.
AfterShowEvent
();
base
.
AfterShowEvent
();
...
...
Assets/Scripts/MDPro3/UI/ServantUI/OcgCoreUI.cs
View file @
baddce33
...
@@ -162,7 +162,7 @@ namespace MDPro3.UI.ServantUI
...
@@ -162,7 +162,7 @@ namespace MDPro3.UI.ServantUI
ShowEvent
();
ShowEvent
();
}
}
p
rotected
override
void
ShowEvent
()
p
ublic
override
void
ShowEvent
()
{
{
base
.
ShowEvent
();
base
.
ShowEvent
();
...
...
Assets/Scripts/MDPro3/UI/ServantUI/OnlineServantUI.cs
View file @
baddce33
...
@@ -60,7 +60,7 @@ namespace MDPro3.UI.ServantUI
...
@@ -60,7 +60,7 @@ namespace MDPro3.UI.ServantUI
ToggleLegacy
.
SetToggleOn
();
ToggleLegacy
.
SetToggleOn
();
}
}
p
rotected
override
void
ShowEvent
()
p
ublic
override
void
ShowEvent
()
{
{
base
.
ShowEvent
();
base
.
ShowEvent
();
...
...
Assets/Scripts/MDPro3/UI/ServantUI/RoomServantUI.cs
View file @
baddce33
...
@@ -96,7 +96,7 @@ namespace MDPro3.UI.ServantUI
...
@@ -96,7 +96,7 @@ namespace MDPro3.UI.ServantUI
Realize
();
Realize
();
}
}
p
rotected
override
void
AfterShowEvent
()
p
ublic
override
void
AfterShowEvent
()
{
{
base
.
AfterShowEvent
();
base
.
AfterShowEvent
();
if
(
Program
.
instance
.
currentServant
!=
Program
.
instance
.
room
)
if
(
Program
.
instance
.
currentServant
!=
Program
.
instance
.
room
)
...
...
Assets/Scripts/MDPro3/UI/ServantUI/ServantUI.cs
View file @
baddce33
...
@@ -104,11 +104,11 @@ namespace MDPro3.UI.ServantUI
...
@@ -104,11 +104,11 @@ namespace MDPro3.UI.ServantUI
ShowEvent
();
ShowEvent
();
}
}
p
rotected
virtual
void
ShowEvent
()
p
ublic
virtual
void
ShowEvent
()
{
{
}
}
p
rotected
virtual
void
AfterShowEvent
()
p
ublic
virtual
void
AfterShowEvent
()
{
{
}
}
...
...
Assets/Scripts/MDPro3/UI/ServantUI/SettingServantUI.cs
View file @
baddce33
...
@@ -577,7 +577,7 @@ namespace MDPro3.UI.ServantUI
...
@@ -577,7 +577,7 @@ namespace MDPro3.UI.ServantUI
defaultToggle
.
ScrollRectToTop
();
defaultToggle
.
ScrollRectToTop
();
}
}
p
rotected
override
void
ShowEvent
()
p
ublic
override
void
ShowEvent
()
{
{
base
.
ShowEvent
();
base
.
ShowEvent
();
...
...
Assets/Scripts/MDPro3/UI/ServantUI/SoloSelectorUI.cs
View file @
baddce33
...
@@ -90,7 +90,7 @@ namespace MDPro3.UI.ServantUI
...
@@ -90,7 +90,7 @@ namespace MDPro3.UI.ServantUI
ButtonDeck
.
gameObject
.
SetActive
(
false
);
ButtonDeck
.
gameObject
.
SetActive
(
false
);
}
}
p
rotected
override
void
ShowEvent
()
p
ublic
override
void
ShowEvent
()
{
{
base
.
ShowEvent
();
base
.
ShowEvent
();
...
...
Data/locales/ja-JP/translation.conf
View file @
baddce33
...
@@ -692,3 +692,17 @@ OCG_TCG->OCG_TCG
...
@@ -692,3 +692,17 @@ OCG_TCG->OCG_TCG
1
1
->
1
->
1
重试->重试
震动->震动
开启或关闭手柄震动->开启或关闭手柄震动
UI
布局->
UI
布局
移动布局->移动布局
设置
UI
为适合桌面端的紧凑布局或者移动端的宽大布局->设置
UI
为适合桌面端的紧凑布局或者移动端的宽大布局
自动判断->自动判断
スクリーン最大化->スクリーン最大化
最高->最高
非常高い->非常高い
オン->オン
自分->自分
オフ->オフ
はい->はい
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