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
Dilmah
MDPro3
Commits
8eefb38f
Commit
8eefb38f
authored
Apr 17, 2024
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
d73bc161
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
55 deletions
+18
-55
Assets/Main.unity
Assets/Main.unity
+9
-16
Assets/Scripts/MDPro3/CardRenderer.cs
Assets/Scripts/MDPro3/CardRenderer.cs
+5
-9
Assets/Scripts/MDPro3/Helper/PortHelper.cs
Assets/Scripts/MDPro3/Helper/PortHelper.cs
+1
-27
Assets/Scripts/MDPro3/UI/Handler/CardOnEdit.cs
Assets/Scripts/MDPro3/UI/Handler/CardOnEdit.cs
+2
-2
Assets/Scripts/MDPro3/UI/SuperScrollView/SuperScrollViewItemForDeckEdit.cs
...Pro3/UI/SuperScrollView/SuperScrollViewItemForDeckEdit.cs
+1
-1
No files found.
Assets/Main.unity
View file @
8eefb38f
...
@@ -3077,7 +3077,7 @@ MonoBehaviour:
...
@@ -3077,7 +3077,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_LineSpacing: 1
m_Text:
"\u6D4B\u8BD5"
m_Text:
--- !u!222 &54642213
--- !u!222 &54642213
CanvasRenderer:
CanvasRenderer:
m_ObjectHideFlags: 0
m_ObjectHideFlags: 0
...
@@ -15728,7 +15728,7 @@ MonoBehaviour:
...
@@ -15728,7 +15728,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1581995138}
m_HandleRect: {fileID: 1581995138}
m_Direction: 2
m_Direction: 2
m_Value: 0
m_Value: 0
m_Size:
0
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -19094,7 +19094,7 @@ MonoBehaviour:
...
@@ -19094,7 +19094,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 931169952}
m_HandleRect: {fileID: 931169952}
m_Direction: 2
m_Direction: 2
m_Value: 0
m_Value: 0
m_Size:
0.6103896
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -35648,7 +35648,7 @@ RectTransform:
...
@@ -35648,7 +35648,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y:
-
0.000030517578}
m_AnchoredPosition: {x: 0, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 300}
m_SizeDelta: {x: 0, y: 300}
m_Pivot: {x: 0.5, y: 1}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &702608002
--- !u!114 &702608002
...
@@ -38898,7 +38898,7 @@ MonoBehaviour:
...
@@ -38898,7 +38898,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 476827028}
m_HandleRect: {fileID: 476827028}
m_Direction: 2
m_Direction: 2
m_Value: 1
m_Value: 1
m_Size: 0.6
400252
m_Size: 0.6
2751776
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -55485,7 +55485,7 @@ RectTransform:
...
@@ -55485,7 +55485,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0
.000030517578
}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 300}
m_SizeDelta: {x: 0, y: 300}
m_Pivot: {x: 0.5, y: 1}
m_Pivot: {x: 0.5, y: 1}
--- !u!1 &1117266860
--- !u!1 &1117266860
...
@@ -72024,7 +72024,7 @@ MonoBehaviour:
...
@@ -72024,7 +72024,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 761159127}
m_HandleRect: {fileID: 761159127}
m_Direction: 2
m_Direction: 2
m_Value: 0
m_Value: 0
m_Size:
0.6629212
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -75929,7 +75929,7 @@ MonoBehaviour:
...
@@ -75929,7 +75929,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 2083794100}
m_HandleRect: {fileID: 2083794100}
m_Direction: 2
m_Direction: 2
m_Value: 0
m_Value: 0
m_Size:
0.5588235
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -78358,14 +78358,7 @@ MonoBehaviour:
...
@@ -78358,14 +78358,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_LineSpacing: 1
m_Text: "Puedes descartar al Cementerio esta carta y 1 monstruo de VIENTO; a\xF1ade
m_Text:
a tu mano 1 monstruo Drag\xF3n en tu Deck. Puedes desterrar un total de 2 monstruos
Drag\xF3n y/o de VIENTO en tu mano y/o Cementerio; Invoca esta carta de Modo
Especial desde tu mano o Cementerio. Durante la End Phase de tu adversario, si
controlas esta carta Invocada de Modo Especial: devu\xE9lvela a la mano. Si esta
carta es desterrada: puedes a\xF1adir a tu mano 1 monstruo Drag\xF3n de VIENTO
en tu Deck. S\xF3lo puedes usar 1 efecto de \"Tempest, Se\xF1or Drag\xF3n de
las Tormentas\" por turno, y s\xF3lo una vez ese turno."
--- !u!222 &1539038665
--- !u!222 &1539038665
CanvasRenderer:
CanvasRenderer:
m_ObjectHideFlags: 0
m_ObjectHideFlags: 0
Assets/Scripts/MDPro3/CardRenderer.cs
View file @
8eefb38f
...
@@ -4,6 +4,7 @@ using UnityEngine.AddressableAssets;
...
@@ -4,6 +4,7 @@ using UnityEngine.AddressableAssets;
using
UnityEngine.UI
;
using
UnityEngine.UI
;
using
MDPro3.YGOSharp
;
using
MDPro3.YGOSharp
;
using
MDPro3.YGOSharp.OCGWrapper.Enums
;
using
MDPro3.YGOSharp.OCGWrapper.Enums
;
using
System
;
namespace
MDPro3
namespace
MDPro3
{
{
...
@@ -491,13 +492,12 @@ namespace MDPro3
...
@@ -491,13 +492,12 @@ namespace MDPro3
return
string
.
Empty
;
return
string
.
Empty
;
var
language
=
Config
.
Get
(
"Language"
,
"zh-CN"
);
var
language
=
Config
.
Get
(
"Language"
,
"zh-CN"
);
//Remove Space
if
(
language
==
"ja-JP"
)
if
(
language
==
"ja-JP"
)
{
{
description
=
description
.
Replace
(
"\t
\r\n"
,
"\r\r\r
"
);
description
=
description
.
Replace
(
"\t
"
,
"\f\f\f
"
);
description
=
description
.
Replace
(
"\
r\
n●"
,
"●●●"
);
description
=
description
.
Replace
(
"\n●"
,
"●●●"
);
description
=
description
.
Replace
(
"\
r\
n"
,
string
.
Empty
);
description
=
description
.
Replace
(
"\n"
,
string
.
Empty
);
description
=
description
.
Replace
(
"\
r\r\r
"
,
"\r\n"
);
description
=
description
.
Replace
(
"\
f\f\f
"
,
"\r\n"
);
description
=
description
.
Replace
(
"●●●"
,
"\r\n●"
);
description
=
description
.
Replace
(
"●●●"
,
"\r\n●"
);
}
}
else
else
...
@@ -524,12 +524,8 @@ namespace MDPro3
...
@@ -524,12 +524,8 @@ namespace MDPro3
description
=
description
.
Replace
(
Program
.
slash
,
bigSlash
);
description
=
description
.
Replace
(
Program
.
slash
,
bigSlash
);
if
(
language
!=
"en-US"
&&
language
!=
"es-ES"
)
if
(
language
!=
"en-US"
&&
language
!=
"es-ES"
)
description
=
description
.
Replace
(
" "
,
"\u00A0"
);
description
=
description
.
Replace
(
" "
,
"\u00A0"
);
description
=
description
.
Replace
(
"\r\n\r\n"
,
"\r\n"
);
description
=
description
.
Replace
(
"\r\n\r\n"
,
"\r\n"
);
return
description
;
return
description
;
}
}
}
}
}
}
Assets/Scripts/MDPro3/Helper/PortHelper.cs
View file @
8eefb38f
...
@@ -44,17 +44,10 @@ namespace MDPro3
...
@@ -44,17 +44,10 @@ namespace MDPro3
#if UNITY_ANDROID && !UNITY_EDITOR
#if UNITY_ANDROID && !UNITY_EDITOR
NativeFilePicker
.
ExportMultipleFiles
(
filePaths
,
ExportResult
);
NativeFilePicker
.
ExportMultipleFiles
(
filePaths
,
ExportResult
);
#else
#else
StandaloneFileBrowser
.
OpenFolderPanelAsync
(
"请选择导出目录"
,
""
,
false
,
(
string
[]
paths
)
=>
StandaloneFileBrowser
.
OpenFolderPanelAsync
(
InterString
.
Get
(
"请选择导出目录"
)
,
""
,
false
,
(
string
[]
paths
)
=>
{
{
ExportFiles
(
paths
,
filePaths
);
ExportFiles
(
paths
,
filePaths
);
});
});
//var config = new FolderDialogConfiguration
//{
// Title = InterString.Get("请选择导出目录"),
//};
//var result = FileBrowser.FileBrowserService.OpenFolderDialog(config);
//ExportFiles(result, filePaths);
#endif
#endif
}
}
...
@@ -74,25 +67,6 @@ namespace MDPro3
...
@@ -74,25 +67,6 @@ namespace MDPro3
static
void
ChooseFiles
()
static
void
ChooseFiles
()
{
{
//var config = new FileDialogConfiguration
//{
// Title = InterString.Get("请选择需要导入的文件"),
// FileDialogType = FileBrowser.FileDialogType.Open,
// Multiselect = true,
// ExtensionFilters = new[]
// {
// new ExtensionFilter(InterString.Get("所有文件"), "*"),
// new ExtensionFilter(InterString.Get("卡组码文件"), "ydk"),
// new ExtensionFilter(InterString.Get("回放文件"), "yrp", "yrp3d"),
// new ExtensionFilter(InterString.Get("扩展卡文件"), "ypk"),
// new ExtensionFilter(InterString.Get("数据库文件"), "cdb"),
// new ExtensionFilter(InterString.Get("字段文件"), "conf"),
// new ExtensionFilter(InterString.Get("图片文件"), "png", "jpg")
// }
//};
//var result = FileBrowser.FileBrowserService.OpenFileDialog(config);
//CopyFilesToGame(result);
var
extensions
=
new
[]
var
extensions
=
new
[]
{
{
new
ExtensionFilter
(
InterString
.
Get
(
"所有文件"
),
"*"
),
new
ExtensionFilter
(
InterString
.
Get
(
"所有文件"
),
"*"
),
...
...
Assets/Scripts/MDPro3/UI/Handler/CardOnEdit.cs
View file @
8eefb38f
...
@@ -105,11 +105,11 @@ namespace MDPro3.UI
...
@@ -105,11 +105,11 @@ namespace MDPro3.UI
IEnumerator
RefreshCard
()
IEnumerator
RefreshCard
()
{
{
GetComponent
<
RawImage
>().
texture
=
TextureManager
.
container
.
unknownCard
.
texture
;
GetComponent
<
RawImage
>().
texture
=
TextureManager
.
container
.
unknownCard
.
texture
;
var
ie
=
Program
.
I
().
texture_
.
LoadCardAsync
(
code
);
var
ie
=
Program
.
I
().
texture_
.
LoadCardAsync
(
code
,
true
);
while
(
ie
.
MoveNext
())
while
(
ie
.
MoveNext
())
yield
return
null
;
yield
return
null
;
GetComponent
<
RawImage
>().
texture
=
ie
.
Current
;
GetComponent
<
RawImage
>().
texture
=
ie
.
Current
;
GetComponent
<
RawImage
>().
material
=
TextureManager
.
GetCardMaterial
(
code
);
GetComponent
<
RawImage
>().
material
=
TextureManager
.
GetCardMaterial
(
code
,
true
);
}
}
public
void
RefreshLimitIcon
()
public
void
RefreshLimitIcon
()
...
...
Assets/Scripts/MDPro3/UI/SuperScrollView/SuperScrollViewItemForDeckEdit.cs
View file @
8eefb38f
...
@@ -150,7 +150,7 @@ namespace MDPro3.UI
...
@@ -150,7 +150,7 @@ namespace MDPro3.UI
for
(
int
i
=
0
;
i
<
transform
.
GetSiblingIndex
();
i
++)
for
(
int
i
=
0
;
i
<
transform
.
GetSiblingIndex
();
i
++)
yield
return
null
;
yield
return
null
;
var
ie
=
Program
.
I
().
texture_
.
LoadCardAsync
(
code
);
var
ie
=
Program
.
I
().
texture_
.
LoadCardAsync
(
code
,
true
);
StartCoroutine
(
ie
);
StartCoroutine
(
ie
);
while
(
ie
.
MoveNext
())
while
(
ie
.
MoveNext
())
yield
return
null
;
yield
return
null
;
...
...
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