tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into diving-outrocinematic

Browse Source
This commit is contained in:
AlexanderT
2025-10-16 15:40:08 +02:00
parent b425d2b4f4 5e790a2438
commit 8c4f821865
14 changed files with 4063 additions and 3185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
Assets/Prefabs/Puzzles/AnneLiseBush.prefab
View File

@@ -108,8 +108,8 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingLayerID: -1132846201
m_SortingLayer: 1
m_SortingOrder: 1
m_Sprite: {fileID: 3625043607559282579, guid: 19fb86013d8c24d6cb8410c0aadf30fa, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -222,7 +222,8 @@ GameObject:
m_Component:
- component: {fileID: 2071071585578300598}
- component: {fileID: 1454372124634854912}
m_Layer: 0
- component: {fileID: 4122067414526815177}
m_Layer: 6
m_Name: Hidden
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -258,6 +259,52 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3}
m_Name:
m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.State
--- !u!61 &4122067414526815177
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1011363502278351410}
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 1.05, y: -1.5}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Size: {x: 5.42, y: 4}
m_EdgeRadius: 0
--- !u!1 &1674229500073894281
GameObject:
m_ObjectHideFlags: 0
@@ -460,7 +507,7 @@ SpriteRenderer:
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -1
m_SortingOrder: 0
m_Sprite: {fileID: 1389104422143044133, guid: 88a896c19d8ef454e999af7d3b492dd9, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -868,7 +915,8 @@ GameObject:
- component: {fileID: 3552553650332385501}
- component: {fileID: 33904425063383983}
- component: {fileID: 1494215563975893862}
m_Layer: 0
- component: {fileID: 962877523590950341}
m_Layer: 6
m_Name: TakePhoto
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -941,6 +989,52 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: AppleHillsScripts::TakePhotoState
playerTargetObject: {fileID: 4304786163860520790}
--- !u!61 &962877523590950341
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7816038554732339800}
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 1.05, y: -1.5}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Size: {x: 5.42, y: 4}
m_EdgeRadius: 0
--- !u!1 &8378940418688040866
GameObject:
m_ObjectHideFlags: 0