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

This commit is contained in:
김산 2025-09-01 16:53:15 +09:00
commit dc9bd260d1
54 changed files with 2951 additions and 1847 deletions

BIN
Assets/Settings/PC_Renderer.asset (Stored with Git LFS)

Binary file not shown.

View File

@ -9,7 +9,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1664322405549350652}
- component: {fileID: 8522104897182006738}
m_Layer: 0
m_Name: InteractionPoint
m_TagString: Untagged
@ -26,67 +25,12 @@ Transform:
m_GameObject: {fileID: 3857692527302447930}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.4, y: 0, z: 0}
m_LocalPosition: {x: -0.5, y: -0.165, z: -0.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3697702677815423220}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8522104897182006738
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3857692527302447930}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: c607300554a0c44469620484fccbf239, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 5.12, y: 5.12}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &4103096974375017811
GameObject:
m_ObjectHideFlags: 0
@ -197,7 +141,8 @@ MonoBehaviour:
SerializedFormat: 2
SerializedBytes:
ReferencedUnityObjects:
- {fileID: 2100000, guid: efc890589b4c46948885cd750384bc6f, type: 2}
- {fileID: 2100000, guid: 3420d0083698c4732af621bf37a11cbb, type: 2}
- {fileID: 2100000, guid: cecea4c48dc174e34973ec5b33b2b2a9, type: 2}
SerializedBytesString:
Prefab: {fileID: 0}
PrefabModificationsReferencedUnityObjects: []
@ -222,7 +167,19 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 1
Data: 2
- Name:
Entry: 7
Data:
- Name: $k
Entry: 3
Data: 4
- Name: $v
Entry: 10
Data: 0
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
@ -231,7 +188,7 @@ MonoBehaviour:
Data: 2
- Name: $v
Entry: 10
Data: 0
Data: 1
- Name:
Entry: 8
Data:
@ -241,7 +198,12 @@ MonoBehaviour:
- Name:
Entry: 8
Data:
_temporarySprite: {fileID: 21300000, guid: deef7d28045284f449ec0c47e1cbbcdc, type: 3}
_rotation: {x: 40, y: 0, z: 0}
_defaultSprite: {fileID: 21300000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3}
_offset: {x: 0, y: 1.5, z: 1.35}
_disabledOffset: {x: 0, y: 0.2, z: 0.165}
_fixedLocalScale: {x: 0.3, y: 0.3}
_disabledColor: {r: 0.6627451, g: 0.6627451, b: 0.6627451, a: 0.65882355}
--- !u!114 &1332098886975329103
MonoBehaviour:
m_ObjectHideFlags: 0
@ -249,18 +211,18 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4103096974375017811}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f0feb22ab60a4d1885271637838f43b9, type: 3}
m_Name:
m_EditorClassIdentifier:
_availableStyle:
Color: {r: 1, g: 1, b: 1, a: 1}
Width: 1
Width: 0.5
Opacity: 1
_focusedStyle:
Color: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
Width: 1
Width: 0.5
Opacity: 1
_unavailableStyle:
Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
@ -268,7 +230,7 @@ MonoBehaviour:
Opacity: 1
_objectiveStyle:
Color: {r: 0, g: 1, b: 1, a: 1}
Width: 1
Width: 0.5
Opacity: 1
_breathingSpeed: 2
_breathingRange: 0.3
@ -476,7 +438,7 @@ MonoBehaviour:
seeThroughTextureUVSpace: 0
seeThroughTextureScale: 1
seeThroughChildrenSortingMode: 0
rmsCount: 1
rmsCount: 0
hitFxInitialIntensity: 0
hitFxMode: 0
hitFxFadeOutDuration: 0.25

View File

@ -8,17 +8,69 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 8881739536043914635}
m_Modifications:
- target: {fileID: 29040892075516248, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 29040892075516248, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalPosition.x
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalPosition.y
value: -0.165
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalPosition.z
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_Radius
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_Center.x
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_Center.y
value: -0.165
objectReference: {fileID: 0}
- target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_Center.z
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalPosition.x
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalPosition.y
value: 0.25
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalPosition.z
value: 0.2
value: 0.165
objectReference: {fileID: 0}
- target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalRotation.w
@ -70,17 +122,69 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 8881739536043914635}
m_Modifications:
- target: {fileID: 29040892075516248, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 29040892075516248, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalPosition.x
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalPosition.y
value: -0.165
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalPosition.z
value: -0.1
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_Radius
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_Center.x
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_Center.y
value: -0.165
objectReference: {fileID: 0}
- target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_Center.z
value: -0.1
objectReference: {fileID: 0}
- target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalPosition.x
value: -0.2
objectReference: {fileID: 0}
- target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalPosition.y
value: 0.25
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalPosition.z
value: 0.2
value: 0.165
objectReference: {fileID: 0}
- target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3}
propertyPath: m_LocalRotation.w

View File

@ -84,6 +84,18 @@ PrefabInstance:
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 094899c1afd763f459f6a1f461cba5c5, type: 2}
- target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_Size.x
value: 0.99
objectReference: {fileID: 0}
- target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_Size.z
value: 0.34
objectReference: {fileID: 0}
- target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_Center.z
value: 0.14
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

View File

@ -1,5 +1,135 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6763219558441662797
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9059377735625185194}
- component: {fileID: 5304993695204765191}
- component: {fileID: 1500344406833374910}
- component: {fileID: 4890633252512986786}
m_Layer: 0
m_Name: Spine GameObject (OpenSwitch)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9059377735625185194
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6763219558441662797}
serializedVersion: 2
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 8881739536043914635}
m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
--- !u!33 &5304993695204765191
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6763219558441662797}
m_Mesh: {fileID: 0}
--- !u!23 &1500344406833374910
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6763219558441662797}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a287e4cf739397e41a00b772a97fc1f7, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &4890633252512986786
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6763219558441662797}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3}
m_Name:
m_EditorClassIdentifier:
skeletonDataAsset: {fileID: 11400000, guid: d89793e4ce0651c4885db355edd439d1, type: 2}
initialSkinName:
fixPrefabOverrideViaMeshFilter: 2
initialFlipX: 0
initialFlipY: 0
updateWhenInvisible: 3
separatorSlotNames: []
zSpacing: 0
useClipping: 1
immutableTriangles: 0
pmaVertexColors: 1
clearStateOnDisable: 0
tintBlack: 0
singleSubmesh: 0
fixDrawOrder: 0
addNormals: 0
calculateTangents: 0
maskInteraction: 0
maskMaterials:
materialsMaskDisabled: []
materialsInsideMask: []
materialsOutsideMask: []
disableRenderingOnOverride: 1
physicsPositionInheritanceFactor: {x: 1, y: 1}
physicsRotationInheritanceFactor: 1
physicsMovementRelativeTo: {fileID: 0}
updateTiming: 1
unscaledTime: 0
_animationName: Idle
loop: 1
timeScale: 1
--- !u!1001 &4777358697124966162
PrefabInstance:
m_ObjectHideFlags: 0
@ -10,15 +140,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalScale.x
value: 2
value: 4
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalScale.y
value: 2
value: 4
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalScale.z
value: 2
value: 4
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalPosition.x
@ -72,6 +202,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
@ -98,11 +232,14 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_IsTrigger
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 4111453722694982297, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
insertIndex: 0
addedObject: {fileID: 9059377735625185194}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
insertIndex: -1
@ -117,6 +254,11 @@ PrefabInstance:
insertIndex: -1
addedObject: {fileID: -4132148316966952702}
m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
--- !u!4 &8881739536043914635 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4111453722694982297, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
m_PrefabInstance: {fileID: 4777358697124966162}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9211739394093953175 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
@ -137,12 +279,12 @@ MonoBehaviour:
_interactionType: 1
_executionParameters:
_holdTime: 0.1
_holdTime: 0.5
_displayParameters:
_messageKey: Test
<DefaultMessageKey>k__BackingField:
<ConditionalMessageKey>k__BackingField:
_interactionAvailableFlows: 1
_aiInteractionPoints: []
autoInitialize: 1
_autoInitialize: 1
--- !u!114 &3538352761187622062
MonoBehaviour:
m_ObjectHideFlags: 0
@ -337,7 +479,7 @@ MonoBehaviour:
seeThroughTextureUVSpace: 0
seeThroughTextureScale: 1
seeThroughChildrenSortingMode: 0
rmsCount: 1
rmsCount: 2
hitFxInitialIntensity: 0
hitFxMode: 0
hitFxFadeOutDuration: 0.25
@ -396,4 +538,3 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_managementType: 1
_cookwareType: 0

View File

@ -84,6 +84,22 @@ PrefabInstance:
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 9c408af9e1c239947b295321f1a3332f, type: 2}
- target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_Size.x
value: 0.87
objectReference: {fileID: 0}
- target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_Size.y
value: 0.95
objectReference: {fileID: 0}
- target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_Size.z
value: 0.38
objectReference: {fileID: 0}
- target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_Center.z
value: 0.2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

View File

@ -1,75 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &4777358697124966162
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_Name
value: Prop_Stove
objectReference: {fileID: 0}
- target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 9edeb757fc5945643b08f5fd6f0352ea, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}

View File

@ -1,151 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3789712415343660289
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Stove
m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHATEST_ON
- _METALLICSPECGLOSSMAP
- _NORMALMAP
- _OCCLUSIONMAP
- _PARALLAXMAP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: c2293cf2323eb61449d39a8b130d5dd9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 1
- _AlphaToMask: 1
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _CastShadows: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EMISSION: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _METALLICSPECGLOSSMAP: 1
- _Metallic: 0
- _NORMALMAP: 1
- _OCCLUSIONMAP: 1
- _OcclusionStrength: 1
- _PARALLAXMAP: 1
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _XRMotionVectorsPass: 1
- _ZTest: 4
- _ZWrite: 1
- _ZWriteControl: 0
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

Binary file not shown.

View File

@ -105,6 +105,7 @@ Material:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 1
- _AlphaToMask: 1
- _ApplyGI: 1
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
@ -119,6 +120,7 @@ Material:
- _DstBlendAlpha: 0
- _EMISSION: 0
- _EnvironmentReflections: 1
- _GlobalIlluminationIntensity: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0

View File

@ -42,15 +42,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalScale.x
value: 1.4999999
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalScale.y
value: 1.4999999
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalScale.z
value: 1.4999999
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

View File

@ -0,0 +1,82 @@
OpenSwitch.png
size:695,1035
filter:Linear,Linear
scale:0.5
Eyelight
bounds:220,537,91,58
rotate:90
Fire01
bounds:220,495,53,40
Fire02
bounds:222,726,88,70
Fire03
bounds:163,223,105,101
rotate:90
Fire04
bounds:338,18,111,120
Fire05
bounds:338,140,112,139
rotate:90
Fire06
bounds:2,208,120,159
rotate:90
Fire07
bounds:479,22,142,184
Fire08
bounds:2,2,132,204
Fire09
bounds:481,208,166,208
rotate:90
Fire10
bounds:312,566,159,217
rotate:90
Fire11
bounds:2,644,152,218
rotate:90
Fire12
bounds:267,254,154,212
rotate:90
Fire13
bounds:2,490,152,216
rotate:90
Fire14
bounds:531,376,159,213
Fire15
bounds:539,591,154,214
Fire16
bounds:2,330,158,213
rotate:90
Fire17
bounds:280,410,154,214
rotate:90
Fire18
bounds:542,807,146,226
Fire19
bounds:313,886,147,227
rotate:90
Fire20
bounds:313,727,157,224
rotate:90
ribbon01
bounds:280,578,50,29
rotate:90
ribbon02
bounds:623,102,37,104
ribbon03
bounds:222,678,46,86
rotate:90
ribbon04
bounds:222,630,46,86
rotate:90
switch01
bounds:2,798,235,309
rotate:90
switch02
bounds:136,7,199,99
rotate:90
switch03
bounds:237,7,199,99
rotate:90
switchknob
bounds:220,357,136,45
rotate:90

View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: d6177bb7c30e785488ac32b61897d2af
PrefabImporter:
guid: adc192fc97d879747bb8eea1c1f00ad8
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:

View File

@ -1,69 +1,82 @@
OpenSwitch.png
size:1992,1408
size:695,1035
filter:Linear,Linear
scale:0.5
Eyelight
bounds:650,841,182,115
Fire01
bounds:834,865,106,79
bounds:220,537,91,58
rotate:90
Fire01
bounds:220,495,53,40
Fire02
bounds:473,816,175,140
bounds:222,726,88,70
Fire03
bounds:1642,42,210,201
bounds:163,223,105,101
rotate:90
Fire04
bounds:1761,262,221,240
bounds:338,18,111,120
Fire05
bounds:1761,504,223,277
bounds:338,140,112,139
rotate:90
Fire06
bounds:1519,463,240,318
bounds:2,208,120,159
rotate:90
Fire07
bounds:847,8,284,368
bounds:479,22,142,184
Fire08
bounds:1727,998,263,408
bounds:2,2,132,204
Fire09
bounds:430,2,332,415
bounds:481,208,166,208
rotate:90
Fire10
bounds:788,973,317,433
Fire11
bounds:592,378,303,436
Fire12
bounds:1417,982,308,424
Fire13
bounds:897,432,303,431
Fire14
bounds:2,13,318,426
bounds:312,566,159,217
rotate:90
Fire11
bounds:2,644,152,218
rotate:90
Fire12
bounds:267,254,154,212
rotate:90
Fire13
bounds:2,490,152,216
rotate:90
Fire14
bounds:531,376,159,213
Fire15
bounds:1133,2,308,428
bounds:539,591,154,214
Fire16
bounds:1202,456,315,426
bounds:2,330,158,213
rotate:90
Fire17
bounds:1107,978,308,428
bounds:280,410,154,214
rotate:90
Fire18
bounds:298,336,292,451
bounds:542,807,146,226
Fire19
bounds:2,333,294,454
bounds:313,886,147,227
rotate:90
Fire20
bounds:473,958,313,448
bounds:313,727,157,224
rotate:90
ribbon01
bounds:915,871,100,57
bounds:280,578,50,29
rotate:90
ribbon02
bounds:1642,254,74,207
bounds:623,102,37,104
ribbon03
bounds:974,879,92,171
bounds:222,678,46,86
rotate:90
ribbon04
bounds:1147,884,92,171
bounds:222,630,46,86
rotate:90
switch01
bounds:2,789,469,617
bounds:2,798,235,309
rotate:90
switch02
bounds:1593,783,397,197
bounds:136,7,199,99
rotate:90
switch03
bounds:1443,57,397,197
bounds:237,7,199,99
rotate:90
switchknob
bounds:1320,886,271,90
bounds:220,357,136,45
rotate:90

View File

@ -10,15 +10,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalScale.x
value: 2
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalScale.y
value: 2
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalScale.z
value: 2
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_LocalPosition.x
@ -71,7 +71,7 @@ PrefabInstance:
- target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 8735f3d63bc14e74da558970523bd1bd, type: 2}
objectReference: {fileID: 2100000, guid: 6ee848655b3f6b94ebc4f55b95f1b46e, type: 2}
- target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_Size.x
value: 1
@ -126,10 +126,11 @@ MonoBehaviour:
_executionParameters:
_holdTime: 0
_displayParameters:
_messageKey: Test
<DefaultMessageKey>k__BackingField:
<ConditionalMessageKey>k__BackingField:
_interactionAvailableFlows: 1
_aiInteractionPoints: []
autoInitialize: 1
_autoInitialize: 1
--- !u!114 &4545680930728379745
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -218,15 +218,15 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 7d58c54c5eebea647b71bbf633965a5c, type: 2}
- target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_Size.x
value: 1
value: 0.94
objectReference: {fileID: 0}
- target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_Size.z
value: 0.97
value: 0.78
objectReference: {fileID: 0}
- target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3}
propertyPath: m_Center.z
value: 0.34
value: 0.21
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@ -295,10 +295,11 @@ MonoBehaviour:
_executionParameters:
_holdTime: 0
_displayParameters:
_messageKey: Test
<DefaultMessageKey>k__BackingField:
<ConditionalMessageKey>k__BackingField:
_interactionAvailableFlows: 2
_aiInteractionPoints: []
autoInitialize: 1
_autoInitialize: 1
--- !u!114 &276462347427572734
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b3fbe9c062a126149a60f4579f52fa29
guid: af3aa25466d5e442a84ae048b92da1ae
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

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

View File

@ -0,0 +1,368 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SpatialUi_SpriteBubble
m_Shader: {fileID: 4800000, guid: 13c02b14c4d048fa9653293d54f6e0e1, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BackgroundTexture:
m_Texture: {fileID: 2800000, guid: f88e7478e74a14cb6a820978eb9f452f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorRampTex:
m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorRampTexGradient:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorSwapTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DistortTex:
m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FadeBurnTex:
m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FadeTex:
m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _GlowTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OutlineDistortTex:
m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OutlineTex:
m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OverlayTex:
m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ShineMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpriteTexture:
m_Texture: {fileID: 2800000, guid: 7394cfdc5ad4642058b80a859c8a7319, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- PixelSnap: 0
- _AddPrecomputedVelocity: 0
- _Alpha: 1
- _AlphaClip: 0
- _AlphaCutoffValue: 0.25
- _AlphaOutlineBlend: 1
- _AlphaOutlineGlow: 5
- _AlphaOutlineMinAlpha: 0
- _AlphaOutlinePower: 1
- _AlphaRoundThreshold: 0.5
- _AlphaToMask: 0
- _BillboardY: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BlurHD: 0
- _BlurIntensity: 10
- _Brightness: 0
- _BumpScale: 1
- _ChromAberrAlpha: 0.4
- _ChromAberrAmount: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _ClipUvDown: 0
- _ClipUvLeft: 0
- _ClipUvRight: 0
- _ClipUvUp: 0
- _ColorChangeLuminosity: 0
- _ColorChangeTolerance: 0.25
- _ColorChangeTolerance2: 0.25
- _ColorChangeTolerance3: 0.25
- _ColorMask: 15
- _ColorRampBlend: 1
- _ColorRampLuminosity: 0
- _ColorRampOutline: 0
- _ColorSwapBlend: 1
- _ColorSwapBlueLuminosity: 0.5
- _ColorSwapGreenLuminosity: 0.5
- _ColorSwapRedLuminosity: 0.5
- _Contrast: 1
- _Cull: 2
- _CullingOption: 0
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DistortAmount: 0.5
- _DistortTexXSpeed: 5
- _DistortTexYSpeed: 5
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EditorDrawers: 6
- _EnableExternalAlpha: 0
- _EnvironmentReflections: 1
- _FadeAmount: -0.1
- _FadeBurnGlow: 2
- _FadeBurnTransition: 0.075
- _FadeBurnWidth: 0.025
- _FishEyeUvAmount: 0.35
- _FlickerAlpha: 0
- _FlickerFreq: 0.2
- _FlickerPercent: 0.05
- _GhostBlend: 1
- _GhostColorBoost: 1
- _GhostTransparency: 0
- _GlitchAmount: 3
- _GlitchSize: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Glow: 10
- _GlowGlobal: 1
- _GradBlend: 1
- _GradBoostX: 1.2
- _GradBoostY: 1.2
- _GradIsRadial: 0
- _GrassManualAnim: 1
- _GrassManualToggle: 0
- _GrassRadialBend: 0.1
- _GrassSpeed: 2
- _GrassWind: 20
- _GreyscaleBlend: 1
- _GreyscaleLuminosity: 0
- _GreyscaleOutline: 0
- _HandDrawnAmount: 10
- _HandDrawnSpeed: 5
- _HitEffectBlend: 1
- _HitEffectGlow: 5
- _HologramBlend: 1
- _HologramMaxAlpha: 0.75
- _HologramMinAlpha: 0.1
- _HologramStripesAmount: 0.1
- _HologramStripesSpeed: 4.5
- _HologramUnmodAmount: 0
- _HsvBright: 1
- _HsvSaturation: 1
- _HsvShift: 180
- _InnerOutlineAlpha: 1
- _InnerOutlineGlow: 4
- _InnerOutlineThickness: 1
- _MaxXUV: 1
- _MaxYUV: 1
- _Metallic: 0
- _MinXUV: 0
- _MinYUV: 0
- _MotionBlurAngle: 0.1
- _MotionBlurDist: 1.25
- _MyDstMode: 10
- _MySrcMode: 5
- _NegativeAmount: 1
- _OcclusionStrength: 1
- _OffsetUvX: 0
- _OffsetUvY: 0
- _OnlyInnerOutline: 0
- _OnlyOutline: 0
- _OutlineAlpha: 1
- _OutlineDistortAmount: 0.5
- _OutlineDistortTexXSpeed: 5
- _OutlineDistortTexYSpeed: 5
- _OutlineGlow: 1.5
- _OutlinePixelWidth: 1
- _OutlineTexXSpeed: 10
- _OutlineTexYSpeed: 0
- _OutlineWidth: 0.004
- _OverlayBlend: 1
- _OverlayGlow: 1
- _OverlayTextureScrollXSpeed: 0.25
- _OverlayTextureScrollYSpeed: 0.25
- _Parallax: 0.005
- _PinchUvAmount: 0.35
- _PixelateSize: 32
- _PosterizeGamma: 0.75
- _PosterizeNumColors: 8
- _PosterizeOutline: 0
- _QueueOffset: 0
- _RadialClip: 45
- _RadialClip2: 0
- _RadialStartAngle: 90
- _RandomSeed: 0
- _ReceiveShadows: 1
- _RectSize: 1
- _RotateUvAmount: 0
- _RoundWaveSpeed: 2
- _RoundWaveStrength: 0.7
- _ShadowAlpha: 0.5
- _ShadowX: 0.1
- _ShadowY: -0.05
- _ShakeUvSpeed: 2.5
- _ShakeUvX: 1.5
- _ShakeUvY: 1
- _ShineGlow: 1
- _ShineLocation: 0.5
- _ShineRotate: 0
- _ShineWidth: 0.1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _Surface: 0
- _TextureScrollXSpeed: 1
- _TextureScrollYSpeed: 0
- _TwistUvAmount: 1
- _TwistUvPosX: 0.5
- _TwistUvPosY: 0.5
- _TwistUvRadius: 0.75
- _WarpScale: 0.5
- _WarpSpeed: 8
- _WarpStrength: 0.025
- _WaveAmount: 7
- _WaveSpeed: 10
- _WaveStrength: 7.5
- _WaveX: 0
- _WaveY: 0.5
- _WorkflowMode: 1
- _XRMotionVectorsPass: 1
- _ZTestMode: 4
- _ZWrite: 1
- _ZoomUvAmount: 0.5
m_Colors:
- _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1}
- _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1}
- _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1}
- _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1}
- _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1}
- _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1}
- _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1}
- _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1}
- _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _GlowColor: {r: 1, g: 1, b: 1, a: 1}
- _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1}
- _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1}
- _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1}
- _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1}
- _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1}
- _HitEffectColor: {r: 1, g: 1, b: 1, a: 1}
- _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1}
- _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1}
- _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
- _OverlayColor: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
- _ShadowColor: {r: 0, g: 0, b: 0, a: 1}
- _ShineColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &5575994803489782819
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9edeb757fc5945643b08f5fd6f0352ea
guid: cecea4c48dc174e34973ec5b33b2b2a9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View File

@ -0,0 +1,368 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SpatialUi_SpriteBubble_Translucent
m_Shader: {fileID: 4800000, guid: 13c02b14c4d048fa9653293d54f6e0e1, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BackgroundTexture:
m_Texture: {fileID: 2800000, guid: f88e7478e74a14cb6a820978eb9f452f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorRampTex:
m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorRampTexGradient:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorSwapTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DistortTex:
m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FadeBurnTex:
m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FadeTex:
m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _GlowTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OutlineDistortTex:
m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OutlineTex:
m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OverlayTex:
m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ShineMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpriteTexture:
m_Texture: {fileID: 2800000, guid: 7394cfdc5ad4642058b80a859c8a7319, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- PixelSnap: 0
- _AddPrecomputedVelocity: 0
- _Alpha: 1
- _AlphaClip: 0
- _AlphaCutoffValue: 0.25
- _AlphaOutlineBlend: 1
- _AlphaOutlineGlow: 5
- _AlphaOutlineMinAlpha: 0
- _AlphaOutlinePower: 1
- _AlphaRoundThreshold: 0.5
- _AlphaToMask: 0
- _BillboardY: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BlurHD: 0
- _BlurIntensity: 10
- _Brightness: 0
- _BumpScale: 1
- _ChromAberrAlpha: 0.4
- _ChromAberrAmount: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _ClipUvDown: 0
- _ClipUvLeft: 0
- _ClipUvRight: 0
- _ClipUvUp: 0
- _ColorChangeLuminosity: 0
- _ColorChangeTolerance: 0.25
- _ColorChangeTolerance2: 0.25
- _ColorChangeTolerance3: 0.25
- _ColorMask: 15
- _ColorRampBlend: 1
- _ColorRampLuminosity: 0
- _ColorRampOutline: 0
- _ColorSwapBlend: 1
- _ColorSwapBlueLuminosity: 0.5
- _ColorSwapGreenLuminosity: 0.5
- _ColorSwapRedLuminosity: 0.5
- _Contrast: 1
- _Cull: 2
- _CullingOption: 0
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DistortAmount: 0.5
- _DistortTexXSpeed: 5
- _DistortTexYSpeed: 5
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EditorDrawers: 6
- _EnableExternalAlpha: 0
- _EnvironmentReflections: 1
- _FadeAmount: -0.1
- _FadeBurnGlow: 2
- _FadeBurnTransition: 0.075
- _FadeBurnWidth: 0.025
- _FishEyeUvAmount: 0.35
- _FlickerAlpha: 0
- _FlickerFreq: 0.2
- _FlickerPercent: 0.05
- _GhostBlend: 1
- _GhostColorBoost: 1
- _GhostTransparency: 0
- _GlitchAmount: 3
- _GlitchSize: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Glow: 10
- _GlowGlobal: 1
- _GradBlend: 1
- _GradBoostX: 1.2
- _GradBoostY: 1.2
- _GradIsRadial: 0
- _GrassManualAnim: 1
- _GrassManualToggle: 0
- _GrassRadialBend: 0.1
- _GrassSpeed: 2
- _GrassWind: 20
- _GreyscaleBlend: 1
- _GreyscaleLuminosity: 0
- _GreyscaleOutline: 0
- _HandDrawnAmount: 10
- _HandDrawnSpeed: 5
- _HitEffectBlend: 1
- _HitEffectGlow: 5
- _HologramBlend: 1
- _HologramMaxAlpha: 0.75
- _HologramMinAlpha: 0.1
- _HologramStripesAmount: 0.1
- _HologramStripesSpeed: 4.5
- _HologramUnmodAmount: 0
- _HsvBright: 1
- _HsvSaturation: 1
- _HsvShift: 180
- _InnerOutlineAlpha: 1
- _InnerOutlineGlow: 4
- _InnerOutlineThickness: 1
- _MaxXUV: 1
- _MaxYUV: 1
- _Metallic: 0
- _MinXUV: 0
- _MinYUV: 0
- _MotionBlurAngle: 0.1
- _MotionBlurDist: 1.25
- _MyDstMode: 10
- _MySrcMode: 5
- _NegativeAmount: 1
- _OcclusionStrength: 1
- _OffsetUvX: 0
- _OffsetUvY: 0
- _OnlyInnerOutline: 0
- _OnlyOutline: 0
- _OutlineAlpha: 1
- _OutlineDistortAmount: 0.5
- _OutlineDistortTexXSpeed: 5
- _OutlineDistortTexYSpeed: 5
- _OutlineGlow: 1.5
- _OutlinePixelWidth: 1
- _OutlineTexXSpeed: 10
- _OutlineTexYSpeed: 0
- _OutlineWidth: 0.004
- _OverlayBlend: 1
- _OverlayGlow: 1
- _OverlayTextureScrollXSpeed: 0.25
- _OverlayTextureScrollYSpeed: 0.25
- _Parallax: 0.005
- _PinchUvAmount: 0.35
- _PixelateSize: 32
- _PosterizeGamma: 0.75
- _PosterizeNumColors: 8
- _PosterizeOutline: 0
- _QueueOffset: 0
- _RadialClip: 45
- _RadialClip2: 0
- _RadialStartAngle: 90
- _RandomSeed: 0
- _ReceiveShadows: 1
- _RectSize: 1
- _RotateUvAmount: 0
- _RoundWaveSpeed: 2
- _RoundWaveStrength: 0.7
- _ShadowAlpha: 0.5
- _ShadowX: 0.1
- _ShadowY: -0.05
- _ShakeUvSpeed: 2.5
- _ShakeUvX: 1.5
- _ShakeUvY: 1
- _ShineGlow: 1
- _ShineLocation: 0.5
- _ShineRotate: 0
- _ShineWidth: 0.1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _Surface: 0
- _TextureScrollXSpeed: 1
- _TextureScrollYSpeed: 0
- _TwistUvAmount: 1
- _TwistUvPosX: 0.5
- _TwistUvPosY: 0.5
- _TwistUvRadius: 0.75
- _WarpScale: 0.5
- _WarpSpeed: 8
- _WarpStrength: 0.025
- _WaveAmount: 7
- _WaveSpeed: 10
- _WaveStrength: 7.5
- _WaveX: 0
- _WaveY: 0.5
- _WorkflowMode: 1
- _XRMotionVectorsPass: 1
- _ZTestMode: 4
- _ZWrite: 1
- _ZoomUvAmount: 0.5
m_Colors:
- _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1}
- _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1}
- _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1}
- _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1}
- _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1}
- _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1}
- _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1}
- _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1}
- _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _GlowColor: {r: 1, g: 1, b: 1, a: 1}
- _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1}
- _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1}
- _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1}
- _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1}
- _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1}
- _HitEffectColor: {r: 1, g: 1, b: 1, a: 1}
- _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1}
- _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1}
- _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
- _OverlayColor: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
- _ShadowColor: {r: 0, g: 0, b: 0, a: 1}
- _ShineColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &5575994803489782819
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3420d0083698c4732af621bf37a11cbb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c2293cf2323eb61449d39a8b130d5dd9
guid: 94f9e78fc7b864b93842bdfa21276f09
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 256
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@ -93,32 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -14,7 +14,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3540956906288785900, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_Layer
value: 0
value: 6
objectReference: {fileID: 0}
- target: {fileID: 3854744934792897056, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_Data.m_UniqueID
@ -1672,6 +1672,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3983248675539552489, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: zSpacing
value: -0.0001
objectReference: {fileID: 0}
- target: {fileID: 3983248675539552489, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: initialSkinName
value: Casper
@ -1680,10 +1684,22 @@ PrefabInstance:
propertyPath: skeletonDataAsset
value:
objectReference: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2}
- target: {fileID: 4246001044237372826, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4900607124439125211, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 5108021082109611361, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: _availableInteractions
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5523461449651244940, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 5654854357519457123, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: gravity.x
value: NaN
@ -1708,6 +1724,14 @@ PrefabInstance:
propertyPath: alwaysDrawGizmos
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6312111630636169229, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6336425934484470474, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6336425934484470474, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_Materials.Array.size
value: 4
@ -1728,6 +1752,10 @@ PrefabInstance:
propertyPath: 'm_Materials.Array.data[3]'
value:
objectReference: {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2}
- target: {fileID: 6558328110360087691, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6826437533270866908, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: externalBehavior
value:
@ -1750,7 +1778,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_Layer
value: 16
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7545136660434259176, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_Constraints
@ -1762,7 +1790,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8155105186346135386, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_Layer
value: 0
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8165702938223525558, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: graphMask.value
@ -1919,9 +1947,9 @@ MonoBehaviour:
m_NumColorKeys: 2
m_NumAlphaKeys: 2
outlineGradientInLocalSpace: 0
outlineWidth: 0.45
outlineWidth: 0.2
outlineBlurPasses: 2
outlineQuality: 3
outlineQuality: 2
outlineEdgeMode: 0
outlineEdgeThreshold: 0.995
outlineSharpness: 1

View File

@ -12,6 +12,10 @@ PrefabInstance:
propertyPath: _initialSkinName
value: Casper
objectReference: {fileID: 0}
- target: {fileID: 1549638263379651312, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_LocalScale.x
value: 2
@ -64,10 +68,34 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2182479135931305606, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_Name
value: RestaurantNpc
objectReference: {fileID: 0}
- target: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6791841979869644848, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7190839386876602598, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7741631174553725873, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8389753198886579169, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_Materials.Array.size
value: 0
@ -88,6 +116,10 @@ PrefabInstance:
propertyPath: 'm_Materials.Array.data[3]'
value:
objectReference: {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2}
- target: {fileID: 8715759041625857895, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 127430239903465757, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
m_RemovedGameObjects: []

File diff suppressed because it is too large Load Diff

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.1015625}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.068359375}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.1171875}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.109375}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.12890625}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.083984375}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.091796875}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.021484375}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.05859375}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.044921875}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.0703125}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.05078125}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.03515625}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -47,7 +47,7 @@ public static void OnPreprocessTextureForUi(TextureImporter importer)
importer.spriteImportMode = SpriteImportMode.Single;
// 기본 PPU (UI는 100 또는 1 고정 추천)
importer.spritePixelsPerUnit = 100f;
// importer.spritePixelsPerUnit = 100f;
importer.sRGBTexture = true;
importer.isReadable = false;

View File

@ -97,7 +97,7 @@ public bool TryTeleportToPosition(Vector3 position)
public bool HasReachedDestination()
{
return _iAstarAi.pathPending == false && _iAstarAi.reachedEndOfPath;
return _iAstarAi.pathPending == false && _iAstarAi.reachedDestination;
}
public bool IsPositionMovable(Vector3 endPosition)

View File

@ -19,6 +19,7 @@ public class RestaurantOrderObjectState
public GameObject Customer;
public GameObject Worker;
public string RecipeId;
public string FoodId;
}

View File

@ -95,11 +95,16 @@ public void RegisterHighlightProxy(GameObject highlightProxyObject)
{
var highlightProxy = highlightProxyObject.GetComponent<HighlightEffect>();
_highlightProxy = highlightProxy;
_highlightProxy.enabled = true;
ApplyHighlightSettings(highlightProxy);
}
public void ClearHighlightProxy()
{
if (_highlightProxy)
{
_highlightProxy.enabled = false;
}
_highlightProxy = null;
}

View File

@ -15,7 +15,7 @@ public string MenuId
public class RestaurantOrderEvent : IEvent
{
public string RecipeId;
public RestaurantOrderObjectState OrderObjectState;
}
public class RestaurantOrderSolver_Order : RestaurantOrderSolverBase
@ -27,30 +27,34 @@ public override bool ExecuteInteractionSubsystem(IInteractor interactor, IIntera
var highlightComponent = highlightObject?.GetComponent<IInteractionHighlight>();
highlightComponent?.ClearHighlightProxy();
// Worker takes the order
var orderObject = GetRestaurantOrderObject(interactable);
if (orderObject != null)
{
orderObject.GetOrderObjectState().Worker = interactor.GetInteractorGameObject();
}
// Pick random menu from today's menu list
var foodCandidates = RestaurantState.Instance.ManagementState.GetTodayFoodMenus();
if (foodCandidates == null || foodCandidates.Count == 0)
var recipeCandidates = RestaurantState.Instance.ManagementState.GetTodayRecipes();
if (recipeCandidates == null || recipeCandidates.Count == 0)
{
Debug.LogError("[RestaurantOrderSolver_Order] No food menu found");
return false;
}
// TODO : 손님 데이터를 바탕으로 선호하는 음식을 골라야 할수도 있음. interactable에서 직접 가져오거나 payload로 전달받아야 함. payload를 받을 경우 RestaurantOrderMenuPayload와 통합해야함
var foodMenu = foodCandidates[Random.Range(0, foodCandidates.Count)];
var recipeMenu = recipeCandidates[Random.Range(0, recipeCandidates.Count)];
// Worker takes the order
var orderObject = GetRestaurantOrderObject(interactable);
if (orderObject != null)
{
orderObject.GetOrderObjectState().Worker = interactor.GetInteractorGameObject();
orderObject.GetOrderObjectState().RecipeId = recipeMenu;
var recipeData = DataManager.Instance.GetDataAsset<RecipeDataAsset>();
recipeData.TryGetDataById(recipeMenu, out var recipeDataEntry);
orderObject.GetOrderObjectState().FoodId = recipeDataEntry?.RecipeResult;
}
// Create payload and set the menu
RestaurantOrderMenuPayload orderPayload = ScriptableObject.CreateInstance<RestaurantOrderMenuPayload>();
orderPayload.MenuId = foodMenu;
orderPayload.MenuId = recipeMenu;
RestaurantOrderEvent evt = new RestaurantOrderEvent();
evt.RecipeId = foodMenu;
evt.OrderObjectState = orderObject?.GetOrderObjectState();
EventBus.Broadcast(evt);
return base.ExecuteInteractionSubsystem(interactor, interactable, payload);

View File

@ -63,12 +63,12 @@ public bool HasMatchedMenuWithCookware()
return _cookwareToRecipeMapping.Values.Any(recipeSet => recipeSet.Count > 0);
}
public List<string> GetTodayFoodMenus()
public List<string> GetTodayRecipes()
{
return _todayFoodRecipeAndAmounts.Keys.ToList();
}
public int GetTodayFoodAvailableCount(string recipeId)
public int GetTodayRecipeAvailableCount(string recipeId)
{
return _todayFoodRecipeAndAmounts.GetValueOrDefault(recipeId, 0);
}

View File

@ -19,12 +19,8 @@ private void Start()
public void HandleEvent(RestaurantOrderEvent evt)
{
var billItem = Instantiate(_billItemPrefab, _billItemsLayoutTransform);
var recipeData = DataManager.Instance.GetDataAsset<RecipeDataAsset>();
if (recipeData.TryGetDataById(evt.RecipeId, out var recipeDataEntry))
{
var sprite = DataManager.Instance.GetSprite(recipeDataEntry.RecipeResult);
billItem.GetComponent<Image>().sprite = sprite;
}
var sprite = DataManager.Instance.GetSprite(evt.OrderObjectState?.FoodId);
billItem.GetComponent<Image>().sprite = sprite;
}
}
}

View File

@ -7,21 +7,26 @@ namespace DDD.Restaurant
{
public abstract class PropUiDisplayComponent<T> : SerializedMonoBehaviour where T : Enum
{
private IInteractionSubsystemObject<T> _interactionSubsystemObject;
private Dictionary<T, Material> _materialDictionary;
private T _prevInteractionType;
[SerializeField]
protected Vector3 _rotation = new Vector3(40.0f, 0, 0);
[SerializeField]
protected Sprite _defaultSprite;
protected IInteractionSubsystemObject<T> _interactionSubsystemObject;
private Dictionary<T, Material> _internalMaterials;
private T _currentInteractionType;
protected IInteractable _interactable;
protected SpriteRenderer _spriteRenderer;
protected Transform _spriteTransform;
private void Awake()
{
Initialize();
}
protected abstract Dictionary<T, Material> SetMaterialDictionary();
protected abstract Dictionary<T, Material> GetInteractionDisplayMaterials();
protected virtual void Initialize()
{
bool isInteractionSubsystem = gameObject.TryGetComponent(out _interactionSubsystemObject);
var interactable = GetComponent<IInteractable>();
bool isInteractionSubsystem = GetOwnerInteractable(out _interactable);
if (!isInteractionSubsystem)
{
Debug.LogError($"Interaction Subsystem<{typeof(T)}> is not exist");
@ -30,31 +35,105 @@ protected virtual void Initialize()
// TODO: 임시 나중에 제대로 수정할 것
var uiGameObject = Instantiate(new GameObject("TemporaryUi"), transform);
uiGameObject.transform.position = interactable.GetInteractionPoints()[0] + Vector3.up * 2;
_spriteRenderer = uiGameObject.AddComponent<SpriteRenderer>();
UpdateSprite();
_spriteRenderer.enabled = false;
_materialDictionary = SetMaterialDictionary();
_spriteTransform = uiGameObject.transform;
uiGameObject.layer = GetDisplayLayer();
UpdateSpriteTransform();
_internalMaterials = GetInteractionDisplayMaterials();
}
private void UpdateSprite()
{
_spriteRenderer.sprite = GetDisplaySprite();
}
protected virtual void UpdateSpriteTransform()
{
_spriteTransform.position = GetDisplayPosition();
_spriteTransform.rotation = Quaternion.Euler(GetDisplayRotation());
}
private bool GetOwnerInteractable(out IInteractable interactable)
{
bool isInteractionSubsystem = gameObject.TryGetComponent(out _interactionSubsystemObject);
interactable = GetComponent<IInteractable>();
return isInteractionSubsystem;
}
protected virtual int GetDisplayLayer()
{
return LayerMask.NameToLayer("WorldUI");
}
protected virtual Sprite GetDisplaySprite()
{
return _defaultSprite;
}
protected virtual Vector3 GetDisplayPosition()
{
return transform.position;
}
protected virtual Vector3 GetDisplayRotation()
{
return _rotation;
}
private void Update()
{
T currentInteractionType = _interactionSubsystemObject.GetInteractionSubsystemType();
if (EqualityComparer<T>.Default.Equals(_prevInteractionType, currentInteractionType)) return;
_prevInteractionType = currentInteractionType;
UpdateView(_prevInteractionType);
T interactionType = _interactionSubsystemObject.GetInteractionSubsystemType();
if (EqualityComparer<T>.Default.Equals(_currentInteractionType, interactionType)) return;
SetCurrentInteractionType(interactionType);
UpdateView(GetCurrentInteractionType());
}
public T GetCurrentInteractionType()
{
return _currentInteractionType;
}
public void SetCurrentInteractionType(T interactionType)
{
_currentInteractionType = interactionType;
}
private void UpdateView(T state)
{
if (!_materialDictionary.TryGetValue(state, out var material) || material == null)
if (!UpdateSpriteMaterial(state))
{
return;
}
UpdateSprite();
UpdateSpriteTransform();
}
virtual protected Color GetSpriteColor()
{
return Color.white;
}
private bool UpdateSpriteMaterial(T state)
{
if (!_internalMaterials.TryGetValue(state, out var material) || material == null)
{
// TODO 캔버스 다운
_spriteRenderer.enabled = false;
return;
return false;
}
// material.color = Color.white;
_spriteRenderer.color = GetSpriteColor();
// ui 머티리얼 교체
_spriteRenderer.enabled = true;
_spriteRenderer.material = material;
_spriteTransform.gameObject.layer = GetDisplayLayer();
return true;
}
}
}

View File

@ -2,6 +2,7 @@
using UnityEngine;
using Sirenix.OdinInspector;
using Sirenix.Serialization;
using UnityEngine.Serialization;
namespace DDD.Restaurant
@ -9,10 +10,16 @@ namespace DDD.Restaurant
public class RestaurantUiDisplayComponent : PropUiDisplayComponent<RestaurantOrderType>
{
[SerializeField]
private Sprite _temporarySprite;
protected Vector3 _offset = new Vector3(0.0f, 0.75f, 0.675f);
[SerializeField]
protected Vector3 _disabledOffset = new Vector3(0.0f, 0.2f, 0.165f);
[SerializeField]
private Vector2 _fixedLocalScale = new Vector2(.2f, .2f);
[SerializeField]
private Color _disabledColor = new Color(Color.darkGray.r, Color.darkGray.g, Color.darkGray.b, 0.5f);
[OdinSerialize]
private Dictionary<RestaurantOrderType, Material> _materialDictionary = new();
protected override Dictionary<RestaurantOrderType, Material> SetMaterialDictionary()
protected override Dictionary<RestaurantOrderType, Material> GetInteractionDisplayMaterials()
{
return _materialDictionary;
}
@ -20,7 +27,60 @@ protected override Dictionary<RestaurantOrderType, Material> SetMaterialDictiona
protected override void Initialize()
{
base.Initialize();
_spriteRenderer.sprite = _temporarySprite;
}
protected override void UpdateSpriteTransform()
{
base.UpdateSpriteTransform();
_spriteRenderer.transform.localScale = _fixedLocalScale;
}
protected override Sprite GetDisplaySprite()
{
if (GetCurrentInteractionType() == RestaurantOrderType.Serve && _interactionSubsystemObject != null)
{
// Sprite by current restaurant order type. get from RestaurantOrderObject.
if (_interactionSubsystemObject is IRestaurantOrderObject orderObject)
{
string foodId = orderObject.GetOrderObjectState().FoodId;
Debug.Assert(foodId != null, nameof(foodId) + " != null");
var sprite = DataManager.Instance.GetSprite(foodId);
return sprite;
}
}
return base.GetDisplaySprite();
}
protected override Color GetSpriteColor()
{
if (GetCurrentInteractionType() == RestaurantOrderType.Serve)
{
return _disabledColor;
}
return base.GetSpriteColor();
}
protected override Vector3 GetDisplayPosition()
{
if (GetCurrentInteractionType() == RestaurantOrderType.Order)
{
// Find interaction points from interactable owner
var points = _interactable?.GetInteractionPoints();
if (points is { Length: > 0 })
{
return points[0] + _offset;
}
}
return transform.position + _disabledOffset;
}
protected override int GetDisplayLayer()
{
if (GetCurrentInteractionType() == RestaurantOrderType.Serve)
{
return LayerMask.NameToLayer("Prop");
}
return base.GetDisplayLayer();
}
}
}

BIN
ProjectSettings/TagManager.asset (Stored with Git LFS)

Binary file not shown.