메뉴 Ui 2차 완성
This commit is contained in:
parent
4f735d3910
commit
9b9e5c1a9b
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 8555062a9ad218c43b5db38e9558d90d
|
guid: 70ba574d65bf7cb44b95e74fa7add7ac
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: d2637777b5909ff43bfb2d245ed4ab1d
|
guid: efc3b41c9836b5c45a7b1be3cb846bbc
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 9100000
|
mainObjectFileID: 9100000
|
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 809b7de4a8731ef408cdee91df3121b4
|
guid: 778cc67ede0cadb4087ad9199c327ff2
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 1fd990515ca2e2848989d9a4a7a4ce50
|
guid: f4d962d603a720241a76750fc7b19d07
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 9100000
|
mainObjectFileID: 9100000
|
@ -383,11 +383,11 @@ AnimatorStateMachine:
|
|||||||
m_Position: {x: 340, y: 260, z: 0}
|
m_Position: {x: 340, y: 260, z: 0}
|
||||||
m_ChildStateMachines: []
|
m_ChildStateMachines: []
|
||||||
m_AnyStateTransitions:
|
m_AnyStateTransitions:
|
||||||
- {fileID: -8454442321133926692}
|
|
||||||
- {fileID: 5688398759945136006}
|
|
||||||
- {fileID: -2947644494943107051}
|
|
||||||
- {fileID: 814151823820984193}
|
|
||||||
- {fileID: 768286118201508997}
|
- {fileID: 768286118201508997}
|
||||||
|
- {fileID: 814151823820984193}
|
||||||
|
- {fileID: -2947644494943107051}
|
||||||
|
- {fileID: 5688398759945136006}
|
||||||
|
- {fileID: -8454442321133926692}
|
||||||
m_EntryTransitions: []
|
m_EntryTransitions: []
|
||||||
m_StateMachineTransitions: {}
|
m_StateMachineTransitions: {}
|
||||||
m_StateMachineBehaviours: []
|
m_StateMachineBehaviours: []
|
||||||
@ -444,7 +444,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.8980393
|
value: 0.92549
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -474,7 +474,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.8588236
|
value: 0.84314
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -504,7 +504,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.6
|
value: 0.3
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -605,15 +605,6 @@ AnimationClip:
|
|||||||
isPPtrCurve: 0
|
isPPtrCurve: 0
|
||||||
isIntCurve: 0
|
isIntCurve: 0
|
||||||
isSerializeReferenceCurve: 0
|
isSerializeReferenceCurve: 0
|
||||||
- serializedVersion: 2
|
|
||||||
path: 94248739
|
|
||||||
attribute: 2086281974
|
|
||||||
script: {fileID: 0}
|
|
||||||
typeID: 1
|
|
||||||
customType: 0
|
|
||||||
isPPtrCurve: 0
|
|
||||||
isIntCurve: 0
|
|
||||||
isSerializeReferenceCurve: 0
|
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
path: 4080383872
|
path: 4080383872
|
||||||
attribute: 2526845255
|
attribute: 2526845255
|
||||||
@ -641,6 +632,15 @@ AnimationClip:
|
|||||||
isPPtrCurve: 0
|
isPPtrCurve: 0
|
||||||
isIntCurve: 0
|
isIntCurve: 0
|
||||||
isSerializeReferenceCurve: 0
|
isSerializeReferenceCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 94248739
|
||||||
|
attribute: 2086281974
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 1
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
isIntCurve: 0
|
||||||
|
isSerializeReferenceCurve: 0
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
path: 4080383872
|
path: 4080383872
|
||||||
attribute: 304273561
|
attribute: 304273561
|
||||||
@ -678,7 +678,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.8980393
|
value: 0.92549
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -708,7 +708,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.8588236
|
value: 0.84314
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -738,7 +738,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.6
|
value: 0.3
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -1016,7 +1016,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.8980393
|
value: 0.9254903
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -1037,7 +1037,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.8588236
|
value: 0.8431373
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -1058,7 +1058,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.7176471
|
value: 0.5333334
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -1196,7 +1196,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.8980393
|
value: 0.9254903
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -1217,7 +1217,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.8588236
|
value: 0.8431373
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -1238,7 +1238,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.7176471
|
value: 0.5333334
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -1364,12 +1364,6 @@ AnimatorController:
|
|||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 9100000}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: CanDisable
|
|
||||||
m_Type: 4
|
|
||||||
m_DefaultFloat: 0
|
|
||||||
m_DefaultInt: 0
|
|
||||||
m_DefaultBool: 0
|
|
||||||
m_Controller: {fileID: 9100000}
|
|
||||||
m_AnimatorLayers:
|
m_AnimatorLayers:
|
||||||
- serializedVersion: 5
|
- serializedVersion: 5
|
||||||
m_Name: Base Layer
|
m_Name: Base Layer
|
||||||
@ -1391,9 +1385,6 @@ AnimatorStateTransition:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_Conditions:
|
m_Conditions:
|
||||||
- m_ConditionMode: 1
|
|
||||||
m_ConditionEvent: CanDisable
|
|
||||||
m_EventTreshold: 0
|
|
||||||
- m_ConditionMode: 1
|
- m_ConditionMode: 1
|
||||||
m_ConditionEvent: Disabled
|
m_ConditionEvent: Disabled
|
||||||
m_EventTreshold: 0
|
m_EventTreshold: 0
|
||||||
@ -1499,6 +1490,90 @@ AnimationClip:
|
|||||||
classID: 1
|
classID: 1
|
||||||
script: {fileID: 0}
|
script: {fileID: 0}
|
||||||
flags: 16
|
flags: 16
|
||||||
|
- serializedVersion: 2
|
||||||
|
curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0.5529412
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Color.r
|
||||||
|
path: Background
|
||||||
|
classID: 114
|
||||||
|
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
flags: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0.5254902
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Color.g
|
||||||
|
path: Background
|
||||||
|
classID: 114
|
||||||
|
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
flags: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0.4470589
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Color.b
|
||||||
|
path: Background
|
||||||
|
classID: 114
|
||||||
|
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
flags: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Color.a
|
||||||
|
path: Background
|
||||||
|
classID: 114
|
||||||
|
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
flags: 0
|
||||||
m_PPtrCurves: []
|
m_PPtrCurves: []
|
||||||
m_SampleRate: 60
|
m_SampleRate: 60
|
||||||
m_WrapMode: 0
|
m_WrapMode: 0
|
||||||
@ -1516,6 +1591,42 @@ AnimationClip:
|
|||||||
isPPtrCurve: 0
|
isPPtrCurve: 0
|
||||||
isIntCurve: 0
|
isIntCurve: 0
|
||||||
isSerializeReferenceCurve: 0
|
isSerializeReferenceCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 4080383872
|
||||||
|
attribute: 2526845255
|
||||||
|
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
typeID: 114
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
isIntCurve: 0
|
||||||
|
isSerializeReferenceCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 4080383872
|
||||||
|
attribute: 4215373228
|
||||||
|
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
typeID: 114
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
isIntCurve: 0
|
||||||
|
isSerializeReferenceCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 4080383872
|
||||||
|
attribute: 2334886179
|
||||||
|
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
typeID: 114
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
isIntCurve: 0
|
||||||
|
isSerializeReferenceCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 4080383872
|
||||||
|
attribute: 304273561
|
||||||
|
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
typeID: 114
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
isIntCurve: 0
|
||||||
|
isSerializeReferenceCurve: 0
|
||||||
pptrCurveMapping: []
|
pptrCurveMapping: []
|
||||||
m_AnimationClipSettings:
|
m_AnimationClipSettings:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
@ -1559,6 +1670,90 @@ AnimationClip:
|
|||||||
classID: 1
|
classID: 1
|
||||||
script: {fileID: 0}
|
script: {fileID: 0}
|
||||||
flags: 16
|
flags: 16
|
||||||
|
- serializedVersion: 2
|
||||||
|
curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0.5529412
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Color.r
|
||||||
|
path: Background
|
||||||
|
classID: 114
|
||||||
|
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
flags: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0.5254902
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Color.g
|
||||||
|
path: Background
|
||||||
|
classID: 114
|
||||||
|
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
flags: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0.4470589
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Color.b
|
||||||
|
path: Background
|
||||||
|
classID: 114
|
||||||
|
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
flags: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Color.a
|
||||||
|
path: Background
|
||||||
|
classID: 114
|
||||||
|
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
flags: 0
|
||||||
m_EulerEditorCurves: []
|
m_EulerEditorCurves: []
|
||||||
m_HasGenericRootTransform: 0
|
m_HasGenericRootTransform: 0
|
||||||
m_HasMotionFloatCurves: 0
|
m_HasMotionFloatCurves: 0
|
||||||
@ -1612,7 +1807,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.8980393
|
value: 0.92549
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -1633,7 +1828,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.8588236
|
value: 0.84314
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -1654,7 +1849,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.6
|
value: 0.4
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -1792,7 +1987,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.8980393
|
value: 0.92549
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -1813,7 +2008,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.8588236
|
value: 0.84314
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
@ -1834,7 +2029,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 0.6
|
value: 0.4
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
|
@ -85,6 +85,7 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 3617399278284653010}
|
- component: {fileID: 3617399278284653010}
|
||||||
- component: {fileID: 2189377788458160067}
|
- component: {fileID: 2189377788458160067}
|
||||||
|
- component: {fileID: 2590324484831684139}
|
||||||
- component: {fileID: 3603366765358479645}
|
- component: {fileID: 3603366765358479645}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: TabButtonUi
|
m_Name: TabButtonUi
|
||||||
@ -134,7 +135,7 @@ MonoBehaviour:
|
|||||||
m_SelectOnDown: {fileID: 0}
|
m_SelectOnDown: {fileID: 0}
|
||||||
m_SelectOnLeft: {fileID: 0}
|
m_SelectOnLeft: {fileID: 0}
|
||||||
m_SelectOnRight: {fileID: 0}
|
m_SelectOnRight: {fileID: 0}
|
||||||
m_Transition: 1
|
m_Transition: 3
|
||||||
m_Colors:
|
m_Colors:
|
||||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
@ -159,6 +160,28 @@ MonoBehaviour:
|
|||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
--- !u!95 &2590324484831684139
|
||||||
|
Animator:
|
||||||
|
serializedVersion: 7
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2992539917763278728}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Avatar: {fileID: 0}
|
||||||
|
m_Controller: {fileID: 0}
|
||||||
|
m_CullingMode: 0
|
||||||
|
m_UpdateMode: 0
|
||||||
|
m_ApplyRootMotion: 0
|
||||||
|
m_LinearVelocityBlending: 0
|
||||||
|
m_StabilizeFeet: 0
|
||||||
|
m_AnimatePhysics: 0
|
||||||
|
m_WarningMessage:
|
||||||
|
m_HasTransformHierarchy: 1
|
||||||
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
|
m_KeepAnimatorStateOnDisable: 0
|
||||||
|
m_WriteDefaultValuesOnDisable: 0
|
||||||
--- !u!114 &3603366765358479645
|
--- !u!114 &3603366765358479645
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -272,7 +295,7 @@ MonoBehaviour:
|
|||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 32
|
m_fontSize: 17.45
|
||||||
m_fontSizeBase: 36
|
m_fontSizeBase: 36
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 1
|
m_enableAutoSizing: 1
|
||||||
|
@ -6149,6 +6149,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: ItemSlotUi_006
|
value: ItemSlotUi_006
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8864952879369828923, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: 077fbb30d2367574db4211e2945acda0, type: 2}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
@ -6223,6 +6227,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Colors.m_HighlightedColor.r
|
propertyPath: m_Colors.m_HighlightedColor.r
|
||||||
value: 0.8862745
|
value: 0.8862745
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: efc3b41c9836b5c45a7b1be3cb846bbc, type: 2}
|
||||||
- target: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
- target: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: FoodCategoryTabButtonUi
|
value: FoodCategoryTabButtonUi
|
||||||
@ -6337,6 +6345,11 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
--- !u!95 &2615890409481915537 stripped
|
||||||
|
Animator:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 558213338260499130}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &3330569300121623858 stripped
|
--- !u!1 &3330569300121623858 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
m_CorrespondingSourceObject: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
@ -6356,6 +6369,7 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
<TabType>k__BackingField: 1
|
<TabType>k__BackingField: 1
|
||||||
_button: {fileID: 1863671579461494137}
|
_button: {fileID: 1863671579461494137}
|
||||||
|
_animator: {fileID: 2615890409481915537}
|
||||||
_label: {fileID: 1628919949471468038}
|
_label: {fileID: 1628919949471468038}
|
||||||
_content: {fileID: 0}
|
_content: {fileID: 0}
|
||||||
--- !u!224 &3858662839343360872 stripped
|
--- !u!224 &3858662839343360872 stripped
|
||||||
@ -6431,6 +6445,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Colors.m_HighlightedColor.r
|
propertyPath: m_Colors.m_HighlightedColor.r
|
||||||
value: 0.8862745
|
value: 0.8862745
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: f4d962d603a720241a76750fc7b19d07, type: 2}
|
||||||
- target: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
- target: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: SelectCookwareTabUi
|
value: SelectCookwareTabUi
|
||||||
@ -6564,6 +6582,11 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
--- !u!95 &2602526528440882021 stripped
|
||||||
|
Animator:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 571014268529177934}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &3344772923291894470 stripped
|
--- !u!1 &3344772923291894470 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
m_CorrespondingSourceObject: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
@ -6583,6 +6606,7 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
<TabType>k__BackingField: 2
|
<TabType>k__BackingField: 2
|
||||||
_button: {fileID: 1841581973000272525}
|
_button: {fileID: 1841581973000272525}
|
||||||
|
_animator: {fileID: 2602526528440882021}
|
||||||
_label: {fileID: 1641734074151327218}
|
_label: {fileID: 1641734074151327218}
|
||||||
_content: {fileID: 0}
|
_content: {fileID: 0}
|
||||||
--- !u!114 &7658427862910281593
|
--- !u!114 &7658427862910281593
|
||||||
@ -7082,6 +7106,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Colors.m_HighlightedColor.r
|
propertyPath: m_Colors.m_HighlightedColor.r
|
||||||
value: 0.8862745
|
value: 0.8862745
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: f4d962d603a720241a76750fc7b19d07, type: 2}
|
||||||
- target: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
- target: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: SelectWorkerTabUi
|
value: SelectWorkerTabUi
|
||||||
@ -7243,6 +7271,7 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
<TabType>k__BackingField: 3
|
<TabType>k__BackingField: 3
|
||||||
_button: {fileID: 343205834950205782}
|
_button: {fileID: 343205834950205782}
|
||||||
|
_animator: {fileID: 4130886049805240510}
|
||||||
_label: {fileID: 830156148325486121}
|
_label: {fileID: 830156148325486121}
|
||||||
_content: {fileID: 0}
|
_content: {fileID: 0}
|
||||||
--- !u!114 &7478346035653633187
|
--- !u!114 &7478346035653633187
|
||||||
@ -7257,6 +7286,11 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 37b490a176da437291e2868e4bfe5a9b, type: 3}
|
m_Script: {fileID: 11500000, guid: 37b490a176da437291e2868e4bfe5a9b, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
--- !u!95 &4130886049805240510 stripped
|
||||||
|
Animator:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 1918943132907581077}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &2506498378272639449
|
--- !u!1001 &2506498378272639449
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -7349,6 +7383,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: ItemSlotUi_002
|
value: ItemSlotUi_002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8864952879369828923, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: 077fbb30d2367574db4211e2945acda0, type: 2}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
@ -7765,6 +7803,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: ItemSlotUi_004
|
value: ItemSlotUi_004
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8864952879369828923, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: 077fbb30d2367574db4211e2945acda0, type: 2}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
@ -7969,6 +8011,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: ItemSlotUi_005
|
value: ItemSlotUi_005
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8864952879369828923, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: 077fbb30d2367574db4211e2945acda0, type: 2}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
@ -8373,6 +8419,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Colors.m_HighlightedColor.r
|
propertyPath: m_Colors.m_HighlightedColor.r
|
||||||
value: 0.8862745
|
value: 0.8862745
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: f4d962d603a720241a76750fc7b19d07, type: 2}
|
||||||
- target: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
- target: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: SelectMenuTabUi
|
value: SelectMenuTabUi
|
||||||
@ -8529,6 +8579,7 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
<TabType>k__BackingField: 1
|
<TabType>k__BackingField: 1
|
||||||
_button: {fileID: 6292457363810770522}
|
_button: {fileID: 6292457363810770522}
|
||||||
|
_animator: {fileID: 7693231975149418418}
|
||||||
_label: {fileID: 6347064870059061541}
|
_label: {fileID: 6347064870059061541}
|
||||||
_content: {fileID: 3623547258794563387}
|
_content: {fileID: 3623547258794563387}
|
||||||
--- !u!114 &7919307604414184462
|
--- !u!114 &7919307604414184462
|
||||||
@ -8543,6 +8594,11 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 37b490a176da437291e2868e4bfe5a9b, type: 3}
|
m_Script: {fileID: 11500000, guid: 37b490a176da437291e2868e4bfe5a9b, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
--- !u!95 &7693231975149418418 stripped
|
||||||
|
Animator:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 5274128432351318425}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!224 &8863896226978844747 stripped
|
--- !u!224 &8863896226978844747 stripped
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_CorrespondingSourceObject: {fileID: 3617399278284653010, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
m_CorrespondingSourceObject: {fileID: 3617399278284653010, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
@ -9010,6 +9066,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: ItemSlotUi_001
|
value: ItemSlotUi_001
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8864952879369828923, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: 077fbb30d2367574db4211e2945acda0, type: 2}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
@ -9214,6 +9274,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: ItemSlotUi
|
value: ItemSlotUi
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8864952879369828923, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: 077fbb30d2367574db4211e2945acda0, type: 2}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
@ -9510,6 +9574,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: ItemSlotUi_003
|
value: ItemSlotUi_003
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8864952879369828923, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: 077fbb30d2367574db4211e2945acda0, type: 2}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
@ -10098,6 +10166,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: ItemSlotUi_007
|
value: ItemSlotUi_007
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8864952879369828923, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: 077fbb30d2367574db4211e2945acda0, type: 2}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
@ -10676,6 +10748,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Colors.m_HighlightedColor.r
|
propertyPath: m_Colors.m_HighlightedColor.r
|
||||||
value: 0.8862745
|
value: 0.8862745
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: efc3b41c9836b5c45a7b1be3cb846bbc, type: 2}
|
||||||
- target: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
- target: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: IngredientCategoryTabButtonUi
|
value: IngredientCategoryTabButtonUi
|
||||||
@ -10792,8 +10868,14 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
<TabType>k__BackingField: 3
|
<TabType>k__BackingField: 3
|
||||||
_button: {fileID: 7481438563357104822}
|
_button: {fileID: 7481438563357104822}
|
||||||
|
_animator: {fileID: 6504321178583266142}
|
||||||
_label: {fileID: 7536045829221479881}
|
_label: {fileID: 7536045829221479881}
|
||||||
_content: {fileID: 0}
|
_content: {fileID: 0}
|
||||||
|
--- !u!95 &6504321178583266142 stripped
|
||||||
|
Animator:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 8768882049032574325}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!114 &7481438563357104822 stripped
|
--- !u!114 &7481438563357104822 stripped
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_CorrespondingSourceObject: {fileID: 2189377788458160067, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
m_CorrespondingSourceObject: {fileID: 2189377788458160067, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
@ -10880,6 +10962,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Colors.m_HighlightedColor.r
|
propertyPath: m_Colors.m_HighlightedColor.r
|
||||||
value: 0.8862745
|
value: 0.8862745
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: efc3b41c9836b5c45a7b1be3cb846bbc, type: 2}
|
||||||
- target: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
- target: {fileID: 2992539917763278728, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: DrinkCategoryTabButtonUi
|
value: DrinkCategoryTabButtonUi
|
||||||
@ -10996,8 +11082,14 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
<TabType>k__BackingField: 2
|
<TabType>k__BackingField: 2
|
||||||
_button: {fileID: 7230843789697220428}
|
_button: {fileID: 7230843789697220428}
|
||||||
|
_animator: {fileID: 6469855202218579620}
|
||||||
_label: {fileID: 7718922786118144051}
|
_label: {fileID: 7718922786118144051}
|
||||||
_content: {fileID: 0}
|
_content: {fileID: 0}
|
||||||
|
--- !u!95 &6469855202218579620 stripped
|
||||||
|
Animator:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 8807674599208661135}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!114 &7230843789697220428 stripped
|
--- !u!114 &7230843789697220428 stripped
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_CorrespondingSourceObject: {fileID: 2189377788458160067, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
m_CorrespondingSourceObject: {fileID: 2189377788458160067, guid: d11d5cf80be02d7469f07db925af284a, type: 3}
|
||||||
|
@ -104,7 +104,7 @@ public static void ReleaseAllCached()
|
|||||||
if (handle.IsValid())
|
if (handle.IsValid())
|
||||||
{
|
{
|
||||||
Addressables.Release(handle);
|
Addressables.Release(handle);
|
||||||
Debug.Log($"[AssetManager] Released handle for key: {kvp.Key}");
|
//Debug.Log($"[AssetManager] Released handle for key: {kvp.Key}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_cachedHandles.Clear();
|
_cachedHandles.Clear();
|
||||||
|
@ -19,8 +19,6 @@ public class RestaurantManagementSo : GameFlowTask
|
|||||||
[Title("오늘의 메뉴")]
|
[Title("오늘의 메뉴")]
|
||||||
public int MaxFoodCount = 8;
|
public int MaxFoodCount = 8;
|
||||||
public int MaxDrinkCount = 6;
|
public int MaxDrinkCount = 6;
|
||||||
public Color EmptyBackgroundColor = Color.magenta;
|
|
||||||
public Color AddedBackgroundColor = Color.magenta;
|
|
||||||
|
|
||||||
private Dictionary<string, int> _foodRecipeIds = new();
|
private Dictionary<string, int> _foodRecipeIds = new();
|
||||||
private Dictionary<string, int> _drinkRecipeIds = new();
|
private Dictionary<string, int> _drinkRecipeIds = new();
|
||||||
|
@ -25,12 +25,11 @@ public async Task Initialize(ItemViewModel model, IItemSlotUiStrategy strategy)
|
|||||||
Model = model;
|
Model = model;
|
||||||
Strategy = strategy;
|
Strategy = strategy;
|
||||||
|
|
||||||
await Strategy.Setup(this, model);
|
|
||||||
var controller = await strategy.GetAnimatorController();
|
var controller = await strategy.GetAnimatorController();
|
||||||
_animator.runtimeAnimatorController = controller;
|
_animator.runtimeAnimatorController = controller;
|
||||||
|
await Strategy.Setup(this, model);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetBackgroundColor(Color color) => _backgroundImage.color = color;
|
|
||||||
public void SetIcon(Sprite sprite) => _icon.sprite = sprite;
|
public void SetIcon(Sprite sprite) => _icon.sprite = sprite;
|
||||||
public void SetCount(int count)
|
public void SetCount(int count)
|
||||||
{
|
{
|
||||||
@ -46,7 +45,6 @@ public void ShowMark(Sprite sprite)
|
|||||||
}
|
}
|
||||||
public void HideMark() => _markImage.gameObject.SetActive(false);
|
public void HideMark() => _markImage.gameObject.SetActive(false);
|
||||||
public void SetButtonInteractable(bool interactable) => _button.interactable = interactable;
|
public void SetButtonInteractable(bool interactable) => _button.interactable = interactable;
|
||||||
|
|
||||||
public void SetActive(bool value) => gameObject.SetActive(value);
|
public void SetActive(bool value) => gameObject.SetActive(value);
|
||||||
public void OnSelect(BaseEventData eventData)
|
public void OnSelect(BaseEventData eventData)
|
||||||
{
|
{
|
||||||
|
@ -22,12 +22,12 @@ protected override GameObject GetInitialSelected()
|
|||||||
|
|
||||||
public async override void Open()
|
public async override void Open()
|
||||||
{
|
{
|
||||||
|
base.Open();
|
||||||
|
|
||||||
await _inventoryView.Initialize();
|
await _inventoryView.Initialize();
|
||||||
_sectionTabs.Initialize(OnSectionTabSelected);
|
_sectionTabs.Initialize(OnSectionTabSelected);
|
||||||
_categoryTabs.Initialize(OnCategoryTabSelected);
|
_categoryTabs.Initialize(OnCategoryTabSelected);
|
||||||
EventBus.Register<TodayMenuRemovedEvent>(this);
|
EventBus.Register<TodayMenuRemovedEvent>(this);
|
||||||
|
|
||||||
base.Open();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Close()
|
public override void Close()
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
using System;
|
|
||||||
|
|
||||||
namespace DDD
|
|
||||||
{
|
|
||||||
public interface ITabSelectable<T> where T : Enum
|
|
||||||
{
|
|
||||||
void Initialize(Action<T> onSelected);
|
|
||||||
void SetSelected(bool isSelected);
|
|
||||||
T TabType { get; }
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: a40f6ccd06b5469f831e2fabf8053ba9
|
|
||||||
timeCreated: 1753413038
|
|
@ -21,28 +21,49 @@ public enum InventoryCategoryType
|
|||||||
Ingredient
|
Ingredient
|
||||||
}
|
}
|
||||||
|
|
||||||
public class TabButtonUi<T> : MonoBehaviour, ITabSelectable<T>, IInteractableUi where T : Enum
|
public class TabButtonUi<T> : MonoBehaviour, IInteractableUi where T : Enum
|
||||||
{
|
{
|
||||||
[field: SerializeField] public T TabType { get; private set; }
|
[field: SerializeField] public T TabType { get; private set; }
|
||||||
[SerializeField] private Button _button;
|
[SerializeField] private Button _button;
|
||||||
|
[SerializeField] private Animator _animator;
|
||||||
[SerializeField] private TextMeshProUGUI _label;
|
[SerializeField] private TextMeshProUGUI _label;
|
||||||
[SerializeField] private GameObject _content;
|
[SerializeField] private GameObject _content;
|
||||||
|
|
||||||
private Action<T> _onSelected;
|
private Action<T> _onSelected;
|
||||||
|
private bool _isSelected;
|
||||||
|
|
||||||
|
private void OnEnable()
|
||||||
|
{
|
||||||
|
if (_isSelected)
|
||||||
|
{
|
||||||
|
_animator.SetTrigger(nameof(DefaultAnimatorParams.Selected));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void Initialize(Action<T> onSelected)
|
public void Initialize(Action<T> onSelected)
|
||||||
{
|
{
|
||||||
|
gameObject.SetActive(true);
|
||||||
_onSelected = onSelected;
|
_onSelected = onSelected;
|
||||||
_button.onClick.AddListener(() => _onSelected?.Invoke(TabType));
|
_button.onClick.AddListener(() => _onSelected?.Invoke(TabType));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetSelected(bool isSelected)
|
public void SetSelected(bool isSelected)
|
||||||
{
|
{
|
||||||
|
_isSelected = isSelected;
|
||||||
|
|
||||||
if (_content)
|
if (_content)
|
||||||
{
|
{
|
||||||
_content.SetActive(isSelected);
|
_content.SetActive(isSelected);
|
||||||
}
|
}
|
||||||
_button.interactable = !isSelected;
|
_button.interactable = !_isSelected;
|
||||||
|
if (_isSelected)
|
||||||
|
{
|
||||||
|
_animator.SetTrigger(nameof(DefaultAnimatorParams.Selected));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_animator.SetTrigger(nameof(DefaultAnimatorParams.Normal));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool ButtonIsInteractable => _button != null && _button.interactable;
|
public bool ButtonIsInteractable => _button != null && _button.interactable;
|
||||||
|
@ -34,8 +34,7 @@ public async Task Setup(ItemSlotUi ui, ItemViewModel model)
|
|||||||
{
|
{
|
||||||
emptySpriteKey = SpriteConstants.EmptyDrinkSpriteKey;
|
emptySpriteKey = SpriteConstants.EmptyDrinkSpriteKey;
|
||||||
}
|
}
|
||||||
|
|
||||||
ui.SetBackgroundColor(_restaurantManagementSo.EmptyBackgroundColor);
|
|
||||||
ui.SetIcon(DataManager.Instance.GetSprite(emptySpriteKey));
|
ui.SetIcon(DataManager.Instance.GetSprite(emptySpriteKey));
|
||||||
ui.HideCount();
|
ui.HideCount();
|
||||||
ui.HideMark();
|
ui.HideMark();
|
||||||
@ -43,7 +42,6 @@ public async Task Setup(ItemSlotUi ui, ItemViewModel model)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ui.SetBackgroundColor(_restaurantManagementSo.AddedBackgroundColor);
|
|
||||||
ui.SetIcon(model.ItemSprite);
|
ui.SetIcon(model.ItemSprite);
|
||||||
ui.HideCount();
|
ui.HideCount();
|
||||||
ui.ShowMark(DataManager.Instance.GetSprite(SpriteConstants.CheckNoSpriteKey)); // TODO : 추후에 장비와 매칭
|
ui.ShowMark(DataManager.Instance.GetSprite(SpriteConstants.CheckNoSpriteKey)); // TODO : 추후에 장비와 매칭
|
||||||
|
@ -9,6 +9,15 @@
|
|||||||
|
|
||||||
namespace DDD
|
namespace DDD
|
||||||
{
|
{
|
||||||
|
public enum DefaultAnimatorParams
|
||||||
|
{
|
||||||
|
Normal = 0,
|
||||||
|
Highlighted,
|
||||||
|
Pressed,
|
||||||
|
Selected,
|
||||||
|
Disabled
|
||||||
|
}
|
||||||
|
|
||||||
public static class Utils
|
public static class Utils
|
||||||
{
|
{
|
||||||
public static string FixPath(string path)
|
public static string FixPath(string path)
|
||||||
|
Loading…
Reference in New Issue
Block a user