Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
hho210 2025-08-18 16:41:41 +09:00
commit 7f31f08d71
155 changed files with 839 additions and 807 deletions

7
.gitignore vendored
View File

@ -98,7 +98,12 @@ Packages/com.distantlands.cozy.core/Samples~/Legacy Integrations/*.unitypackage.
Assets/_DDD/_Addressables/Sprites/*
.autosave/
Assets/AddressableAssetsData/
*/Assets/AddressableAssetsData/AssetGroups/*.asset
*/Assets/AddressableAssetsData/Android*
*/Assets/AddressableAssetsData/iOS*
*/Assets/AddressableAssetsData/Windows*
*/Assets/AddressableAssetsData/*/*.bin*
ProjectSettings/Packages/com.unity.probuilder/Settings.json
*.DotSettings
.vsconfig

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6a8ae0a4b68a9b94889b9889b63ebacd
guid: 5f7974e57d37b3143b6c1d44c71364db
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

BIN
Assets/AddressableAssetsData/AddressableAssetSettings.asset (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d12ffbb6f886d48418efb0b6d15ccb88
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: aae35240a94dde0429e214ff4f327227
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f804fe78e7005554f9ba60273aade35b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 012f657ef2322a6499255e9c9c78a5a3
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ccbaa2bf8d0f3b542985c6bc261b1b46
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5b7b9bd594e863849bf5e512f59ba0fc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9dfa0d89bb3450744b0195c8b19fd072
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: aa213c00ab7fb904baa2b0c3d1b90adf
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e1b57f580a1df344d80b1073dcfca317
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: de41279ce863bfd47bc8c25c6e70d38b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 97c26bb69807990449c3b2f9323087a0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3c1920f73ace47b4694675ed31a1a112
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 54677cac757452b4a89ac5479284ead8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 664d15868c075ed41a9afd4b7fdf3e4f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b62ed1f0bfb9f704db4e9af0e9637977
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7bdd4a50a9f431c4ba9120737ec7c9f4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1fd7839e70b6ae64a90f35de9d2f0816
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c56a00ae7a1522f43ab6deadaf605234
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2c0a96693e2d52c4e817ba256542b053
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f6b12b9a1f788d345a122bd53fb8c854
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a6ebe5e594db22c47a5ec57d4e9d5561
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e2dbc665bf8d9ab4996582b40556fdd4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 507c24bd9b6167c46be04b2d03a7afdc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2f9b8913cc7c497429f8d9b742e2248d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0ae4285925d53be4b9c79fbdbe6fd83f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 13d50d1ad4c80aa489b2b5d0bfbd0a43
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: bc395fca191c52b4ea851fe83a40f16a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 08e47763d1d3ddc49a7fcb10ebe3b33e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b90bfb60ccafb7e4cb8900f9a52b89d7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3ee9e3ad901c06e43af50dbd33b132b1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/AddressableAssetsData/DefaultObject.asset (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8aedbecfee36f6f47b57e6359672a64f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7ddc9a444b5824bcc9421fef5212845b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/AddressableAssetsData/ProfileDataSourceSettings.asset (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d9a4d86327d0e384886ef63152a4778d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0b182ffdf506f3247a6c27b5196f69c6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/_DDD/Editor.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c79b29ca9ae5a34458d2e83f21e6e2e9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,61 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Sirenix.OdinInspector;
using UnityEditor;
using UnityEngine;
namespace DDD
{
[CreateAssetMenu(menuName = "DDD/Project Setup Config", fileName = "ProjectDDD_Setup")]
public sealed class ProjectDDD_Setup : ScriptableObject
{
// 로그 프리픽스는 상수로 관리
private const string LogPrefix = "[DDD]";
public List<DefaultAsset> DefaultAssets = new();
public GoogleSheetManager GoogleSheetManager;
[Button("프로젝트 동기화")]
public async Task SyncProject()
{
Debug.Log($"{LogPrefix} 프로젝트 동기화 시작");
foreach (var asset in DefaultAssets)
{
// 해당 폴더 reimport 하고 완료될 때까지 대기
if (asset != null)
{
string assetPath = AssetDatabase.GetAssetPath(asset);
Debug.Log($"{LogPrefix} 에셋 재임포트 시작: {asset.name}");
// 폴더의 경우 수동 Reimport와 동일하게 재귀 옵션을 추가하고
// 동기식 강제 임포트로 Import가 완료될 때까지 대기하도록 처리
var importOptions = ImportAssetOptions.ForceUpdate | ImportAssetOptions.ForceSynchronousImport;
if (AssetDatabase.IsValidFolder(assetPath))
{
importOptions |= ImportAssetOptions.ImportRecursive;
}
AssetDatabase.ImportAsset(assetPath, importOptions);
Debug.Log($"{LogPrefix} 에셋 재임포트 완료: {asset.name}");
}
}
Debug.Log($"{LogPrefix} Google Sheet 동기화 시작");
if (GoogleSheetManager != null)
{
await GoogleSheetManager.SyncSoOnlyFromCurrentJson();
}
else
{
Debug.LogWarning($"{LogPrefix} GoogleSheetManager가 설정되어 있지 않습니다. Google Sheet 동기화를 건너뜁니다.");
}
Debug.Log($"{LogPrefix} Google Sheet 동기화 완료");
// 에셋 데이터베이스 최신화 보장 (수동 Reimport 후 상태와 유사하게 유지)
AssetDatabase.Refresh();
Debug.Log($"{LogPrefix} 프로젝트 동기화 완료");
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: e5612e4bef4a5cf44b52eaa2739bbe33

View File

@ -0,0 +1,46 @@
using System.Linq;
using UnityEditor;
using UnityEngine;
namespace DDD
{
public static class ProjectSetupMenu
{
private const string MenuPath = "Tools/Project Setup";
[MenuItem(MenuPath)]
public static void OpenSetupByType()
{
var guids = AssetDatabase.FindAssets("t:" + nameof(ProjectDDD_Setup));
if (guids == null || guids.Length == 0)
{
EditorUtility.DisplayDialog(
"Project Setup",
$"타입 '{nameof(ProjectDDD_Setup)}'의 자산을 찾을 수 없습니다.\n" +
"아래 메뉴로 새 자산을 생성하고 원하는 위치에 보관하세요:\n" +
$"Create > {GetCreateMenuName()}",
"확인");
return;
}
var path = AssetDatabase.GUIDToAssetPath(guids.First());
var asset = AssetDatabase.LoadAssetAtPath<ProjectDDD_Setup>(path);
Selection.activeObject = asset;
EditorGUIUtility.PingObject(asset);
}
private static string GetCreateMenuName()
{
var attributes = typeof(ProjectDDD_Setup).GetCustomAttributes(typeof(CreateAssetMenuAttribute), false);
if (attributes != null && attributes.Length > 0)
{
var attr = (CreateAssetMenuAttribute)attributes[0];
return string.IsNullOrEmpty(attr.menuName) ? typeof(ProjectDDD_Setup).Name : attr.menuName;
}
return typeof(ProjectDDD_Setup).Name;
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: ab18775a9a68dee4c8326f7a3fdccf48

BIN
Assets/_DDD/ProjectDDD_Setup.asset (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 259a2f6a47e3c5746af8c65f213597a0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -208,9 +208,9 @@ RectTransform:
- {fileID: 4147204719077067979}
m_Father: {fileID: 8461276653178463723}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 57, y: -180}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -903, y: -180}
m_SizeDelta: {x: 434, y: 196}
m_Pivot: {x: 0, y: 1}
--- !u!114 &7075966153492927588
@ -225,10 +225,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e765c62d234d09447bff001041f3dea6, type: 3}
m_Name:
m_EditorClassIdentifier:
_checklistDatas:
- {fileID: 3908811868213848487}
- {fileID: 4812873435592921710}
- {fileID: 9187649107023762485}
--- !u!1 &4608547885265804944
GameObject:
m_ObjectHideFlags: 0
@ -1825,17 +1821,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
--- !u!114 &3908811868213848487 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4231722110417992964, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
m_PrefabInstance: {fileID: 902122324790531235}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41c34de536bd056418be66a7c5899017, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &7963895422363572388 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7062079384609475591, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
@ -6343,9 +6328,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_enableBlockImage: 1
_checklistView: {fileID: 0}
_checklistView: {fileID: 7075966153492927588}
_inventoryView: {fileID: 3570087040626823091}
_itemDetailView: {fileID: 7657801840785021781}
_todayMenuView: {fileID: 6989931530457575163}
_todayRestaurantStateView: {fileID: 6416358001397717619}
_sectionTabs: {fileID: 3546512405981124172}
_menuCategoryTabs: {fileID: 6805049896193344908}
_cookwareCategoryTabs: {fileID: 6628923975427483430}
@ -6690,17 +6677,6 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 7062079384609475591, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
m_PrefabInstance: {fileID: 4988597479058925873}
m_PrefabAsset: {fileID: 0}
--- !u!114 &9187649107023762485 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4231722110417992964, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
m_PrefabInstance: {fileID: 4988597479058925873}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41c34de536bd056418be66a7c5899017, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &5072949612917133830
PrefabInstance:
m_ObjectHideFlags: 0
@ -11169,17 +11145,6 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 7062079384609475591, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
m_PrefabInstance: {fileID: 8678676404970155882}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4812873435592921710 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4231722110417992964, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
m_PrefabInstance: {fileID: 8678676404970155882}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41c34de536bd056418be66a7c5899017, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &8730773236163191470
PrefabInstance:
m_ObjectHideFlags: 0

BIN
Assets/_DDD/_Addressables/So/PopupUiState.asset (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dd182535820ec034b9d5a0315f93fa26
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -218,6 +218,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_persistent: 1
_popupUiState:
m_AssetGUID: dd182535820ec034b9d5a0315f93fa26
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 1
_popupUiRoot: {fileID: 4347279445921954555}
--- !u!1001 &3271462863832123862
PrefabInstance:
m_ObjectHideFlags: 0
@ -376,62 +383,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 4347279445921954555}
m_Modifications:
- target: {fileID: 80291878783711167, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80291878783711167, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80291878783711167, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80291878783711167, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80291878783711167, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 128646933511594824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 128646933511594824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 281332789337621687, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 281332789337621687, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 331473022111874833, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 331473022111874833, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 331473022111874833, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 226.01
objectReference: {fileID: 0}
- target: {fileID: 331473022111874833, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 29.39
objectReference: {fileID: 0}
- target: {fileID: 331473022111874833, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: -67.085
objectReference: {fileID: 0}
- target: {fileID: 402610462582345468, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -456,30 +407,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 521207274081471369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 521207274081471369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 521207274081471369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 521207274081471369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 521207274081471369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 521207274081471369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 530867332548447273, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_Size
value: 1
@ -492,18 +419,6 @@ PrefabInstance:
propertyPath: m_Navigation.m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 672796584591173111, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 672796584591173111, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 672796584591173111, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 692316267265679943, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
@ -580,58 +495,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 1274207396512113243, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1274207396512113243, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1274207396512113243, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1274207396512113243, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1318707529086154565, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1318707529086154565, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1318707529086154565, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1318707529086154565, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1318707529086154565, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1406630130673764320, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1406630130673764320, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1406630130673764320, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1406630130673764320, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1691720683980765368, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -712,30 +575,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1968542374183748313, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1968542374183748313, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1968542374183748313, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1968542374183748313, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1968542374183748313, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1968542374183748313, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1977031121477196991, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -784,50 +623,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2387625080349049651, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2387625080349049651, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2387625080349049651, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2387625080349049651, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2387625080349049651, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2387625080349049651, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2417708160092588282, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2417708160092588282, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2417708160092588282, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2417708160092588282, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2438716745211137680, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: _checklistView
value:
objectReference: {fileID: 6757749603460973033}
- target: {fileID: 2533972730564147638, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -896,38 +691,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3026271604112601182, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3026271604112601182, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3026271604112601182, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3128855240455720927, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3128855240455720927, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3128855240455720927, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 116.35
objectReference: {fileID: 0}
- target: {fileID: 3128855240455720927, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 58.175
objectReference: {fileID: 0}
- target: {fileID: 3128855240455720927, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: -2
objectReference: {fileID: 0}
- target: {fileID: 3416312790082446483, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@ -952,30 +715,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -24.5
objectReference: {fileID: 0}
- target: {fileID: 3523979255206053824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3523979255206053824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3523979255206053824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3523979255206053824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3523979255206053824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3523979255206053824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3640084576764429812, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -1084,22 +823,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4036711961197890410, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4036711961197890410, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4036711961197890410, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4036711961197890410, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4077787401175619061, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -1216,14 +939,6 @@ PrefabInstance:
propertyPath: m_Navigation.m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4350667809177241520, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4350667809177241520, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4362623042029436051, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -1264,30 +979,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4679813713314604769, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4679813713314604769, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4679813713314604769, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4679813713314604769, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4679813713314604769, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4679813713314604769, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5033948862314120186, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -1424,30 +1115,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -25
objectReference: {fileID: 0}
- target: {fileID: 5583958938396664818, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5583958938396664818, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5583958938396664818, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5583958938396664818, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5583958938396664818, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5583958938396664818, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5646014643746221419, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -1536,26 +1203,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5881650120089621552, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5881650120089621552, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5881650120089621552, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 66.4
objectReference: {fileID: 0}
- target: {fileID: 5881650120089621552, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 115.600006
objectReference: {fileID: 0}
- target: {fileID: 5881650120089621552, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 5957329961095632427, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -1608,14 +1255,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6331095795691694274, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6331095795691694274, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6344275985555570161, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_text
value: Q
@ -1728,26 +1367,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6670211813776540580, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6670211813776540580, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6670211813776540580, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6670211813776540580, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6670211813776540580, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6707899588539731142, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -1804,26 +1423,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6979582802728932958, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6979582802728932958, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6979582802728932958, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 24
objectReference: {fileID: 0}
- target: {fileID: 6979582802728932958, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6979582802728932958, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 73.08
objectReference: {fileID: 0}
- target: {fileID: 7030673648259409502, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@ -1860,26 +1459,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112215723407477130, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112215723407477130, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112215723407477130, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112215723407477130, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112215723407477130, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7157700339803392859, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -1924,38 +1503,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -4.6550007
objectReference: {fileID: 0}
- target: {fileID: 7307821376800175486, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7307821376800175486, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7307821376800175486, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7307821376800175486, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7307821376800175486, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7307821376800175486, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7355900029339508008, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_Size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7355900029339508008, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_Value
value: 0.022801302
objectReference: {fileID: 0}
- target: {fileID: 7484059388139300099, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -2004,10 +1551,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7552805847435424582, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 293.1596
objectReference: {fileID: 0}
- target: {fileID: 7598092264476464056, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@ -2080,50 +1623,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7984765781074194439, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7984765781074194439, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7984765781074194439, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7984765781074194439, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7984765781074194439, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8041121093090562143, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8041121093090562143, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8041121093090562143, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8041121093090562143, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8041121093090562143, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8041121093090562143, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8106125910961152496, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -2148,30 +1647,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8217971899783076871, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8217971899783076871, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8217971899783076871, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8217971899783076871, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8217971899783076871, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8217971899783076871, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8305100377523793440, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@ -2248,46 +1723,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 8732577632134111369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8732577632134111369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8732577632134111369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 45.14
objectReference: {fileID: 0}
- target: {fileID: 8732577632134111369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.y
value: 45
objectReference: {fileID: 0}
- target: {fileID: 8732577632134111369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 22.57
objectReference: {fileID: 0}
- target: {fileID: 8732577632134111369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8752052237749703284, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8752052237749703284, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8752052237749703284, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8752052237749703284, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8773288080417041969, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@ -2323,17 +1758,6 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 4003376255966605935, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
m_PrefabInstance: {fileID: 4610200355667842445}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6757749603460973033 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7075966153492927588, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
m_PrefabInstance: {fileID: 4610200355667842445}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e765c62d234d09447bff001041f3dea6, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &5373576770822278816
PrefabInstance:
m_ObjectHideFlags: 0

Binary file not shown.

View File

@ -234,6 +234,14 @@ public static void CreateAtlas(string path, string destPath)
sRGB = true,
generateMipMaps = false
};
// 저장 후 설정 반영을 위해 동기 임포트, 그리고 즉시 패킹 수행
AssetDatabase.ImportAsset(destPath, ImportAssetOptions.ForceUpdate | ImportAssetOptions.ForceSynchronousImport);
var packedAtlas = AssetDatabase.LoadAssetAtPath<SpriteAtlas>(destPath);
if (packedAtlas != null)
{
SpriteAtlasUtility.PackAtlases(new[] { packedAtlas }, EditorUserBuildSettings.activeBuildTarget);
}
}
public static void CreateSingleAtlas(string path, string destPath)
@ -277,18 +285,34 @@ public static void CreateSingleAtlas(string path, string destPath)
sRGB = true,
generateMipMaps = false
};
// 저장 후 설정 반영을 위해 동기 임포트, 그리고 즉시 패킹 수행
AssetDatabase.ImportAsset(destPath, ImportAssetOptions.ForceUpdate | ImportAssetOptions.ForceSynchronousImport);
var packedAtlas = AssetDatabase.LoadAssetAtPath<SpriteAtlas>(destPath);
if (packedAtlas != null)
{
SpriteAtlasUtility.PackAtlases(new[] { packedAtlas }, EditorUserBuildSettings.activeBuildTarget);
}
}
public static void BuildTarget()
{
foreach (var path in TargetPaths)
AssetDatabase.StartAssetEditing();
try
{
CreateAtlas(Utils.FolderPath(path),
Utils.FolderPath(path).Replace(PathConstants.RawFolderPath, PathConstants.AddressablesFolderPath) +
ExtenstionConstants.SpriteAtlasExtenstionLower);
foreach (var path in TargetPaths)
{
CreateAtlas(Utils.FolderPath(path),
Utils.FolderPath(path).Replace(PathConstants.RawFolderPath, PathConstants.AddressablesFolderPath) +
ExtenstionConstants.SpriteAtlasExtenstionLower);
}
}
finally
{
AssetDatabase.StopAssetEditing();
AssetDatabase.Refresh();
TargetPaths.Clear();
}
TargetPaths.Clear();
}
}
}

View File

@ -13,8 +13,8 @@ public enum GameFlowState : uint
RunRestaurant = 1u << 1,
SettlementRestaurant = 1u << 2,
All = 0xFFFFFFFFu
}
}
public class GameFlowManager : Singleton<GameFlowManager>, IManager
{
public GameFlowDataSo GameFlowDataSo;
@ -28,32 +28,32 @@ public void PreInit()
public Task Init()
{
return Task.CompletedTask;;
return Task.CompletedTask; ;
}
public void PostInit()
public async void PostInit()
{
if (IsGameStarted() == false)
{
ChangeFlow(GameFlowState.ReadyForRestaurant);
await ChangeFlow(GameFlowState.ReadyForRestaurant);
}
}
private bool IsGameStarted() => GameFlowDataSo.CurrentGameState != GameFlowState.None;
public void ChangeFlow(GameFlowState newFlowState)
public async Task ChangeFlow(GameFlowState newFlowState)
{
if (!CanChangeFlow(newFlowState))
if (CanChangeFlow(newFlowState) == false)
{
Debug.LogError("Can't change flow");
return;
}
_ = EndCurrentFlow();
_ = ReadyNewFlow(newFlowState);
await EndCurrentFlow();
await ReadyNewFlow(newFlowState);
}
private bool CanChangeFlow(GameFlowState newFlowState)
{
return true;
@ -62,27 +62,27 @@ private bool CanChangeFlow(GameFlowState newFlowState)
private async Task EndCurrentFlow()
{
var endCurrentFlowState = GameFlowDataSo.CurrentGameState;
foreach (var handler in FlowHandlers)
{
await handler.OnExitCurrentFlow(endCurrentFlowState);
}
}
private async Task ReadyNewFlow(GameFlowState newFlowState)
{
GameFlowDataSo.CurrentGameState = newFlowState;
await OpenFlowScene(newFlowState);
foreach (var handler in FlowHandlers)
{
await handler.OnReadyNewFlow(newFlowState);
}
await OpenFlowScene(newFlowState);
StartFlow();
}
private async Task OpenFlowScene(GameFlowState newFlowState)
{
if (GetFlowScene(newFlowState))
@ -102,7 +102,7 @@ private bool GetFlowScene(GameFlowState flowState)
private void StartFlow()
{
}
}
}

View File

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;
@ -11,13 +12,20 @@ public class GameManager : Singleton<GameManager>
private List<Singleton> _managerInstances;
protected override void OnAwake()
protected override async void OnAwake()
{
base.OnAwake();
EventBus.ClearAll();
_ = Initialize();
try
{
await Initialize();
}
catch (Exception e)
{
Debug.LogError(e);
}
}
private async Task Initialize()

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 563e491da99f98d4784895535548d23d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -24,7 +24,7 @@ public abstract class PopupUi<T> : BasePopupUi where T : Enum
protected readonly List<(InputAction action, Action<InputAction.CallbackContext> handler)> _registeredHandlers = new();
public override InputActionMaps InputActionMaps => _baseUiActionsInputBindingSo.InputActionMaps;
private bool _isTopPopup => UiManager.Instance.IsTopPopup(this);
private bool _isTopPopup => UiManager.Instance.PopupUiState.IsTopPopup(this);
private const string InputBindingSo = "InputBindingSo";
@ -32,7 +32,7 @@ protected override async void TryRegister()
{
base.TryRegister();
UiManager.Instance.RegisterPopupUI(this);
UiManager.Instance?.PopupUiState?.RegisterPopupUI(this);
string addressableKey = $"{GetType().Name}_{typeof(T).Name}_{InputBindingSo}";
_baseUiActionsInputBindingSo = await AssetManager.LoadAsset<BaseUiActionsInputBindingSo<T>>(addressableKey);
@ -73,7 +73,7 @@ protected override async void TryRegister()
protected override void TryUnregister()
{
base.TryUnregister();
UiManager.Instance.UnregisterPopupUI(this);
UiManager.Instance?.PopupUiState?.UnregisterPopupUI(this);
foreach (var (action, handler) in _registeredHandlers)
{
@ -94,7 +94,7 @@ public override void Open(OpenPopupUiEvent evt)
transform.SetAsLastSibling();
if (UiManager.Instance.IsTopPopup(this))
if (UiManager.Instance.PopupUiState.IsTopPopup(this))
{
InputManager.Instance.SwitchCurrentActionMap(_baseUiActionsInputBindingSo.InputActionMaps);
}

View File

@ -0,0 +1,196 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Sirenix.OdinInspector;
using UnityEngine;
namespace DDD
{
[CreateAssetMenu(fileName = "PopupUiState", menuName = "GameUi/PopupUiState")]
public class PopupUiState : SerializedScriptableObject, IEventHandler<OpenPopupUiEvent>, IEventHandler<ClosePopupUiEvent>
{
public Dictionary<GameFlowState, List<BasePopupUi>> FlowToPopupUiMapping = new();
[Title("디버그")]
[ReadOnly, ShowInInspector] private readonly Dictionary<Type, BasePopupUi> _popupUis = new();
[ReadOnly, ShowInInspector] private readonly Stack<BasePopupUi> _popupUiStack = new();
[ReadOnly, SerializeField] private InputActionMaps _previousActionMap = InputActionMaps.None;
private void OnDisable()
{
EventBus.Unregister<OpenPopupUiEvent>(this);
EventBus.Unregister<ClosePopupUiEvent>(this);
}
public void Initialize()
{
EventBus.Register<OpenPopupUiEvent>(this);
EventBus.Register<ClosePopupUiEvent>(this);
_popupUis.Clear();
_popupUiStack.Clear();
}
public void RegisterPopupUI(BasePopupUi ui)
{
var type = ui.GetType();
_popupUis.TryAdd(type, ui);
}
public void UnregisterPopupUI(BasePopupUi ui)
{
var type = ui.GetType();
if (_popupUis.TryGetValue(type, out var registered) && registered == ui)
{
_popupUis.Remove(type);
}
}
public void Invoke(OpenPopupUiEvent evt)
{
if (_popupUis.TryGetValue(evt.UiType, out var popup))
{
if (!popup.IsOpen)
{
PushPopup(popup);
popup.Open(evt);
if (popup.IsBlockingTime)
{
var timeScaleChangeEvent = GameEvents.RequestTimeScaleChangeEvent;
timeScaleChangeEvent.Requester = popup;
timeScaleChangeEvent.NewTimeScale = 0f;
EventBus.Broadcast(timeScaleChangeEvent);
}
}
}
}
public void Invoke(ClosePopupUiEvent evt)
{
if (_popupUis.TryGetValue(evt.UiType, out var popup))
{
if (popup.IsOpen)
{
popup.ClosePanel();
PopPopup(popup);
if (popup.IsBlockingTime)
{
var timeScaleChangeEvent = GameEvents.RequestTimeScaleChangeEvent;
timeScaleChangeEvent.Requester = popup;
timeScaleChangeEvent.NewTimeScale = 1f;
EventBus.Broadcast(timeScaleChangeEvent);
}
}
}
}
public void CreatePopup(BasePopupUi popup, Transform parent)
{
if (_popupUis.TryGetValue(popup.GetType(), out var registered) && registered == popup) return;
var instance = Instantiate(popup, parent);
instance.name = popup.name;
}
public void DestroyPopup(BasePopupUi popup)
{
if (_popupUis.TryGetValue(popup.GetType(), out var registered) == false || registered != popup) return;
Destroy(popup.gameObject);
}
public List<BasePopupUi> GetMatchingPopupUis(GameFlowState flowState)
{
return FlowToPopupUiMapping
.Where(keyValuePair => (keyValuePair.Key & flowState) != 0)
.SelectMany(keyValuePair => keyValuePair.Value)
.ToList();
}
public bool HasMatchingPopupUis(GameFlowState flowState)
{
return FlowToPopupUiMapping.Any(keyValuePair => (keyValuePair.Key & flowState) != 0);
}
public void CreateMatchingPopupUis(GameFlowState flowState, Transform parent)
{
var matchingPopupUis = GetMatchingPopupUis(flowState);
foreach (var popupUi in matchingPopupUis)
{
CreatePopup(popupUi, parent);
}
}
public void DestroyMatchingPopupUis(GameFlowState flowState)
{
var matchingPopupUis = GetMatchingPopupUis(flowState);
foreach (var popupUi in matchingPopupUis)
{
DestroyPopup(popupUi);
}
}
public bool IsTopPopup(BasePopupUi popup)
{
return _popupUiStack.Count > 0 && _popupUiStack.Peek() == popup;
}
public void PushPopup(BasePopupUi popup)
{
if (_popupUiStack.Contains(popup)) return;
if (_popupUiStack.Count == 0)
{
_previousActionMap = InputManager.Instance.GetCurrentActionMap();
}
_popupUiStack.Push(popup);
UpdatePopupCanvasGroups();
}
public void PopPopup(BasePopupUi popup)
{
if (_popupUiStack.Count == 0) return;
if (_popupUiStack.Peek() == popup)
{
_popupUiStack.Pop();
}
else
{
var temp = _popupUiStack.Reverse().Where(p => p != popup).Reverse().ToList();
_popupUiStack.Clear();
foreach (var p in temp)
{
_popupUiStack.Push(p);
}
}
if (_popupUiStack.TryPeek(out var topPopup) && topPopup.IsOpen)
{
InputManager.Instance.SwitchCurrentActionMap(topPopup.InputActionMaps);
}
else
{
InputManager.Instance.SwitchCurrentActionMap(_previousActionMap);
}
UpdatePopupCanvasGroups();
}
private void UpdatePopupCanvasGroups()
{
if (_popupUiStack.Count == 0) return;
foreach (var popupUi in _popupUiStack)
{
bool isTop = IsTopPopup(popupUi);
popupUi.SetUiInteractable(isTop);
}
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 795c2a281d8cab44ea9cd5f2c33eb1b1

Some files were not shown because too many files have changed in this diff Show More