mePixel/ccl4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4

Browse Source
This commit is contained in:
AgentSchmisch 2025-06-17 15:53:42 +02:00
commit 59f03d0f5a
4 changed files with 296 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
blueberryPeak/Assets/Prefabs/game/SceneSwitcher.prefab
View File

@ -32,7 +32,8 @@ Transform:
m_LocalPosition: {x: 16.3, y: 0.9, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 5520807787140062782}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5762019935787128362
@ -50,7 +51,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2264011724657500812}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -121,4 +122,71 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b0d37cd57e83a8946b89c6d8daf07b7f, type: 3}
m_Name:
m_EditorClassIdentifier:
switchToScene: flo_s_scene
switchToScene: Market
--- !u!1001 &6284028772717831202
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1745689670249651042}
m_Modifications:
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4134798691638650340, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_Size.y
value: 6.11
objectReference: {fileID: 0}
- target: {fileID: 6251478765960268385, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_Name
value: Path
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 4134798691638650340, guid: d0370f51c6ba845828372ca749564589, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d0370f51c6ba845828372ca749564589, type: 3}
--- !u!4 &5520807787140062782 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
m_PrefabInstance: {fileID: 6284028772717831202}
m_PrefabAsset: {fileID: 0}

89
blueberryPeak/Assets/Scenes/Beach.unity
View File

@ -3975,73 +3975,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3}
m_PrefabInstance: {fileID: 670741753}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &675381403
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1530957963}
m_Modifications:
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4134798691638650340, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_Size.y
value: 6.11
objectReference: {fileID: 0}
- target: {fileID: 6251478765960268385, guid: d0370f51c6ba845828372ca749564589, type: 3}
propertyPath: m_Name
value: Path
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 4134798691638650340, guid: d0370f51c6ba845828372ca749564589, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d0370f51c6ba845828372ca749564589, type: 3}
--- !u!4 &675381404 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
m_PrefabInstance: {fileID: 675381403}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &689541243
PrefabInstance:
m_ObjectHideFlags: 0
@ -8352,29 +8285,17 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_Size.y
value: 3.87
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3629119434639352391, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7419702660099155392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: switchToScene
value: Market
- target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_Size.z
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
insertIndex: -1
addedObject: {fileID: 675381404}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3}
--- !u!4 &1530957963 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
m_PrefabInstance: {fileID: 1530957962}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1536064767
PrefabInstance:
m_ObjectHideFlags: 0

70
blueberryPeak/Assets/Scenes/Forest.unity
View File

@ -2116,6 +2116,75 @@ Transform:
m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3}
m_PrefabInstance: {fileID: 684707837}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &691592292
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalScale.z
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalPosition.x
value: 24.46
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalPosition.y
value: 0.01
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalPosition.z
value: -0.04
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2264011724657500812, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_Name
value: SceneSwitcher
objectReference: {fileID: 0}
- target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_Size.y
value: 7.89
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3}
--- !u!1001 &697533470
PrefabInstance:
m_ObjectHideFlags: 0
@ -7753,3 +7822,4 @@ SceneRoots:
- {fileID: 1255997130}
- {fileID: 1772744957}
- {fileID: 335597220}
- {fileID: 691592292}

152
blueberryPeak/Assets/Scenes/Market.unity
View File

@ -1776,6 +1776,79 @@ Transform:
m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3}
m_PrefabInstance: {fileID: 893033526}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &816337134
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalScale.z
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalPosition.x
value: 14.49
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalPosition.y
value: 0.01
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalPosition.z
value: -0.04
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2264011724657500812, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_Name
value: SceneSwitcher
objectReference: {fileID: 0}
- target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_Size.y
value: 7.89
objectReference: {fileID: 0}
- target: {fileID: 7419702660099155392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: switchToScene
value: Beach
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3}
--- !u!1001 &837716097
PrefabInstance:
m_ObjectHideFlags: 0
@ -2934,6 +3007,79 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3}
--- !u!1001 &1250080611
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalScale.z
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalPosition.x
value: -14.48
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalPosition.y
value: 0.01
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalPosition.z
value: -0.04
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2264011724657500812, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_Name
value: SceneSwitcher (1)
objectReference: {fileID: 0}
- target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: m_Size.y
value: 7.89
objectReference: {fileID: 0}
- target: {fileID: 7419702660099155392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
propertyPath: switchToScene
value: Forest
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3}
--- !u!4 &1271999374 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3}
@ -5497,7 +5643,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3}
propertyPath: m_LocalPosition.x
value: 1.02
value: -2.84
objectReference: {fileID: 0}
- target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3}
propertyPath: m_LocalPosition.y
@ -5505,7 +5651,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3}
propertyPath: m_LocalPosition.z
value: -8.95
value: -9.51
objectReference: {fileID: 0}
- target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3}
propertyPath: m_LocalRotation.w
@ -5559,3 +5705,5 @@ SceneRoots:
- {fileID: 1558625457}
- {fileID: 257359672}
- {fileID: 677342064}
- {fileID: 816337134}
- {fileID: 1250080611}