From 353319502b03db708c692a22be0c4e4b7cb1e75a Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 06 六月 2025 16:15:46 +0800
Subject: [PATCH] 18 子 2D卡牌客户端搭建 / 2D卡牌客户端搭建
---
Assets/Resources/Prefabs/ClickEmptyCloseMask.prefab | 2
Assets/Resources/Prefabs/ScreenMask.prefab | 2
Assets/Editor/Tool/InGameDownTestWindow.cs | 4
Assets/Launch/Config/AssetSource.cs | 258 ---------------------------------------------------
4 files changed, 4 insertions(+), 262 deletions(-)
diff --git a/Assets/Editor/Tool/InGameDownTestWindow.cs b/Assets/Editor/Tool/InGameDownTestWindow.cs
index 2816de1..8aa9169 100644
--- a/Assets/Editor/Tool/InGameDownTestWindow.cs
+++ b/Assets/Editor/Tool/InGameDownTestWindow.cs
@@ -25,14 +25,10 @@
if (InGameDownTestUtility.enable)
{
VersionConfig.Get().assetAccess = InstalledAsset.NullAsset;
- AssetSource.allFromEditor = false;
- AssetSource.builtInFromEditor = true;
- AssetSource.shaderFromEditor = true;
}
else
{
VersionConfig.Get().assetAccess = InstalledAsset.IngoreDownLoad;
- AssetSource.allFromEditor = true;
}
}
diff --git a/Assets/Launch/Config/AssetSource.cs b/Assets/Launch/Config/AssetSource.cs
index 0bec777..e87a647 100644
--- a/Assets/Launch/Config/AssetSource.cs
+++ b/Assets/Launch/Config/AssetSource.cs
@@ -5,268 +5,14 @@
public class AssetSource
{
-
- public static bool allFromEditor
- {
- get
- {
- return audioFromEditor
- && videoFromEditor
- && effectFromEditor
- && mobFromEditor
- && refdataFromEditor
- && sceneFromEditor
- && shaderFromEditor
- && uiFromEditor
- && builtInFromEditor
- && patchFromEditor
- && logicFromEditor;
- }
- set
- {
- audioFromEditor = value;
- videoFromEditor = value;
- effectFromEditor = value;
- mobFromEditor = value;
- refdataFromEditor = value;
- shaderFromEditor = value;
- sceneFromEditor = value;
- uiFromEditor = value;
- builtInFromEditor = value;
- patchFromEditor = value;
- logicFromEditor = value;
- }
- }
-
- static bool m_AudioFromEditor = false;
- public static bool audioFromEditor
+ public static bool isUseAssetBundle
{
get
{
#if UNITY_EDITOR
- return LocalSave.GetBool("Asset_AudioFromEditor", true);
-#else
return false;
-#endif
- }
- set
- {
-#if UNITY_EDITOR
- LocalSave.SetBool("Asset_AudioFromEditor", value);
#else
- m_AudioFromEditor=value;
-#endif
- }
- }
-
- static bool m_VideoFromEditor = false;
- public static bool videoFromEditor
- {
- get
- {
-#if UNITY_EDITOR
- return LocalSave.GetBool("Asset_VideoFromEditor", true);
-#else
- return false;
-#endif
- }
- set
- {
-#if UNITY_EDITOR
- LocalSave.SetBool("Asset_VideoFromEditor", value);
-#else
- m_VideoFromEditor=value;
-#endif
- }
- }
-
- static bool m_EffectFromEditor = false;
- public static bool effectFromEditor
- {
- get
- {
-#if UNITY_EDITOR
- return LocalSave.GetBool("Asset_EffectFromEditor", true);
-#else
- return false;
-#endif
- }
- set
- {
-#if UNITY_EDITOR
- LocalSave.SetBool("Asset_EffectFromEditor", value);
-#else
- m_AudioFromEditor=value;
-#endif
- }
- }
-
- static bool m_MobFromEditor = false;
- public static bool mobFromEditor
- {
- get
- {
-#if UNITY_EDITOR
- return LocalSave.GetBool("Asset_MobFromEditor", true);
-#else
- return false;
-#endif
- }
- set
- {
-#if UNITY_EDITOR
- LocalSave.SetBool("Asset_MobFromEditor", value);
-#else
- m_MobFromEditor=value;
-#endif
- }
- }
-
- static bool m_RefdataFromEditor = false;
- public static bool refdataFromEditor
- {
- get
- {
-#if UNITY_EDITOR
- return LocalSave.GetBool("Asset_RefdataFromEditor", true);
-#else
- return false;
-#endif
- }
- set
- {
-#if UNITY_EDITOR
- LocalSave.SetBool("Asset_RefdataFromEditor", value);
-#else
- m_RefdataFromEditor=value;
-#endif
- }
- }
-
- static bool m_SceneFromEditor = false;
- public static bool sceneFromEditor
- {
- get
- {
-#if UNITY_EDITOR
- return LocalSave.GetBool("Asset_SceneFromEditor", true);
-#else
- return false;
-#endif
- }
- set
- {
-#if UNITY_EDITOR
- LocalSave.SetBool("Asset_SceneFromEditor", value);
-#else
- m_SceneFromEditor=value;
-#endif
- }
- }
-
- static bool m_ShaderFromEditor = false;
- public static bool shaderFromEditor
- {
- get
- {
-#if UNITY_EDITOR
- return LocalSave.GetBool("Asset_ShaderFromEditor", true);
-#else
- return false;
-#endif
- }
- set
- {
-#if UNITY_EDITOR
- LocalSave.SetBool("Asset_ShaderFromEditor", value);
-#else
- m_ShaderFromEditor=value;
-#endif
- }
- }
-
- static bool m_UIFromEditor = false;
- public static bool uiFromEditor
- {
- get
- {
-#if UNITY_EDITOR
- return LocalSave.GetBool("Asset_UIFromEditor", true);
-#else
- return false;
-#endif
- }
- set
- {
-#if UNITY_EDITOR
- LocalSave.SetBool("Asset_UIFromEditor", value);
-#else
- m_UIFromEditor=value;
-#endif
- }
- }
-
- static bool m_BuiltInFromEditor = false;
- public static bool builtInFromEditor
- {
- get
- {
-#if UNITY_EDITOR
- return LocalSave.GetBool("Asset_BuiltInFromEditor", true);
-#else
- return false;
-#endif
- }
- set
- {
-#if UNITY_EDITOR
- LocalSave.SetBool("Asset_BuiltInFromEditor", value);
-#else
- m_BuiltInFromEditor=value;
-#endif
- }
- }
-
-
- static bool m_patchFromEditor = false;
- public static bool patchFromEditor
- {
- get
- {
-#if UNITY_EDITOR
- return LocalSave.GetBool("Asset_PatchFromEditor", true);
-#else
- return false;
-#endif
- }
- set
- {
-#if UNITY_EDITOR
- LocalSave.SetBool("Asset_PatchFromEditor", value);
-#else
- m_patchFromEditor=value;
-#endif
- }
- }
-
-
- static bool m_logicFromEditor = false;
- public static bool logicFromEditor
- {
- get
- {
-#if UNITY_EDITOR
- return LocalSave.GetBool("Asset_LogicFromEditor", true);
-#else
- return false;
-#endif
- }
- set
- {
-#if UNITY_EDITOR
- LocalSave.SetBool("Asset_LogicFromEditor", value);
-#else
- m_logicFromEditor=value;
+ return true;
#endif
}
}
diff --git a/Assets/Resources/Prefabs/ClickEmptyCloseMask.prefab b/Assets/Resources/Prefabs/ClickEmptyCloseMask.prefab
index 06375dc..396ef3c 100644
--- a/Assets/Resources/Prefabs/ClickEmptyCloseMask.prefab
+++ b/Assets/Resources/Prefabs/ClickEmptyCloseMask.prefab
@@ -36,7 +36,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 1500, y: 2668}
+ m_SizeDelta: {x: 15000, y: 26680}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4732318971056992194
CanvasRenderer:
diff --git a/Assets/Resources/Prefabs/ScreenMask.prefab b/Assets/Resources/Prefabs/ScreenMask.prefab
index 83237ec..3af57f7 100644
--- a/Assets/Resources/Prefabs/ScreenMask.prefab
+++ b/Assets/Resources/Prefabs/ScreenMask.prefab
@@ -35,7 +35,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 1500, y: 2668}
+ m_SizeDelta: {x: 15000, y: 26680}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5139521211198942054
CanvasRenderer:
--
Gitblit v1.8.0