Commit 1bbca3b6 authored by SherryChaos's avatar SherryChaos

bug fix

parent 1898ec0c
...@@ -64,5 +64,4 @@ Data/ur.ydk ...@@ -64,5 +64,4 @@ Data/ur.ydk
Data/lflist_genesys.conf Data/lflist_genesys.conf
Data/mycard_apps.json Data/mycard_apps.json
Data/Rarity.json Data/Rarity.json
Data/Rarity.json
Data/Rarity.json
This diff is collapsed.
fileFormatVersion: 2
guid: 0561962018385bd47997e24edced69ed
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
...@@ -36,21 +36,21 @@ MonoBehaviour: ...@@ -36,21 +36,21 @@ MonoBehaviour:
- rid: 5650211206403981510 - rid: 5650211206403981510
- rid: 5650211206403981511 - rid: 5650211206403981511
- rid: 5650211206403981512 - rid: 5650211206403981512
- rid: 911170927773352057 - rid: 260124733147185273
- rid: 5650211206403981514 - rid: 5650211206403981514
- rid: 5650211206403981515 - rid: 5650211206403981515
- rid: 911170927773352058 - rid: 260124733147185274
- rid: 911170927773352059 - rid: 260124733147185275
- rid: 5650211206403981518 - rid: 5650211206403981518
- rid: 911170927773352060 - rid: 260124733147185276
- rid: 5650211206403981520 - rid: 5650211206403981520
- rid: 911170927773352061 - rid: 260124733147185277
- rid: 911170927773352062 - rid: 260124733147185278
- rid: 911170927773352063 - rid: 260124733147185279
- rid: 911170927773352064 - rid: 260124733147185280
- rid: 911170927773352065 - rid: 260124733147185281
- rid: 911170927773352066 - rid: 260124733147185282
- rid: 911170927773352067 - rid: 260124733147185283
- rid: 5650211206403981528 - rid: 5650211206403981528
- rid: 5650211206403981529 - rid: 5650211206403981529
- rid: 5650211206403981530 - rid: 5650211206403981530
...@@ -96,7 +96,7 @@ MonoBehaviour: ...@@ -96,7 +96,7 @@ MonoBehaviour:
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
- rid: 911170927773352057 - rid: 260124733147185273
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_Version: 0 m_Version: 0
...@@ -111,14 +111,14 @@ MonoBehaviour: ...@@ -111,14 +111,14 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 911170927773352058 - rid: 260124733147185274
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_Version: 0 m_Version: 0
m_StripUnusedPostProcessingVariants: 0 m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1 m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1 m_StripScreenCoordOverrideVariants: 1
- rid: 911170927773352059 - rid: 260124733147185275
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
...@@ -126,7 +126,7 @@ MonoBehaviour: ...@@ -126,7 +126,7 @@ MonoBehaviour:
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
- rid: 911170927773352060 - rid: 260124733147185276
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
...@@ -138,7 +138,7 @@ MonoBehaviour: ...@@ -138,7 +138,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 911170927773352061 - rid: 260124733147185277
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data: data:
m_Version: 0 m_Version: 0
...@@ -151,13 +151,13 @@ MonoBehaviour: ...@@ -151,13 +151,13 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 911170927773352062 - rid: 260124733147185278
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
- rid: 911170927773352063 - rid: 260124733147185279
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
...@@ -170,12 +170,12 @@ MonoBehaviour: ...@@ -170,12 +170,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 911170927773352064 - rid: 260124733147185280
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0 m_ProbeVolumeDisableStreamingAssets: 0
- rid: 911170927773352065 - rid: 260124733147185281
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
...@@ -185,14 +185,14 @@ MonoBehaviour: ...@@ -185,14 +185,14 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 911170927773352066 - rid: 260124733147185282
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_version: 0 m_version: 0
m_IncludeReferencedInScenes: 0 m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0 m_IncludeAssetsByLabel: 0
m_LabelToInclude: m_LabelToInclude:
- rid: 911170927773352067 - rid: 260124733147185283
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
......
...@@ -536,8 +536,8 @@ MonoBehaviour: ...@@ -536,8 +536,8 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
text: {fileID: 1398959084} text: {fileID: 1398959084}
input: {fileID: 1775272994} input: {fileID: 1775272994}
mode_Window: 1 mode_Window: 0
mode_Android: 0 mode_Android: 1
mode_IOS: 0 mode_IOS: 0
fullCopy: 0 fullCopy: 0
--- !u!114 &916768208 --- !u!114 &916768208
......
...@@ -26,7 +26,7 @@ namespace MDPro3 ...@@ -26,7 +26,7 @@ namespace MDPro3
public const string SMALL_SLASH = " / "; public const string SMALL_SLASH = " / ";
private static readonly float cardNameLabelWidthOCG = 520f; private static readonly float cardNameLabelWidthOCG = 520f;
private static readonly float cardNameLabelWidthRushDuel = 520f; private static readonly float cardNameLabelWidthRushDuel = 520f;
private static string currentFontLanguage; private string currentFontLanguage;
private static bool fontsLoaded; private static bool fontsLoaded;
private static int prefabIndex = 0; private static int prefabIndex = 0;
......
...@@ -60,16 +60,23 @@ namespace MDPro3 ...@@ -60,16 +60,23 @@ namespace MDPro3
{ {
base.Initialize(); base.Initialize();
currentWallpaper = Config.Get("Wallpaper", Program.items.wallpapers[0].id.ToString()); handlers = new List<UIHandler>()
ChangeWallpaper(currentWallpaper); {
InitializeLanguage();
handlers = new List<UIHandler>()
{
fps, fps,
}; };
foreach (UIHandler handler in handlers) foreach (UIHandler handler in handlers)
handler.Initialize(); handler.Initialize();
try
{
currentWallpaper = Config.Get("Wallpaper", Program.items.wallpapers[0].id.ToString());
ChangeWallpaper(currentWallpaper);
InitializeLanguage();
}
catch (Exception e)
{
UnityEngine.Debug.LogError($"UIManager Initialize Error: {e}");
}
} }
public override void PerFrameFunction() public override void PerFrameFunction()
......
{
"ShineCards": [
29587993
],
"RoyalCards": [],
"GoldCards": [],
"MillenniumCards": [],
"BookCards": [
84211599
]
}
\ No newline at end of file
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