UiManager PopupState기능 분리
This commit is contained in:
parent
59867e063f
commit
cb2970b897
@ -208,9 +208,9 @@ RectTransform:
|
|||||||
- {fileID: 4147204719077067979}
|
- {fileID: 4147204719077067979}
|
||||||
m_Father: {fileID: 8461276653178463723}
|
m_Father: {fileID: 8461276653178463723}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
m_AnchoredPosition: {x: 57, y: -180}
|
m_AnchoredPosition: {x: -903, y: -180}
|
||||||
m_SizeDelta: {x: 434, y: 196}
|
m_SizeDelta: {x: 434, y: 196}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &7075966153492927588
|
--- !u!114 &7075966153492927588
|
||||||
@ -225,10 +225,6 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: e765c62d234d09447bff001041f3dea6, type: 3}
|
m_Script: {fileID: 11500000, guid: e765c62d234d09447bff001041f3dea6, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_checklistDatas:
|
|
||||||
- {fileID: 3908811868213848487}
|
|
||||||
- {fileID: 4812873435592921710}
|
|
||||||
- {fileID: 9187649107023762485}
|
|
||||||
--- !u!1 &4608547885265804944
|
--- !u!1 &4608547885265804944
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1825,17 +1821,6 @@ PrefabInstance:
|
|||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
|
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
|
--- !u!224 &7963895422363572388 stripped
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_CorrespondingSourceObject: {fileID: 7062079384609475591, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
|
m_CorrespondingSourceObject: {fileID: 7062079384609475591, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
|
||||||
@ -6343,9 +6328,11 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_enableBlockImage: 1
|
_enableBlockImage: 1
|
||||||
_checklistView: {fileID: 0}
|
_checklistView: {fileID: 7075966153492927588}
|
||||||
_inventoryView: {fileID: 3570087040626823091}
|
_inventoryView: {fileID: 3570087040626823091}
|
||||||
_itemDetailView: {fileID: 7657801840785021781}
|
_itemDetailView: {fileID: 7657801840785021781}
|
||||||
|
_todayMenuView: {fileID: 6989931530457575163}
|
||||||
|
_todayRestaurantStateView: {fileID: 6416358001397717619}
|
||||||
_sectionTabs: {fileID: 3546512405981124172}
|
_sectionTabs: {fileID: 3546512405981124172}
|
||||||
_menuCategoryTabs: {fileID: 6805049896193344908}
|
_menuCategoryTabs: {fileID: 6805049896193344908}
|
||||||
_cookwareCategoryTabs: {fileID: 6628923975427483430}
|
_cookwareCategoryTabs: {fileID: 6628923975427483430}
|
||||||
@ -6690,17 +6677,6 @@ RectTransform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 7062079384609475591, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
|
m_CorrespondingSourceObject: {fileID: 7062079384609475591, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
|
||||||
m_PrefabInstance: {fileID: 4988597479058925873}
|
m_PrefabInstance: {fileID: 4988597479058925873}
|
||||||
m_PrefabAsset: {fileID: 0}
|
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
|
--- !u!1001 &5072949612917133830
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -11169,17 +11145,6 @@ RectTransform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 7062079384609475591, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
|
m_CorrespondingSourceObject: {fileID: 7062079384609475591, guid: 316b8444431f7a1428ed2909a24101af, type: 3}
|
||||||
m_PrefabInstance: {fileID: 8678676404970155882}
|
m_PrefabInstance: {fileID: 8678676404970155882}
|
||||||
m_PrefabAsset: {fileID: 0}
|
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
|
--- !u!1001 &8730773236163191470
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
BIN
Assets/_DDD/_Addressables/So/PopupUiState.asset
(Stored with Git LFS)
Normal file
BIN
Assets/_DDD/_Addressables/So/PopupUiState.asset
(Stored with Git LFS)
Normal file
Binary file not shown.
8
Assets/_DDD/_Addressables/So/PopupUiState.asset.meta
Normal file
8
Assets/_DDD/_Addressables/So/PopupUiState.asset.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: dd182535820ec034b9d5a0315f93fa26
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -218,6 +218,13 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_persistent: 1
|
_persistent: 1
|
||||||
|
_popupUiState:
|
||||||
|
m_AssetGUID: dd182535820ec034b9d5a0315f93fa26
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 1
|
||||||
|
_popupUiRoot: {fileID: 4347279445921954555}
|
||||||
--- !u!1001 &3271462863832123862
|
--- !u!1001 &3271462863832123862
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -376,62 +383,6 @@ PrefabInstance:
|
|||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_TransformParent: {fileID: 4347279445921954555}
|
m_TransformParent: {fileID: 4347279445921954555}
|
||||||
m_Modifications:
|
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}
|
- target: {fileID: 402610462582345468, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -456,30 +407,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 530867332548447273, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_Size
|
propertyPath: m_Size
|
||||||
value: 1
|
value: 1
|
||||||
@ -492,18 +419,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_Navigation.m_Mode
|
propertyPath: m_Navigation.m_Mode
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 692316267265679943, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -580,58 +495,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -21.5
|
value: -21.5
|
||||||
objectReference: {fileID: 0}
|
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}
|
- target: {fileID: 1691720683980765368, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -712,30 +575,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 1977031121477196991, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -784,50 +623,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_SizeDelta.x
|
propertyPath: m_SizeDelta.x
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 2533972730564147638, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -896,38 +691,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 3416312790082446483, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 1
|
value: 1
|
||||||
@ -952,30 +715,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -24.5
|
value: -24.5
|
||||||
objectReference: {fileID: 0}
|
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}
|
- target: {fileID: 3640084576764429812, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -1084,22 +823,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 4077787401175619061, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -1216,14 +939,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_Navigation.m_Mode
|
propertyPath: m_Navigation.m_Mode
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 4362623042029436051, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -1264,30 +979,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_SizeDelta.x
|
propertyPath: m_SizeDelta.x
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 5033948862314120186, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -1424,30 +1115,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -25
|
value: -25
|
||||||
objectReference: {fileID: 0}
|
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}
|
- target: {fileID: 5646014643746221419, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -1536,26 +1203,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 5957329961095632427, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -1608,14 +1255,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 6344275985555570161, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_text
|
propertyPath: m_text
|
||||||
value: Q
|
value: Q
|
||||||
@ -1728,26 +1367,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 6707899588539731142, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -1804,26 +1423,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
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}
|
- target: {fileID: 7030673648259409502, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_SizeDelta.x
|
propertyPath: m_SizeDelta.x
|
||||||
value: 0
|
value: 0
|
||||||
@ -1860,26 +1459,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 7157700339803392859, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -1924,38 +1503,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -4.6550007
|
value: -4.6550007
|
||||||
objectReference: {fileID: 0}
|
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}
|
- target: {fileID: 7484059388139300099, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -2004,10 +1551,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 7598092264476464056, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 1
|
value: 1
|
||||||
@ -2080,50 +1623,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 8106125910961152496, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
@ -2148,30 +1647,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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}
|
- target: {fileID: 8305100377523793440, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_SizeDelta.x
|
propertyPath: m_SizeDelta.x
|
||||||
value: 0
|
value: 0
|
||||||
@ -2248,46 +1723,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -21.5
|
value: -21.5
|
||||||
objectReference: {fileID: 0}
|
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}
|
- target: {fileID: 8773288080417041969, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
propertyPath: m_SizeDelta.x
|
propertyPath: m_SizeDelta.x
|
||||||
value: 0
|
value: 0
|
||||||
@ -2323,17 +1758,6 @@ RectTransform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 4003376255966605935, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
m_CorrespondingSourceObject: {fileID: 4003376255966605935, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3}
|
||||||
m_PrefabInstance: {fileID: 4610200355667842445}
|
m_PrefabInstance: {fileID: 4610200355667842445}
|
||||||
m_PrefabAsset: {fileID: 0}
|
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
|
--- !u!1001 &5373576770822278816
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
8
Assets/_DDD/_Scripts/GameUi/PopupUi.meta
Normal file
8
Assets/_DDD/_Scripts/GameUi/PopupUi.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 563e491da99f98d4784895535548d23d
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -24,7 +24,7 @@ public abstract class PopupUi<T> : BasePopupUi where T : Enum
|
|||||||
protected readonly List<(InputAction action, Action<InputAction.CallbackContext> handler)> _registeredHandlers = new();
|
protected readonly List<(InputAction action, Action<InputAction.CallbackContext> handler)> _registeredHandlers = new();
|
||||||
public override InputActionMaps InputActionMaps => _baseUiActionsInputBindingSo.InputActionMaps;
|
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";
|
private const string InputBindingSo = "InputBindingSo";
|
||||||
|
|
||||||
@ -32,7 +32,7 @@ protected override async void TryRegister()
|
|||||||
{
|
{
|
||||||
base.TryRegister();
|
base.TryRegister();
|
||||||
|
|
||||||
UiManager.Instance.RegisterPopupUI(this);
|
UiManager.Instance?.PopupUiState?.RegisterPopupUI(this);
|
||||||
|
|
||||||
string addressableKey = $"{GetType().Name}_{typeof(T).Name}_{InputBindingSo}";
|
string addressableKey = $"{GetType().Name}_{typeof(T).Name}_{InputBindingSo}";
|
||||||
_baseUiActionsInputBindingSo = await AssetManager.LoadAsset<BaseUiActionsInputBindingSo<T>>(addressableKey);
|
_baseUiActionsInputBindingSo = await AssetManager.LoadAsset<BaseUiActionsInputBindingSo<T>>(addressableKey);
|
||||||
@ -73,7 +73,7 @@ protected override async void TryRegister()
|
|||||||
protected override void TryUnregister()
|
protected override void TryUnregister()
|
||||||
{
|
{
|
||||||
base.TryUnregister();
|
base.TryUnregister();
|
||||||
UiManager.Instance.UnregisterPopupUI(this);
|
UiManager.Instance?.PopupUiState?.UnregisterPopupUI(this);
|
||||||
|
|
||||||
foreach (var (action, handler) in _registeredHandlers)
|
foreach (var (action, handler) in _registeredHandlers)
|
||||||
{
|
{
|
||||||
@ -94,7 +94,7 @@ public override void Open(OpenPopupUiEvent evt)
|
|||||||
|
|
||||||
transform.SetAsLastSibling();
|
transform.SetAsLastSibling();
|
||||||
|
|
||||||
if (UiManager.Instance.IsTopPopup(this))
|
if (UiManager.Instance.PopupUiState.IsTopPopup(this))
|
||||||
{
|
{
|
||||||
InputManager.Instance.SwitchCurrentActionMap(_baseUiActionsInputBindingSo.InputActionMaps);
|
InputManager.Instance.SwitchCurrentActionMap(_baseUiActionsInputBindingSo.InputActionMaps);
|
||||||
}
|
}
|
196
Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs
Normal file
196
Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs
Normal 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
2
Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs.meta
Normal file
2
Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs.meta
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 795c2a281d8cab44ea9cd5f2c33eb1b1
|
@ -13,6 +13,8 @@ public class RestaurantManagementUi : PopupUi<RestaurantUiActions>, IEventHandle
|
|||||||
[SerializeField] private ChecklistView _checklistView;
|
[SerializeField] private ChecklistView _checklistView;
|
||||||
[SerializeField] private InventoryView _inventoryView;
|
[SerializeField] private InventoryView _inventoryView;
|
||||||
[SerializeField] private ItemDetailView _itemDetailView;
|
[SerializeField] private ItemDetailView _itemDetailView;
|
||||||
|
[SerializeField] private TodayMenuView _todayMenuView;
|
||||||
|
[SerializeField] private TodayRestaurantStateView _todayRestaurantStateView;
|
||||||
[SerializeField] private TabGroupUi _sectionTabs;
|
[SerializeField] private TabGroupUi _sectionTabs;
|
||||||
[SerializeField] private TabGroupUi _menuCategoryTabs;
|
[SerializeField] private TabGroupUi _menuCategoryTabs;
|
||||||
[SerializeField] private TabGroupUi _cookwareCategoryTabs;
|
[SerializeField] private TabGroupUi _cookwareCategoryTabs;
|
||||||
@ -113,6 +115,8 @@ private void InitializeViews()
|
|||||||
{
|
{
|
||||||
_checklistView.Initalize();
|
_checklistView.Initalize();
|
||||||
_inventoryView.Initialize();
|
_inventoryView.Initialize();
|
||||||
|
_todayMenuView.Initialize();
|
||||||
|
_todayRestaurantStateView.Initialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
@ -15,18 +15,13 @@ public class TodayMenuView : MonoBehaviour, IEventHandler<TodayMenuAddedEvent>,
|
|||||||
private RestaurantManagementStateSo restaurantManagementStateSo;
|
private RestaurantManagementStateSo restaurantManagementStateSo;
|
||||||
private RestaurantManagementDataSo restaurantManagementDataSo;
|
private RestaurantManagementDataSo restaurantManagementDataSo;
|
||||||
|
|
||||||
private void Start()
|
|
||||||
{
|
|
||||||
Initialize();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnDestroy()
|
private void OnDestroy()
|
||||||
{
|
{
|
||||||
EventBus.Unregister<TodayMenuAddedEvent>(this);
|
EventBus.Unregister<TodayMenuAddedEvent>(this);
|
||||||
EventBus.Unregister<TodayMenuRemovedEvent>(this);
|
EventBus.Unregister<TodayMenuRemovedEvent>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Initialize()
|
public void Initialize()
|
||||||
{
|
{
|
||||||
restaurantManagementStateSo = RestaurantState.instance.ManagementState;
|
restaurantManagementStateSo = RestaurantState.instance.ManagementState;
|
||||||
restaurantManagementDataSo = RestaurantDataSo.instance.ManagementData;
|
restaurantManagementDataSo = RestaurantDataSo.instance.ManagementData;
|
@ -14,11 +14,6 @@ public class TodayRestaurantStateView : MonoBehaviour, IEventHandler<TodayMenuAd
|
|||||||
|
|
||||||
private RestaurantManagementStateSo restaurantManagementStateSo;
|
private RestaurantManagementStateSo restaurantManagementStateSo;
|
||||||
private RestaurantManagementDataSo restaurantManagementDataSo;
|
private RestaurantManagementDataSo restaurantManagementDataSo;
|
||||||
|
|
||||||
private void Start()
|
|
||||||
{
|
|
||||||
Initialize();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnDestroy()
|
private void OnDestroy()
|
||||||
{
|
{
|
||||||
@ -26,7 +21,7 @@ private void OnDestroy()
|
|||||||
EventBus.Unregister<TodayMenuRemovedEvent>(this);
|
EventBus.Unregister<TodayMenuRemovedEvent>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Initialize()
|
public void Initialize()
|
||||||
{
|
{
|
||||||
restaurantManagementStateSo = RestaurantState.instance.ManagementState;
|
restaurantManagementStateSo = RestaurantState.instance.ManagementState;
|
||||||
restaurantManagementDataSo = RestaurantDataSo.instance.ManagementData;
|
restaurantManagementDataSo = RestaurantDataSo.instance.ManagementData;
|
@ -1,154 +1,62 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Sirenix.OdinInspector;
|
using UnityEngine;
|
||||||
|
using UnityEngine.AddressableAssets;
|
||||||
|
|
||||||
namespace DDD
|
namespace DDD
|
||||||
{
|
{
|
||||||
public class UiManager : Singleton<UiManager>, IManager, IEventHandler<OpenPopupUiEvent>, IEventHandler<ClosePopupUiEvent>
|
public class UiManager : Singleton<UiManager>, IManager, IGameFlowHandler
|
||||||
{
|
{
|
||||||
private readonly Dictionary<Type, BasePopupUi> _popupUIs = new();
|
[SerializeField] private AssetReference _popupUiState;
|
||||||
[ReadOnly, ShowInInspector] private readonly Stack<BasePopupUi> _popupStack = new();
|
[SerializeField] private Transform _popupUiRoot;
|
||||||
private InputActionMaps _previousActionMap = InputActionMaps.None;
|
|
||||||
|
|
||||||
private readonly object _uiPauseRequester = new();
|
public PopupUiState PopupUiState { get; private set; }
|
||||||
|
|
||||||
|
private void OnDestroy()
|
||||||
|
{
|
||||||
|
GameFlowManager.Instance?.FlowHandlers?.Remove(this);
|
||||||
|
}
|
||||||
|
|
||||||
public void PreInit()
|
public void PreInit()
|
||||||
{
|
{
|
||||||
EventBus.Register<OpenPopupUiEvent>(this);
|
GameFlowManager.Instance.FlowHandlers.Add(this);
|
||||||
EventBus.Register<ClosePopupUiEvent>(this);
|
|
||||||
|
foreach (Transform child in _popupUiRoot)
|
||||||
|
{
|
||||||
|
Destroy(child.gameObject);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task Init()
|
public async Task Init()
|
||||||
{
|
{
|
||||||
return Task.CompletedTask;
|
await LoadData();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PostInit()
|
public void PostInit()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDestroy()
|
public Task OnReadyNewFlow(GameFlowState newFlowState)
|
||||||
{
|
{
|
||||||
EventBus.Unregister<OpenPopupUiEvent>(this);
|
PopupUiState.CreateMatchingPopupUis(newFlowState, _popupUiRoot);
|
||||||
EventBus.Unregister<ClosePopupUiEvent>(this);
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RegisterPopupUI(BasePopupUi ui)
|
public Task OnExitCurrentFlow(GameFlowState exitingFlowState)
|
||||||
{
|
{
|
||||||
var type = ui.GetType();
|
PopupUiState.DestroyMatchingPopupUis(exitingFlowState);
|
||||||
_popupUIs.TryAdd(type, ui);
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UnregisterPopupUI(BasePopupUi ui)
|
private async Task LoadData()
|
||||||
{
|
{
|
||||||
var type = ui.GetType();
|
var handle = _popupUiState.LoadAssetAsync<PopupUiState>();
|
||||||
if (_popupUIs.TryGetValue(type, out var registered) && registered == ui)
|
await handle.Task;
|
||||||
{
|
PopupUiState = handle.Result;
|
||||||
_popupUIs.Remove(type);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Invoke(OpenPopupUiEvent evt)
|
Debug.Assert(PopupUiState != null, "PopupUiState is null");
|
||||||
{
|
|
||||||
if (_popupUIs.TryGetValue(evt.UiType, out var popup))
|
|
||||||
{
|
|
||||||
if (!popup.IsOpen)
|
|
||||||
{
|
|
||||||
PushPopup(popup);
|
|
||||||
popup.Open(evt);
|
|
||||||
|
|
||||||
if (popup.IsBlockingTime)
|
PopupUiState.Initialize();
|
||||||
{
|
|
||||||
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 bool IsTopPopup(BasePopupUi popup)
|
|
||||||
{
|
|
||||||
return _popupStack.Count > 0 && _popupStack.Peek() == popup;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void PushPopup(BasePopupUi popup)
|
|
||||||
{
|
|
||||||
if (_popupStack.Contains(popup)) return;
|
|
||||||
|
|
||||||
if (_popupStack.Count == 0)
|
|
||||||
{
|
|
||||||
_previousActionMap = InputManager.Instance.GetCurrentActionMap();
|
|
||||||
}
|
|
||||||
|
|
||||||
_popupStack.Push(popup);
|
|
||||||
|
|
||||||
UpdatePopupCanvasGroups();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void PopPopup(BasePopupUi popup)
|
|
||||||
{
|
|
||||||
if (_popupStack.Count == 0) return;
|
|
||||||
|
|
||||||
if (_popupStack.Peek() == popup)
|
|
||||||
{
|
|
||||||
_popupStack.Pop();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var temp = _popupStack.Reverse().Where(p => p != popup).Reverse().ToList();
|
|
||||||
_popupStack.Clear();
|
|
||||||
foreach (var p in temp)
|
|
||||||
{
|
|
||||||
_popupStack.Push(p);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_popupStack.TryPeek(out var topPopup) && topPopup.IsOpen)
|
|
||||||
{
|
|
||||||
InputManager.Instance.SwitchCurrentActionMap(topPopup.InputActionMaps);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
InputManager.Instance.SwitchCurrentActionMap(_previousActionMap);
|
|
||||||
}
|
|
||||||
|
|
||||||
UpdatePopupCanvasGroups();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void UpdatePopupCanvasGroups()
|
|
||||||
{
|
|
||||||
if (_popupStack.Count == 0) return;
|
|
||||||
|
|
||||||
foreach (var popupUi in _popupStack)
|
|
||||||
{
|
|
||||||
bool isTop = IsTopPopup(popupUi);
|
|
||||||
popupUi.SetUiInteractable(isTop);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user