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

Merge branch 'main' into audio-overhaul

Browse Source
This commit is contained in:
AlexanderT
2025-10-28 16:10:48 +01:00
parent 86bee75578 b56524f1f2
commit 1a04e82920
70 changed files with 6123 additions and 1250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1511
Assets/Prefabs/UI/LevelConfirmMenu.prefab
View File

File diff suppressed because it is too large Load Diff

138
Assets/Prefabs/UI/Tutorial.prefab
View File

@@ -538,6 +538,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: '::'
playTutorial: 1
progressType: 1
tapPrompt: {fileID: 6751368003081662277}
--- !u!1 &3503751741805984614
GameObject:
@@ -999,6 +1000,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 9007881587001685567}
- component: {fileID: 3406675330576225767}
- component: {fileID: 6437063975367121999}
m_Layer: 5
m_Name: TutorialScreens
m_TagString: Untagged
@@ -1027,6 +1030,54 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3406675330576225767
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5541992152058962912}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55938fb1577dd4ad3af7e994048c86f6, type: 3}
m_Name:
m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.Initialization
--- !u!114 &6437063975367121999
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5541992152058962912}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9e0b24e2f2ad54cc09940c320ed3cf4b, type: 3}
m_Name:
m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.StateMachine
defaultState: {fileID: 2271162218602898139}
currentState: {fileID: 0}
_unityEventsFolded: 0
verbose: 1
allowReentry: 0
returnToDefaultOnDisable: 1
OnStateExited:
m_PersistentCalls:
m_Calls: []
OnStateEntered:
m_PersistentCalls:
m_Calls: []
OnFirstStateEntered:
m_PersistentCalls:
m_Calls: []
OnFirstStateExited:
m_PersistentCalls:
m_Calls: []
OnLastStateEntered:
m_PersistentCalls:
m_Calls: []
OnLastStateExited:
m_PersistentCalls:
m_Calls: []
--- !u!1 &6118149484066388440
GameObject:
m_ObjectHideFlags: 0
@@ -1188,6 +1239,8 @@ GameObject:
- component: {fileID: 5554143010115146741}
- component: {fileID: 3254928157304415694}
- component: {fileID: 490204079952288596}
- component: {fileID: 4102777992983182863}
- component: {fileID: 1294151786592730276}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -1313,6 +1366,41 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!225 &4102777992983182863
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6751368003081662277}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &1294151786592730276
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6751368003081662277}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b75de64fb2fd4ff0b869bf469e2becea, type: 3}
m_Name:
m_EditorClassIdentifier: AppleHillsScripts::UI.BlinkingCanvasGroup
minAlpha: 0
maxAlpha: 1
legDuration: 0.5
startDelay: 0
obeyTimescale: 0
easeCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &7059429923783536925
GameObject:
m_ObjectHideFlags: 0
@@ -1325,8 +1413,6 @@ GameObject:
- component: {fileID: 1967423891170411127}
- component: {fileID: 1097500443175047993}
- component: {fileID: 7998358628525523097}
- component: {fileID: 2002496630232568573}
- component: {fileID: 8086909437439386099}
m_Layer: 5
m_Name: TutorialCanvas
m_TagString: Untagged
@@ -1418,54 +1504,6 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &2002496630232568573
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7059429923783536925}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55938fb1577dd4ad3af7e994048c86f6, type: 3}
m_Name:
m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.Initialization
--- !u!114 &8086909437439386099
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7059429923783536925}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9e0b24e2f2ad54cc09940c320ed3cf4b, type: 3}
m_Name:
m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.StateMachine
defaultState: {fileID: 2271162218602898139}
currentState: {fileID: 0}
_unityEventsFolded: 1
verbose: 1
allowReentry: 0
returnToDefaultOnDisable: 1
OnStateExited:
m_PersistentCalls:
m_Calls: []
OnStateEntered:
m_PersistentCalls:
m_Calls: []
OnFirstStateEntered:
m_PersistentCalls:
m_Calls: []
OnFirstStateExited:
m_PersistentCalls:
m_Calls: []
OnLastStateEntered:
m_PersistentCalls:
m_Calls: []
OnLastStateExited:
m_PersistentCalls:
m_Calls: []
--- !u!1 &7894456058020053503
GameObject:
m_ObjectHideFlags: 0