diff --git a/Assets/AddressableAssetsData.meta b/Assets/AddressableAssetsData.meta new file mode 100644 index 0000000..8f3a53f --- /dev/null +++ b/Assets/AddressableAssetsData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d26d1f9b3a31179428bafb83ec16761d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset b/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset new file mode 100644 index 0000000..fb6f7fb --- /dev/null +++ b/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dea69d41f90c6ea4fa55c27c1d60c145, type: 3} + m_Name: AddressableAssetGroupSortSettings + m_EditorClassIdentifier: + sortOrder: + - 965ebc3298ffc3f429a28032069aceb5 diff --git a/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta b/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta new file mode 100644 index 0000000..281bbbe --- /dev/null +++ b/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a7aec4c25e19ae747abf31b333a3cbf8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset new file mode 100644 index 0000000..619ce53 --- /dev/null +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -0,0 +1,114 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3} + m_Name: AddressableAssetSettings + m_EditorClassIdentifier: + m_DefaultGroup: 965ebc3298ffc3f429a28032069aceb5 + m_currentHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_OptimizeCatalogSize: 0 + m_BuildRemoteCatalog: 0 + m_CatalogRequestsTimeout: 0 + m_DisableCatalogUpdateOnStart: 0 + m_InternalIdNamingMode: 0 + m_InternalBundleIdMode: 1 + m_AssetLoadMode: 0 + m_BundledAssetProviderType: + m_AssemblyName: + m_ClassName: + m_AssetBundleProviderType: + m_AssemblyName: + m_ClassName: + m_IgnoreUnsupportedFilesInBuild: 0 + m_UniqueBundleIds: 0 + m_EnableJsonCatalog: 0 + m_NonRecursiveBuilding: 1 + m_CCDEnabled: 0 + m_maxConcurrentWebRequests: 3 + m_UseUWRForLocalBundles: 0 + m_BundleTimeout: 0 + m_BundleRetryCount: 0 + m_BundleRedirectLimit: -1 + m_SharedBundleSettings: 0 + m_SharedBundleSettingsCustomGroupIndex: 0 + m_ContiguousBundles: 1 + m_StripUnityVersionFromBundleBuild: 0 + m_DisableVisibleSubAssetRepresentations: 0 + m_BuiltInBundleNaming: 0 + mBuiltInBundleCustomNaming: + m_MonoScriptBundleNaming: 0 + m_CheckForContentUpdateRestrictionsOption: 0 + m_MonoScriptBundleCustomNaming: + m_RemoteCatalogBuildPath: + m_Id: + m_RemoteCatalogLoadPath: + m_Id: + m_ContentStateBuildPathProfileVariableName: + m_CustomContentStateBuildPath: + m_ContentStateBuildPath: + m_BuildAddressablesWithPlayerBuild: 0 + m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]' + m_GroupAssets: + - {fileID: 11400000, guid: 0e74dc46cc6e0bf4385cf5b16882a635, type: 2} + m_BuildSettings: + m_LogResourceManagerExceptions: 1 + m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles + m_ProfileSettings: + m_Profiles: + - m_InheritedParent: + m_Id: 43a1d4c15ff89f64db7ca5d54a7740a0 + m_ProfileName: Default + m_Values: + - m_Id: 37237f17e90480f4f944d27ebb7ece5e + m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]' + - m_Id: 48ffbe450dc00b449a8b2f67909adec2 + m_Value: + - m_Id: 7193369b8d979cc49a105ac90610bf17 + m_Value: 'ServerData/[BuildTarget]' + - m_Id: 89b209e9411c45a4d92b3c3b895b6082 + m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' + - m_Id: a20da08f546e034428de1148a61f7c7f + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + m_ProfileEntryNames: + - m_Id: 37237f17e90480f4f944d27ebb7ece5e + m_Name: BuildTarget + m_InlineUsage: 0 + - m_Id: 48ffbe450dc00b449a8b2f67909adec2 + m_Name: Remote.LoadPath + m_InlineUsage: 0 + - m_Id: 7193369b8d979cc49a105ac90610bf17 + m_Name: Remote.BuildPath + m_InlineUsage: 0 + - m_Id: 89b209e9411c45a4d92b3c3b895b6082 + m_Name: Local.LoadPath + m_InlineUsage: 0 + - m_Id: a20da08f546e034428de1148a61f7c7f + m_Name: Local.BuildPath + m_InlineUsage: 0 + m_ProfileVersion: 1 + m_LabelTable: + m_LabelNames: + - default + m_SchemaTemplates: [] + m_GroupTemplateObjects: + - {fileID: 11400000, guid: 1007bc24fc5c5ff4d8247d9df3806386, type: 2} + m_InitializationObjects: [] + m_CertificateHandlerType: + m_AssemblyName: + m_ClassName: + m_ActivePlayerDataBuilderIndex: 2 + m_DataBuilders: + - {fileID: 11400000, guid: a391d50e6029248458d7b51f1374a327, type: 2} + - {fileID: 11400000, guid: 8e838f30a0f62584b96220f2a7f225c0, type: 2} + - {fileID: 11400000, guid: 9321b9bad68ef3448ac009a0e3ffa182, type: 2} + m_ActiveProfileId: 43a1d4c15ff89f64db7ca5d54a7740a0 diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta b/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta new file mode 100644 index 0000000..253afdb --- /dev/null +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a2b1186de4aee1c42bc7b90913f7e65c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroupTemplates.meta b/Assets/AddressableAssetsData/AssetGroupTemplates.meta new file mode 100644 index 0000000..f1784f3 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroupTemplates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac6f8d38eeb58b240938b2255a168834 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset new file mode 100644 index 0000000..df205f1 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1969363735907359319 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: BundledAssetGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 0} + m_InternalBundleIdMode: 1 + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_CacheClearBehavior: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: + m_ClassName: + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_UseUWRForLocalBundles: 0 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: + m_LoadPath: + m_Id: + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: + m_ClassName: + m_UseDefaultSchemaSettings: 0 + m_SelectedPathPairIndex: 0 + m_BundleNaming: 0 + m_AssetLoadMode: 0 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a3c5d64ac83548c09dd1678b9f6f1cd, type: 3} + m_Name: Packed Assets + m_EditorClassIdentifier: + m_SchemaObjects: + - {fileID: -1969363735907359319} + - {fileID: 8744645897562862699} + m_Description: Pack assets into asset bundles. + m_Settings: {fileID: 11400000, guid: a2b1186de4aee1c42bc7b90913f7e65c, type: 2} +--- !u!114 &8744645897562862699 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 0} + m_StaticContent: 0 diff --git a/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta new file mode 100644 index 0000000..cdc6fb4 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1007bc24fc5c5ff4d8247d9df3806386 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups.meta b/Assets/AddressableAssetsData/AssetGroups.meta new file mode 100644 index 0000000..065bcb7 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70e4bdfd844a16a4a85b03f499ed7302 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset new file mode 100644 index 0000000..9173f5b --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -0,0 +1,29 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} + m_Name: Default Local Group + m_EditorClassIdentifier: + m_GroupName: Default Local Group + m_GUID: 965ebc3298ffc3f429a28032069aceb5 + m_SerializeEntries: + - m_GUID: 16399126d2ef20743b22b6b1df02cd06 + m_Address: Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2 + m_ReadOnly: 0 + m_SerializedLabels: + - default + FlaggedDuringContentUpdateRestriction: 0 + m_ReadOnly: 0 + m_Settings: {fileID: 11400000, guid: a2b1186de4aee1c42bc7b90913f7e65c, type: 2} + m_SchemaSet: + m_Schemas: + - {fileID: 11400000, guid: 9f848ba8ca92f3341865e70cf1e07825, type: 2} + - {fileID: 11400000, guid: d724cb75712c79a4e80fd10d2e21bd44, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta new file mode 100644 index 0000000..0851e68 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e74dc46cc6e0bf4385cf5b16882a635 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas.meta new file mode 100644 index 0000000..6d64fa1 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 894f63b6cf55c3e48ae73e140595362e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset new file mode 100644 index 0000000..7687f72 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: Default Local Group_BundledAssetGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 0e74dc46cc6e0bf4385cf5b16882a635, type: 2} + m_InternalBundleIdMode: 1 + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_CacheClearBehavior: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_UseUWRForLocalBundles: 0 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: a20da08f546e034428de1148a61f7c7f + m_LoadPath: + m_Id: 89b209e9411c45a4d92b3c3b895b6082 + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider + m_UseDefaultSchemaSettings: 0 + m_SelectedPathPairIndex: 0 + m_BundleNaming: 0 + m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta new file mode 100644 index 0000000..c160ad6 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f848ba8ca92f3341865e70cf1e07825 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset new file mode 100644 index 0000000..333acd5 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: Default Local Group_ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 0e74dc46cc6e0bf4385cf5b16882a635, type: 2} + m_StaticContent: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 0000000..38a6482 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d724cb75712c79a4e80fd10d2e21bd44 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/DataBuilders.meta b/Assets/AddressableAssetsData/DataBuilders.meta new file mode 100644 index 0000000..32b0e68 --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cae3ccf215ad49c409713432c5cb6d42 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset b/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset new file mode 100644 index 0000000..50d30dc --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88d21199f5d473f4db36845f2318f180, type: 3} + m_Name: BuildScriptFastMode + m_EditorClassIdentifier: + instanceProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider + sceneProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider diff --git a/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta b/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta new file mode 100644 index 0000000..12f12dc --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a391d50e6029248458d7b51f1374a327 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset new file mode 100644 index 0000000..ec875f9 --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e2e0ffa088c91d41a086d0b8cb16bdc, type: 3} + m_Name: BuildScriptPackedMode + m_EditorClassIdentifier: + instanceProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider + sceneProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider diff --git a/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta new file mode 100644 index 0000000..21ed249 --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9321b9bad68ef3448ac009a0e3ffa182 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset new file mode 100644 index 0000000..7628845 --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ad8c280d42ee0ed41a27db23b43dd2bf, type: 3} + m_Name: BuildScriptPackedPlayMode + m_EditorClassIdentifier: + instanceProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider + sceneProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider diff --git a/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta new file mode 100644 index 0000000..ee8f4bc --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e838f30a0f62584b96220f2a7f225c0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/DefaultObject.asset b/Assets/AddressableAssetsData/DefaultObject.asset new file mode 100644 index 0000000..13b0c5d --- /dev/null +++ b/Assets/AddressableAssetsData/DefaultObject.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a189bb168d8d90478a09ea08c2f3d72, type: 3} + m_Name: DefaultObject + m_EditorClassIdentifier: + m_AddressableAssetSettingsGuid: a2b1186de4aee1c42bc7b90913f7e65c diff --git a/Assets/AddressableAssetsData/DefaultObject.asset.meta b/Assets/AddressableAssetsData/DefaultObject.asset.meta new file mode 100644 index 0000000..d85b56c --- /dev/null +++ b/Assets/AddressableAssetsData/DefaultObject.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9a4f106b1ccd3541acd1c6dc5e7d5be +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr.meta b/Assets/Res_Addr.meta new file mode 100644 index 0000000..7e307d7 --- /dev/null +++ b/Assets/Res_Addr.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc70791a69872a445a5deaccef7c5ca6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/MainUI.meta b/Assets/Res_Addr/MainUI.meta new file mode 100644 index 0000000..1f3f50b --- /dev/null +++ b/Assets/Res_Addr/MainUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64118c8bafb4dfc4d94c918da74be5f0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UIAtlas.spriteatlasv2 b/Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2 similarity index 100% rename from Assets/ResWork/UIAtlas.spriteatlasv2 rename to Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2 diff --git a/Assets/ResWork/UIAtlas.spriteatlasv2.meta b/Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2.meta similarity index 100% rename from Assets/ResWork/UIAtlas.spriteatlasv2.meta rename to Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2.meta diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index e5f44be..eefb458 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1248,7 +1248,11 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 500962023} - - component: {fileID: 500962022} + - component: {fileID: 500962028} + - component: {fileID: 500962027} + - component: {fileID: 500962026} + - component: {fileID: 500962025} + - component: {fileID: 500962024} m_Layer: 0 m_Name: Infos m_TagString: Untagged @@ -1256,18 +1260,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &500962022 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 500962021} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 900b18ab0d6b6a64aa829affd89f3f9c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &500962023 Transform: m_ObjectHideFlags: 0 @@ -1283,6 +1275,66 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &500962024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500962021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 196437a4573343c43bbc23fa4278d230, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &500962025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500962021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48bae15569ee35d4aa3e950837ccebbe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &500962026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500962021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 900b18ab0d6b6a64aa829affd89f3f9c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &500962027 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500962021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f705761e0b8a8a48a7028091dc095da, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &500962028 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500962021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b45835c6b26cd7b4fa7d0e5edfbe0c4f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -1920,6 +1972,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 892977661} m_CullTransparentMesh: 1 +--- !u!1 &989474287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 989474288} + - component: {fileID: 989474290} + - component: {fileID: 989474289} + m_Layer: 5 + m_Name: t_ver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &989474288 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 989474287} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1416760061} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -148, y: -64} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &989474289 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 989474287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 0.0.0(E) + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} + m_sharedMaterial: {fileID: -3574565475228871172, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 20 + m_fontSizeMax: 80 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &989474290 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 989474287} + m_CullTransparentMesh: 1 --- !u!1 &1035601636 GameObject: m_ObjectHideFlags: 0 @@ -2850,13 +3038,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1416760061} + - component: {fileID: 1416760062} m_Layer: 5 m_Name: TitleUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1416760061 RectTransform: m_ObjectHideFlags: 0 @@ -2872,6 +3061,7 @@ RectTransform: - {fileID: 1644731138} - {fileID: 272342317} - {fileID: 1178730385} + - {fileID: 989474288} m_Father: {fileID: 456601672} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2879,6 +3069,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1416760062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416760060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c6d64701142b344eb1c16d3f22b7a69, type: 3} + m_Name: + m_EditorClassIdentifier: + label_version: {fileID: 0} + label_msg: {fileID: 1178730386} + t_ver: {fileID: 989474289} --- !u!1 &1483615883 GameObject: m_ObjectHideFlags: 0 @@ -3251,9 +3456,9 @@ RectTransform: m_Father: {fileID: 1416760061} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200.00647, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1644731139 MonoBehaviour: @@ -3608,7 +3813,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1703079398 RectTransform: m_ObjectHideFlags: 0 @@ -3997,9 +4202,9 @@ RectTransform: m_Father: {fileID: 1703079398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 200.00647, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1896809010 MonoBehaviour: diff --git a/Assets/Scripts/Info.meta b/Assets/Scripts/AttachToGameObject.meta similarity index 100% rename from Assets/Scripts/Info.meta rename to Assets/Scripts/AttachToGameObject.meta diff --git a/Assets/Scripts/AttachToGameObject/AddrResourceMgr.cs b/Assets/Scripts/AttachToGameObject/AddrResourceMgr.cs new file mode 100644 index 0000000..27f06f4 --- /dev/null +++ b/Assets/Scripts/AttachToGameObject/AddrResourceMgr.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections; +using UnityEngine; +using UnityEngine.AddressableAssets; +using UnityEngine.ResourceManagement.AsyncOperations; + +public class AddrResourceMgr : MonoBehaviourSingletonTemplate +{ + // Start is called before the first frame update + void Start() + { + DontDestroy(); + } + + public void LoadObject(string path, Action> onCompleted) + { + // Addressables에서 비동기 로드 + AsyncOperationHandle handle = Addressables.LoadAssetAsync($"Assets/Res_Addr/{path}"); + + // 로딩 완료 시 호출될 콜백 + handle.Completed += onCompleted; + } + //public void Set_AddressableReleaseSelf(GameObject go) + //{ + // if (DSUtil.CheckNull(go.GetComponent())) + // go.AddComponent(); + //} + + public IEnumerator LoadObjectSequential(string path, Action onLoaded) + { + // 로드 요청 + AsyncOperationHandle handle = Addressables.LoadAssetAsync($"Assets/Res_Addr/{path}"); + + // 완료될 때까지 대기 + yield return handle; + + // 결과 전달 + if (handle.Status == AsyncOperationStatus.Succeeded) + { + onLoaded?.Invoke(handle.Result); + } + else + { + Debug.LogError($"Failed to load: {path}"); + } + + // 필요하다면 해제는 여기서 + // Addressables.Release(handle); + } +} \ No newline at end of file diff --git a/Assets/Scripts/AttachToGameObject/AddrResourceMgr.cs.meta b/Assets/Scripts/AttachToGameObject/AddrResourceMgr.cs.meta new file mode 100644 index 0000000..46dc865 --- /dev/null +++ b/Assets/Scripts/AttachToGameObject/AddrResourceMgr.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b45835c6b26cd7b4fa7d0e5edfbe0c4f \ No newline at end of file diff --git a/Assets/Scripts/AttachToGameObject/ErrorLogHookManager.cs b/Assets/Scripts/AttachToGameObject/ErrorLogHookManager.cs new file mode 100644 index 0000000..04cabd3 --- /dev/null +++ b/Assets/Scripts/AttachToGameObject/ErrorLogHookManager.cs @@ -0,0 +1,54 @@ +using UnityEngine; + +public class ErrorLogHookManager : MonoBehaviour +{ + [RuntimeInitializeOnLoadMethod] + static void OnRuntimeMethodLoad() + { + new GameObject("ErrorLogHookManager").AddComponent(); + } + + private void Awake() + { + DontDestroyOnLoad(gameObject); + } + + private void OnEnable() + { + Application.logMessageReceived += HandleLog; + } + + private void OnDisable() + { + Application.logMessageReceived -= HandleLog; + } + + void HandleLog(string logString, string stackTrace, LogType type) + { +#if !FGB_LIVE + switch (type) + { +#if !UNITY_EDITOR + default: Debug.Log(logString); break; +#endif + case LogType.Error: + case LogType.Exception: + Debug.LogError(logString); + break; + } +#endif + } +} + +public partial class SROptions +{ +#if UNITY_EDITOR + public int ID { get; set; } + double _amount = 1000; + public double Amount { get { return _amount; } set { _amount = value; } } + public void Add_Item() + { + //ServerInfo.Ins.Save_CheatItem(ID, Amount, () => { ServerInfo.Ins.m_ServerData.Add_Item(ID, Amount); }); + } +#endif +} \ No newline at end of file diff --git a/Assets/Scripts/AttachToGameObject/ErrorLogHookManager.cs.meta b/Assets/Scripts/AttachToGameObject/ErrorLogHookManager.cs.meta new file mode 100644 index 0000000..ec0074d --- /dev/null +++ b/Assets/Scripts/AttachToGameObject/ErrorLogHookManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7f705761e0b8a8a48a7028091dc095da \ No newline at end of file diff --git a/Assets/Scripts/Info/InternetTime.cs b/Assets/Scripts/AttachToGameObject/InternetTime.cs similarity index 100% rename from Assets/Scripts/Info/InternetTime.cs rename to Assets/Scripts/AttachToGameObject/InternetTime.cs diff --git a/Assets/Scripts/Info/InternetTime.cs.meta b/Assets/Scripts/AttachToGameObject/InternetTime.cs.meta similarity index 100% rename from Assets/Scripts/Info/InternetTime.cs.meta rename to Assets/Scripts/AttachToGameObject/InternetTime.cs.meta diff --git a/Assets/Scripts/Info/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs similarity index 100% rename from Assets/Scripts/Info/SaveMgr.cs rename to Assets/Scripts/AttachToGameObject/SaveMgr.cs diff --git a/Assets/Scripts/Info/SaveMgr.cs.meta b/Assets/Scripts/AttachToGameObject/SaveMgr.cs.meta similarity index 100% rename from Assets/Scripts/Info/SaveMgr.cs.meta rename to Assets/Scripts/AttachToGameObject/SaveMgr.cs.meta diff --git a/Assets/Scripts/AttachToGameObject/UIAtlasMgr.cs b/Assets/Scripts/AttachToGameObject/UIAtlasMgr.cs new file mode 100644 index 0000000..38b748c --- /dev/null +++ b/Assets/Scripts/AttachToGameObject/UIAtlasMgr.cs @@ -0,0 +1,20 @@ +using UnityEngine; +using UnityEngine.U2D; + +public class UIAtlasMgr : MonoBehaviourSingletonTemplate +{ + SpriteAtlas UIAtlas; + + public void Set(SpriteAtlas sa) + { + UIAtlas = sa; + } + + public Sprite Get_Sprite(int itemid) + { + //var itemData = table_itemlist.Ins.Get_Data(itemid); + //return UIAtlas.GetSprite(DSUtil.CheckNull(itemData) ? "" : itemData.s_ItemIcon); + return null; + } + public Sprite Get_Sprite(string _name) { return UIAtlas.GetSprite(_name); } +} \ No newline at end of file diff --git a/Assets/Scripts/AttachToGameObject/UIAtlasMgr.cs.meta b/Assets/Scripts/AttachToGameObject/UIAtlasMgr.cs.meta new file mode 100644 index 0000000..6182cf3 --- /dev/null +++ b/Assets/Scripts/AttachToGameObject/UIAtlasMgr.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 196437a4573343c43bbc23fa4278d230 \ No newline at end of file diff --git a/Assets/Scripts/Title.meta b/Assets/Scripts/Title.meta new file mode 100644 index 0000000..94cf1d1 --- /dev/null +++ b/Assets/Scripts/Title.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f7ed75bbe07e7df43a940d2b0068794e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Title/TitleInfo.cs b/Assets/Scripts/Title/TitleInfo.cs new file mode 100644 index 0000000..3fbb60e --- /dev/null +++ b/Assets/Scripts/Title/TitleInfo.cs @@ -0,0 +1,71 @@ +//using Firebase.Auth; +//using Google; +using System.Collections; +using TMPro; +using UnityEngine; +using UnityEngine.U2D; + +#if UNITY_ANDROID +using UnityEngine.Android; +#endif + +public class TitleInfo : MyCoroutine +{ + public TextMeshProUGUI label_msg, t_ver; + + IEnumerator Start() + { + t_ver.text = DSUtil.Format("{0}({1})", Application.version, "E or G or O"); + label_msg.text = ""; + + // TODO 정인호 : 테이블 로드 + //// 테이블 로딩 기다리기 + //while (!TableChecker.Ins.CheckAllLoad()) yield return null; + //label_msg.text = table_localtext.Ins.Get_Text(1); + // UI 아틀라스 로드 + yield return AddrResourceMgr.Ins.LoadObjectSequential("MainUI/UIAtlas.spriteatlasv2", atlas => { UIAtlasMgr.Ins.Set(atlas); }); + + yield return null; + + //#if FGB_LIVE + // SRDebug.Instance.IsTriggerEnabled = false; + //#else + // SRDebug.Instance.IsTriggerEnabled = true; + //#endif + +#if !UNITY_EDITOR && UNITY_ANDROID && !FGB_OneStore + if (!Application.version.Equals("9.9.9")) + if (Application.installerName != "com.android.vending") + { + Popup.Ins.Set(ePopupType.One, 2, + () => { Application.OpenURL("market://details?id=" + Application.identifier); DSUtil.Quit(); }, + () => { Application.OpenURL("market://details?id=" + Application.identifier); DSUtil.Quit(); }); + yield break; + } +#endif +#if UNITY_ANDROID + if (!Permission.HasUserAuthorizedPermission("android.permission.POST_NOTIFICATIONS")) + Permission.RequestUserPermission("android.permission.POST_NOTIFICATIONS"); +#endif +#if !UNITY_EDITOR + // 파이어 베이스 초기화 + Firebase.FirebaseApp.CheckAndFixDependenciesAsync().ContinueWith(task => { + var dependencyStatus = task.Result; + if (dependencyStatus == Firebase.DependencyStatus.Available) + { + //FirebaseAnalytics.SetAnalyticsCollectionEnabled(true); + } + else + { + Debug.LogError(DSUtil.Format( "Could not resolve all Firebase dependencies: {0}", dependencyStatus)); + // Firebase Unity SDK is not safe to use here. + } + }); +#endif + + // 인앱 결제 정보 받아오기 + //label_msg.text = table_localtext.Ins.Get_Text(3); + yield return new WaitForSeconds(0.1f); + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Title/TitleInfo.cs.meta b/Assets/Scripts/Title/TitleInfo.cs.meta new file mode 100644 index 0000000..3e72346 --- /dev/null +++ b/Assets/Scripts/Title/TitleInfo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0c6d64701142b344eb1c16d3f22b7a69 \ No newline at end of file diff --git a/Assets/Scripts/UI.meta b/Assets/Scripts/UI.meta new file mode 100644 index 0000000..8dd774b --- /dev/null +++ b/Assets/Scripts/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f6e231ca237f6448a4ada02925a9fda +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Util/AddressableReleaseSelf.cs b/Assets/Scripts/Util/AddressableReleaseSelf.cs new file mode 100644 index 0000000..c105f66 --- /dev/null +++ b/Assets/Scripts/Util/AddressableReleaseSelf.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +public class AddressableReleaseSelf : MonoBehaviour +{ + void OnDestroy() + { + //Addressables.ReleaseInstance(gameObject); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Util/AddressableReleaseSelf.cs.meta b/Assets/Scripts/Util/AddressableReleaseSelf.cs.meta new file mode 100644 index 0000000..4e9d764 --- /dev/null +++ b/Assets/Scripts/Util/AddressableReleaseSelf.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8be670412c0f5814299a5f00d66f603f \ No newline at end of file diff --git a/Assets/Scripts/Util/DataCheckMgr.cs b/Assets/Scripts/Util/DataCheckMgr.cs new file mode 100644 index 0000000..3896b30 --- /dev/null +++ b/Assets/Scripts/Util/DataCheckMgr.cs @@ -0,0 +1,154 @@ +using System.Collections; +using UnityEngine; +using System; +using Random = UnityEngine.Random; +using System.Globalization; + +#if UNITY_ANDROID +//using Google.Play.Review; +#elif UNITY_IOS +using UnityEngine.iOS; +#endif + +public class DataCheckMgr : MyCoroutine +{ + private static DataCheckMgr _ins; + public static DataCheckMgr Ins { get { if (_ins == null) { _ins = new GameObject("DataCheckMgr").AddComponent(); DontDestroyOnLoad(_ins.gameObject); } return _ins; } } + + public int NewChapter { get; set; } = 0; + + public void Set() + { + StartCoroutine(Co_1Min()); + StartCoroutine(Co_1Sec()); + } + + IEnumerator Co_1Min() + { + //var sdata = ServerInfo.Ins.m_ServerData; + + while (true) + { + // 매시간 뉴스 체크 + //if (NewsGetTime != ServerInfo.ServerTime.Hour) + //{ + // ServerInfo.Ins.Get_News(news => + // { + // NewsGetTime = ServerInfo.ServerTime.Hour; + // NoticeUI.list_news = news; + // }); + //} + + yield return new WaitForSeconds(60f); + } + } + + IEnumerator Co_1Sec() + { + //var sdata = ServerInfo.Ins.m_ServerData; + bool checkinit = false; + + while (true) + { + // 게임 접속 중에 다음날이 됐을 때 + //if (!checkinit && sdata.Get_Common(eCommon.DOY_Day) != ServerInfo.ServerTime.DayOfYear) + // checkinit = true; + //if (checkinit && !callinit) + //{ + // callinit = true; + // ServerInfo.Ins.Save_Init(result => + // { + // checkinit = false; + // callinit = false; + // if (result.initDaily) sdata.Init_Daily(result.farmshop); + // if (result.initWeek) sdata.Init_Week(SamplesCalendar.Get_WeekOfYear(ServerInfo.ServerTime)); + // if (result.initMonth) sdata.Init_Month(); + // }); + //} + + yield return new WaitForSeconds(1f); + } + } + +#region 리뷰 + bool showReview; + public void Show_Review(Action _act) + { + if (showReview) return; + showReview = true; + Set_Coroutine(_act, 1f); +#if UNITY_ANDROID +#if FGB_OneStore + WebViewInfo.Ins.Show_WebView(MyValue.OnestoreURL); +#else + //var reviewManager = new ReviewManager(); + + //// start preloading the review prompt in the background + //var playReviewInfoAsyncOperation = reviewManager.RequestReviewFlow(); + + //// define a callback after the preloading is done + //playReviewInfoAsyncOperation.Completed += playReviewInfoAsync => + //{ + // if (playReviewInfoAsync.Error == ReviewErrorCode.NoError) + // { + // // display the review prompt + // var playReviewInfo = playReviewInfoAsync.GetResult(); + // reviewManager.LaunchReviewFlow(playReviewInfo); + // } + // else + // { + // // handle error when loading review prompt + // } + //}; +#endif +#else + #if UNITY_IOS + Device.RequestStoreReview(); + #endif +#endif + } +#endregion +} + +public class SamplesCalendar +{ + public static int Get_WeekOfYear(DateTime _dt) + { + // Gets the Calendar instance associated with a CultureInfo. + CultureInfo myCI = new CultureInfo("ko-KR"); + Calendar myCal = myCI.Calendar; + + // Gets the DTFI properties required by GetWeekOfYear. + CalendarWeekRule myCWR = myCI.DateTimeFormat.CalendarWeekRule; + DayOfWeek myFirstDOW = DayOfWeek.Monday; + + //Debug.LogFormat("The CalendarWeekRule used for the ko-KR culture is {0}.", myCWR); + //Debug.LogFormat("The FirstDayOfWeek used for the ko-KR culture is {0}.", myFirstDOW); + //Debug.LogFormat("Therefore, the current week is Week {0} of the current year.", myCal.GetWeekOfYear(_dt, myCWR, myFirstDOW)); + + //DateTime LastDay = new DateTime(_dt.Year, 1, 1); + //Debug.LogFormat("(1,1) There are {0} weeks in the current year ({1}).", myCal.GetWeekOfYear(LastDay, myCWR, myFirstDOW), LastDay.Year); + //LastDay = new DateTime(_dt.Year, 1, 2); + //Debug.LogFormat("(1,2) There are {0} weeks in the current year ({1}).", myCal.GetWeekOfYear(LastDay, myCWR, myFirstDOW), LastDay.Year); + //LastDay = new DateTime(_dt.Year, 6, 30); + //Debug.LogFormat("(6,30)There are {0} weeks in the current year ({1}).", myCal.GetWeekOfYear(LastDay, myCWR, myFirstDOW), LastDay.Year); + //LastDay = new DateTime(_dt.Year, 7, 1); + //Debug.LogFormat("(7,1)There are {0} weeks in the current year ({1}).", myCal.GetWeekOfYear(LastDay, myCWR, myFirstDOW), LastDay.Year); + //LastDay = new DateTime(_dt.Year, 7, 2); + //Debug.LogFormat("(7,2)There are {0} weeks in the current year ({1}).", myCal.GetWeekOfYear(LastDay, myCWR, myFirstDOW), LastDay.Year); + //LastDay = new DateTime(_dt.Year, 7, 3); + //Debug.LogFormat("(7,3)There are {0} weeks in the current year ({1}).", myCal.GetWeekOfYear(LastDay, myCWR, myFirstDOW), LastDay.Year); + + //// Displays the total number of weeks in the current year. + //LastDay = new DateTime(_dt.Year, 12, 30); + //Debug.LogFormat("(12,30)There are {0} weeks in the current year ({1}).", myCal.GetWeekOfYear(LastDay, myCWR, myFirstDOW), LastDay.Year); + //LastDay = new DateTime(_dt.Year, 12, 31); + //Debug.LogFormat("(12,31)There are {0} weeks in the current year ({1}).", myCal.GetWeekOfYear(LastDay, myCWR, myFirstDOW), LastDay.Year); + //LastDay = new DateTime(_dt.Year + 1, 1, 1); + //Debug.LogFormat("(1,1)There are {0} weeks in the current year ({1}).", myCal.GetWeekOfYear(LastDay, myCWR, myFirstDOW), LastDay.Year); + //LastDay = new DateTime(_dt.Year + 1, 1, 2); + //Debug.LogFormat("(1,2)There are {0} weeks in the current year ({1}).", myCal.GetWeekOfYear(LastDay, myCWR, myFirstDOW), LastDay.Year); + + return myCal.GetWeekOfYear(_dt, myCWR, myFirstDOW); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Util/DataCheckMgr.cs.meta b/Assets/Scripts/Util/DataCheckMgr.cs.meta new file mode 100644 index 0000000..0cdae9b --- /dev/null +++ b/Assets/Scripts/Util/DataCheckMgr.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: cbc0c6d92a07cf143a35949ac1cfeac5 \ No newline at end of file diff --git a/Packages/manifest.json b/Packages/manifest.json index 381ba3c..a0171b8 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,13 @@ { "dependencies": { - "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.addressables": "2.6.0", "com.unity.collab-proxy": "2.9.3", "com.unity.feature.2d": "2.0.1", "com.unity.ide.rider": "3.0.36", "com.unity.ide.visualstudio": "2.0.23", "com.unity.inputsystem": "1.14.1", "com.unity.multiplayer.center": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.render-pipelines.universal": "17.0.4", "com.unity.test-framework": "1.5.1", "com.unity.timeline": "1.8.7", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 939a8b3..ad5d505 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -92,6 +92,22 @@ }, "url": "https://packages.unity.com" }, + "com.unity.addressables": { + "version": "2.6.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.profiling.core": "1.0.2", + "com.unity.test-framework": "1.4.5", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.scriptablebuildpipeline": "2.4.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.8.23", "depth": 2, @@ -198,6 +214,13 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.profiling.core": { + "version": "1.0.2", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.render-pipelines.core": { "version": "17.0.4", "depth": 1, @@ -241,6 +264,16 @@ "com.unity.modules.terrain": "1.0.0" } }, + "com.unity.scriptablebuildpipeline": { + "version": "2.4.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.4.5", + "com.unity.modules.assetbundle": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.searcher": { "version": "4.9.3", "depth": 2, diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index d712d2d..08e80c5 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -9,5 +9,6 @@ EditorBuildSettings: path: Assets/Scenes/SampleScene.unity guid: 8c9cfa26abfee488c85f1582747f6a02 m_configObjects: + com.unity.addressableassets: {fileID: 11400000, guid: d9a4f106b1ccd3541acd1c6dc5e7d5be, type: 2} com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} m_UseUCBPForAssetBundles: 0