Commit 2d415ad1 authored by hex's avatar hex

增加立绘资源下载

parent 2026bcad
Pipeline #40002 failed
This diff is collapsed.
...@@ -403,9 +403,32 @@ public class Program : MonoBehaviour ...@@ -403,9 +403,32 @@ public class Program : MonoBehaviour
Config.initialize("config/config.conf"); Config.initialize("config/config.conf");
// [新增] 封装文件加载逻辑,避免重复检查 // 封装文件加载逻辑,避免重复检查
LoadDatabaseFile("cards.cdb", (path) => YGOSharp.CardsManager.initialize(path)); LoadDatabaseFile("cards.cdb", (path) => YGOSharp.CardsManager.initialize(path));
LoadDatabaseFile("strings.conf", (path) => GameStringManager.initialize(path)); LoadDatabaseFile("strings.conf", (path) => GameStringManager.initialize(path));
// 创建文件夹
if (!Directory.Exists("expansions"))
{
try
{
Directory.CreateDirectory("expansions");
}
catch
{
}
}
if (!Directory.Exists("replay"))
{
try
{
Directory.CreateDirectory("replay");
}
catch
{
}
}
// lflist的加载顺序有特殊性,单独处理 // lflist的加载顺序有特殊性,单独处理
if (File.Exists("expansions/lflist.conf")) if (File.Exists("expansions/lflist.conf"))
......
...@@ -554,7 +554,8 @@ public class DeckManager : ServantWithCardDescription ...@@ -554,7 +554,8 @@ public class DeckManager : ServantWithCardDescription
// 【核心修改】计算两个面板共同的、正确的垂直中心点Y坐标 // 【核心修改】计算两个面板共同的、正确的垂直中心点Y坐标
// 这个公式必须与 applyShowArrangement() 中使用的完全一致! // 这个公式必须与 applyShowArrangement() 中使用的完全一致!
float sharedCenterY = safeArea.y + (searchPanelTexture.height / 2f); float visibleTargetY = safeArea.y + (searchPanelTexture.height / 2f);
visibleTargetY -= 40;
// 计算详细搜索框“可见时”的目标 X 坐标中心点 // 计算详细搜索框“可见时”的目标 X 坐标中心点
// 逻辑:安全区右边缘 - 主面板宽度 - 详细面板宽度的一半(考虑缩放) // 逻辑:安全区右边缘 - 主面板宽度 - 详细面板宽度的一半(考虑缩放)
...@@ -570,7 +571,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -570,7 +571,7 @@ public class DeckManager : ServantWithCardDescription
if (detailShowed) if (detailShowed)
{ {
// **显示时**: 移动到 safeArea 内,主搜索框左侧,并使用共享的Y坐标 // **显示时**: 移动到 safeArea 内,主搜索框左侧,并使用共享的Y坐标
targetScreenPos = new Vector3(visibleTargetX, sharedCenterY, 0); targetScreenPos = new Vector3(visibleTargetX, visibleTargetY, 0);
// 更新底部Bar的右边距,使其避开两个面板的总宽度 // 更新底部Bar的右边距,使其避开两个面板的总宽度
reShowBar(0, searchPanelActualWidth + (DETAILED_SEARCH_PANEL_WIDTH * scaleFactor)); reShowBar(0, searchPanelActualWidth + (DETAILED_SEARCH_PANEL_WIDTH * scaleFactor));
...@@ -2306,9 +2307,9 @@ public class DeckManager : ServantWithCardDescription ...@@ -2306,9 +2307,9 @@ public class DeckManager : ServantWithCardDescription
{ {
// UnityEngine.Debug.Log(e); // UnityEngine.Debug.Log(e);
} }
List<YGOSharp.Card> result = new List<YGOSharp.Card>();
if (side) if (side)
{ {
List<YGOSharp.Card> result = new List<YGOSharp.Card>();
foreach (var item in Program.I().ocgcore.sideReference) foreach (var item in Program.I().ocgcore.sideReference)
{ {
result.Add(YGOSharp.CardsManager.Get(item.Value)); result.Add(YGOSharp.CardsManager.Get(item.Value));
...@@ -2318,6 +2319,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -2318,6 +2319,7 @@ public class DeckManager : ServantWithCardDescription
} }
else else
{ {
print(result);
UIHelper.trySetLableText( UIHelper.trySetLableText(
gameObjectSearch, gameObjectSearch,
"title_", "title_",
......
...@@ -45,7 +45,7 @@ BoxCollider: ...@@ -45,7 +45,7 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 210, y: 480, z: 0} m_Size: {x: 210, y: 422, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &11489760 --- !u!114 &11489760
MonoBehaviour: MonoBehaviour:
...@@ -2993,7 +2993,7 @@ MonoBehaviour: ...@@ -2993,7 +2993,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1 keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3} mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0} mFont: {fileID: 0}
mText: "\u8D85\u5148\u884C\u5361" mText: "\u8D44\u6E90\u4E0B\u8F7D"
mFontSize: 30 mFontSize: 30
mFontStyle: 0 mFontStyle: 0
mAlignment: 1 mAlignment: 1
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"com.unity.2d.tilemap": "1.0.0", "com.unity.2d.tilemap": "1.0.0",
"com.unity.analytics": "3.6.12", "com.unity.analytics": "3.6.12",
"com.unity.burst": "1.8.18", "com.unity.burst": "1.8.18",
"com.unity.ide.vscode": "1.2.5", "com.unity.ide.visualstudio": "2.0.23",
"com.unity.postprocessing": "3.4.0", "com.unity.postprocessing": "3.4.0",
"com.unity.test-framework": "1.1.33", "com.unity.test-framework": "1.1.33",
"com.unity.timeline": "1.6.5", "com.unity.timeline": "1.6.5",
......
...@@ -38,11 +38,13 @@ ...@@ -38,11 +38,13 @@
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.ide.vscode": { "com.unity.ide.visualstudio": {
"version": "1.2.5", "version": "2.0.23",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {
"com.unity.test-framework": "1.1.9"
},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.mathematics": { "com.unity.mathematics": {
......
...@@ -19,7 +19,7 @@ MonoBehaviour: ...@@ -19,7 +19,7 @@ MonoBehaviour:
width: 1512 width: 1512
height: 916 height: 916
m_ShowMode: 4 m_ShowMode: 4
m_Title: Hierarchy m_Title: Simulator
m_RootView: {fileID: 2} m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
...@@ -119,7 +119,7 @@ MonoBehaviour: ...@@ -119,7 +119,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200} m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 0 vertical: 0
controlID: 53 controlID: 73
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -144,7 +144,7 @@ MonoBehaviour: ...@@ -144,7 +144,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192} m_MaxSize: {x: 16192, y: 16192}
vertical: 1 vertical: 1
controlID: 54 controlID: 74
--- !u!114 &7 --- !u!114 &7
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -165,11 +165,11 @@ MonoBehaviour: ...@@ -165,11 +165,11 @@ MonoBehaviour:
x: 0 x: 0
y: 0 y: 0
width: 1147 width: 1147
height: 391 height: 462
m_MinSize: {x: 200, y: 100} m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096} m_MaxSize: {x: 16192, y: 8096}
vertical: 0 vertical: 0
controlID: 17 controlID: 75
--- !u!114 &8 --- !u!114 &8
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -188,7 +188,7 @@ MonoBehaviour: ...@@ -188,7 +188,7 @@ MonoBehaviour:
x: 0 x: 0
y: 0 y: 0
width: 282.5 width: 282.5
height: 391 height: 462
m_MinSize: {x: 201, y: 221} m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 13} m_ActualView: {fileID: 13}
...@@ -214,7 +214,7 @@ MonoBehaviour: ...@@ -214,7 +214,7 @@ MonoBehaviour:
x: 282.5 x: 282.5
y: 0 y: 0
width: 864.5 width: 864.5
height: 391 height: 462
m_MinSize: {x: 202, y: 221} m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021} m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
...@@ -239,9 +239,9 @@ MonoBehaviour: ...@@ -239,9 +239,9 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 391 y: 462
width: 1147 width: 1147
height: 475 height: 404
m_MinSize: {x: 231, y: 271} m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021} m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 15} m_ActualView: {fileID: 15}
...@@ -269,8 +269,8 @@ MonoBehaviour: ...@@ -269,8 +269,8 @@ MonoBehaviour:
y: 0 y: 0
width: 365 width: 365
height: 866 height: 866
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 17} m_ActualView: {fileID: 17}
m_Panes: m_Panes:
- {fileID: 17} - {fileID: 17}
...@@ -560,7 +560,7 @@ MonoBehaviour: ...@@ -560,7 +560,7 @@ MonoBehaviour:
m_Position: m_Position:
m_Target: {x: -0.9613698, y: 0.29541966, z: -0.011044071} m_Target: {x: -0.9613698, y: 0.29541966, z: -0.011044071}
speed: 2 speed: 2
m_Value: {x: 74.80919, y: 7.592579, z: -0.95798886} m_Value: {x: -0.9613698, y: 0.29541966, z: -0.011044071}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -613,7 +613,7 @@ MonoBehaviour: ...@@ -613,7 +613,7 @@ MonoBehaviour:
m_Size: m_Size:
m_Target: 1.3784163 m_Target: 1.3784163
speed: 2 speed: 2
m_Value: 308.5191 m_Value: 1.3784163
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -662,7 +662,7 @@ MonoBehaviour: ...@@ -662,7 +662,7 @@ MonoBehaviour:
x: 0 x: 0
y: 96 y: 96
width: 281.5 width: 281.5
height: 370 height: 441
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
...@@ -673,7 +673,7 @@ MonoBehaviour: ...@@ -673,7 +673,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 2c87dfff7e87dfff548bdfff0468e2ffa87ee2ffba7ee2ffde7ee2ff3c80e2ff8e80e2ff5a84e2ff4685eaff7485eaff4e9ceaffdcf7ecffb60eedff2446effffe5cefff7474f2ffe274f2ffe674f2ffb2a1f2ffd6a1f2ff804cf4ffee4cf4fff24cf4ffe279f4ff460df5ffb40df5ffb80df5ffa83af5ff3c2bf6ffaa2bf6ffae2bf6ffc441f6ff7a58f6ff8c58f6ff9e58f6ffce5bf6ffd25bf6ff2c5ff6ff4c5ff6ff9a5ff6ff9e5ff6ff9c60f6ffe002f7fff202f7ff0003f7ff0c03f7ff1a03f7ff4e03f7ff5203f7ff6819f7ff4230f7fff09cf8fff49cf8ffe4c9f8ffb669f9ff246af9ff286af9ff0697f9ff1897f9ff1637faff1a37faff0a64fafffa2bfbfffe2bfbffee58fbff8af7fbff9cf7fbffaaf7fbffb6f7fbffc4f7fbfff8f7fbfffcf7fbffc824fcffec24fcff96e9fcffb0e9fcffe4e9fcffe8e9fcffa216fdffb416fdffc616fdffd816fdffcce5fdfff0e5fdfff4e5fdffe412feff0a95ffff0e95fffffec1ffff06fbffff m_ExpandedIDs: a862e3fffa62e3ffd066e3ff7470e6ffc670e6ff9c74e6ff8e96e7ffe296e7ffba9ae7ff06fbffff
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -721,7 +721,7 @@ MonoBehaviour: ...@@ -721,7 +721,7 @@ MonoBehaviour:
x: 282.5 x: 282.5
y: 96 y: 96
width: 862.5 width: 862.5
height: 370 height: 441
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
...@@ -751,10 +751,10 @@ MonoBehaviour: ...@@ -751,10 +751,10 @@ MonoBehaviour:
- UnityEditor.DeviceSimulation.ApplicationSettingsPlugin - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
pluginStates: pluginStates:
- '{}' - '{}'
scale: 24 scale: 21
fitToScreenEnabled: 0 fitToScreenEnabled: 0
rotationDegree: 270 rotationDegree: 270
highlightSafeAreaEnabled: 1 highlightSafeAreaEnabled: 0
friendlyName: Apple iPhone 13 Pro Max friendlyName: Apple iPhone 13 Pro Max
networkReachability: 1 networkReachability: 1
systemLanguage: 10 systemLanguage: 10
...@@ -780,9 +780,9 @@ MonoBehaviour: ...@@ -780,9 +780,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 487 y: 558
width: 1146 width: 1146
height: 454 height: 383
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
...@@ -813,9 +813,9 @@ MonoBehaviour: ...@@ -813,9 +813,9 @@ MonoBehaviour:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 179} scrollPos: {x: 0, y: 179}
m_SelectedIDs: daae0000 m_SelectedIDs: 0aaf0000
m_LastClickedID: 44762 m_LastClickedID: 44810
m_ExpandedIDs: 0000000078ae00007aae00007cae00007eae000080ae000082ae000084ae00008cae000000ca9a3bffffff7f m_ExpandedIDs: 00000000aaae0000acae0000aeae0000b0ae0000b2ae0000b4ae0000b6ae0000bcae000000ca9a3bffffff7f
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -843,7 +843,7 @@ MonoBehaviour: ...@@ -843,7 +843,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 0000000078ae00007aae00007cae00007eae000080ae000082ae000084ae0000 m_ExpandedIDs: 00000000aaae0000acae0000aeae0000b0ae0000b2ae0000b4ae0000b6ae0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment