Merge branch 'programming'

This commit is contained in:
Nadine Ganz 2025-08-04 21:14:02 +02:00
commit ef17908e08
3 changed files with 420 additions and 408 deletions

View File

@ -422,6 +422,10 @@ PrefabInstance:
propertyPath: m_RotationAction.m_Reference propertyPath: m_RotationAction.m_Reference
value: value:
objectReference: {fileID: 7384354444432909072, guid: c348712bda248c246b8c49b3db54643f, type: 3} objectReference: {fileID: 7384354444432909072, guid: c348712bda248c246b8c49b3db54643f, type: 3}
- target: {fileID: 8574486981646720036, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3}
propertyPath: m_PhysicsLayerMask.m_Bits
value: 4294967295
objectReference: {fileID: 0}
- target: {fileID: 8574486981646720036, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} - target: {fileID: 8574486981646720036, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3}
propertyPath: m_InteractionLayers.m_Bits propertyPath: m_InteractionLayers.m_Bits
value: 4294967295 value: 4294967295
@ -430,6 +434,10 @@ PrefabInstance:
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9034274667510444962, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3}
propertyPath: m_PhysicsLayerMask.m_Bits
value: 4294967295
objectReference: {fileID: 0}
- target: {fileID: 9034274667510444962, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} - target: {fileID: 9034274667510444962, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3}
propertyPath: m_InteractionLayers.m_Bits propertyPath: m_InteractionLayers.m_Bits
value: 4294967295 value: 4294967295

View File

@ -189,6 +189,46 @@ Transform:
m_CorrespondingSourceObject: {fileID: 382483183088004525, guid: 7ce1db7bd0f3ef4489a44b88ad374b8f, type: 3} m_CorrespondingSourceObject: {fileID: 382483183088004525, guid: 7ce1db7bd0f3ef4489a44b88ad374b8f, type: 3}
m_PrefabInstance: {fileID: 2240446} m_PrefabInstance: {fileID: 2240446}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!21 &5206641
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1 &5995453 --- !u!1 &5995453
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -381,46 +421,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 349174638489851951, guid: 7ec926be41bcee347ac844ccf400536d, type: 3} m_CorrespondingSourceObject: {fileID: 349174638489851951, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
m_PrefabInstance: {fileID: 6014519} m_PrefabInstance: {fileID: 6014519}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!21 &6522406
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1 &12738154 --- !u!1 &12738154
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5411,46 +5411,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13795129} m_GameObject: {fileID: 13795129}
m_Mesh: {fileID: -1613212191949318976, guid: d3da22626c0fbc8499e91720f5a6a9db, type: 3} m_Mesh: {fileID: -1613212191949318976, guid: d3da22626c0fbc8499e91720f5a6a9db, type: 3}
--- !u!21 &22199776
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1001 &22643312 --- !u!1001 &22643312
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5978,6 +5938,46 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 33497877} m_GameObject: {fileID: 33497877}
m_Mesh: {fileID: 4071731720381151820, guid: a1f99d2b6a0e69643b02716087dfbf44, type: 3} m_Mesh: {fileID: 4071731720381151820, guid: a1f99d2b6a0e69643b02716087dfbf44, type: 3}
--- !u!21 &40282760
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1001 &43822130 --- !u!1001 &43822130
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -13574,6 +13574,46 @@ MonoBehaviour:
roomId: VIDEOS roomId: VIDEOS
uniqueId: uniqueId:
_name: MediaPlayer.VIDEOS.Video _name: MediaPlayer.VIDEOS.Video
--- !u!21 &168352979
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1001 &172264384 --- !u!1001 &172264384
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -19637,46 +19677,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5429959882549668353, guid: 8a66577d56614d940b071679dd20f01f, type: 3} m_CorrespondingSourceObject: {fileID: 5429959882549668353, guid: 8a66577d56614d940b071679dd20f01f, type: 3}
m_PrefabInstance: {fileID: 235462592} m_PrefabInstance: {fileID: 235462592}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!21 &239866296
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1 &240117814 stripped --- !u!1 &240117814 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 1663478438812462234, guid: e120e708bd204c440a380fe9b6857214, type: 3} m_CorrespondingSourceObject: {fileID: 1663478438812462234, guid: e120e708bd204c440a380fe9b6857214, type: 3}
@ -20379,46 +20379,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 382483183088004525, guid: 7ce1db7bd0f3ef4489a44b88ad374b8f, type: 3} m_CorrespondingSourceObject: {fileID: 382483183088004525, guid: 7ce1db7bd0f3ef4489a44b88ad374b8f, type: 3}
m_PrefabInstance: {fileID: 295541166} m_PrefabInstance: {fileID: 295541166}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!21 &299110283
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!21 &315937170 --- !u!21 &315937170
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -20859,46 +20819,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 382483183088004525, guid: 7ce1db7bd0f3ef4489a44b88ad374b8f, type: 3} m_CorrespondingSourceObject: {fileID: 382483183088004525, guid: 7ce1db7bd0f3ef4489a44b88ad374b8f, type: 3}
m_PrefabInstance: {fileID: 354563387} m_PrefabInstance: {fileID: 354563387}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!21 &362684705
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1001 &366786865 --- !u!1001 &366786865
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -22619,46 +22539,6 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 2132388109} m_Father: {fileID: 2132388109}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &488397146
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1001 &494799192 --- !u!1001 &494799192
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -22823,6 +22703,46 @@ Transform:
- {fileID: 1151291992} - {fileID: 1151291992}
m_Father: {fileID: 1771909058} m_Father: {fileID: 1771909058}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &504262196
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1 &504459963 --- !u!1 &504459963
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -23398,6 +23318,46 @@ MonoBehaviour:
thisIsPrefab: 0 thisIsPrefab: 0
exportToObjStartIndexOffSet: 0 exportToObjStartIndexOffSet: 0
hideWarningsForThisMerge: 0 hideWarningsForThisMerge: 0
--- !u!21 &530364997
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1001 &540711015 --- !u!1001 &540711015
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -27020,7 +26980,7 @@ MeshRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!21 &744395129 --- !u!21 &732014763
Material: Material:
serializedVersion: 8 serializedVersion: 8
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -79868,46 +79828,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1318531104878517223, guid: ae5e73f993e03d64eae786939de7aaef, type: 3} m_CorrespondingSourceObject: {fileID: 1318531104878517223, guid: ae5e73f993e03d64eae786939de7aaef, type: 3}
m_PrefabInstance: {fileID: 825845056} m_PrefabInstance: {fileID: 825845056}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!21 &829899316
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1001 &833652847 --- !u!1001 &833652847
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -80174,6 +80094,46 @@ Transform:
m_CorrespondingSourceObject: {fileID: 7947259493905058179, guid: dce0f6fd12789f243bc8bc9996b0c858, type: 3} m_CorrespondingSourceObject: {fileID: 7947259493905058179, guid: dce0f6fd12789f243bc8bc9996b0c858, type: 3}
m_PrefabInstance: {fileID: 840098079} m_PrefabInstance: {fileID: 840098079}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!21 &841424145
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1001 &845350161 --- !u!1001 &845350161
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -81114,6 +81074,46 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3} m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!21 &888198492
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1 &888746657 stripped --- !u!1 &888746657 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 5982113726201022151, guid: 36b2c5457f6324542af5d451870fabef, type: 3} m_CorrespondingSourceObject: {fileID: 5982113726201022151, guid: 36b2c5457f6324542af5d451870fabef, type: 3}
@ -85167,7 +85167,7 @@ MonoBehaviour:
overrideLogStringDisplay: 0 overrideLogStringDisplay: 0
overrideDebugInternalActive: 0 overrideDebugInternalActive: 0
overrideDebugChangesActive: 0 overrideDebugChangesActive: 0
instanceID: 1814028 instanceID: 268200
__behaviourTreeGenerator: {fileID: 0} __behaviourTreeGenerator: {fileID: 0}
taskScripts: taskScripts:
- {fileID: 4900000, guid: f2b6bcb5e44ed4e0394e4d163e82de88, type: 3} - {fileID: 4900000, guid: f2b6bcb5e44ed4e0394e4d163e82de88, type: 3}
@ -88016,6 +88016,86 @@ MonoBehaviour:
roomId: VIDEOS roomId: VIDEOS
uniqueId: uniqueId:
_name: MediaPlayer.VIDEOS.Video _name: MediaPlayer.VIDEOS.Video
--- !u!21 &1321472083
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!21 &1323979742
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1001 &1325187816 --- !u!1001 &1325187816
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -89740,6 +89820,46 @@ LightProbeGroup:
- {x: -1.680068, y: 0.2968285, z: 1.4598198} - {x: -1.680068, y: 0.2968285, z: 1.4598198}
- {x: -1.680068, y: 0.2968285, z: -0.60611725} - {x: -1.680068, y: 0.2968285, z: -0.60611725}
m_Dering: 1 m_Dering: 1
--- !u!21 &1499623992
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1 &1520446162 --- !u!1 &1520446162
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -92973,46 +93093,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1253365200111565818, guid: 8109e9e16ba4cc04b8e0928aea897927, type: 3} m_CorrespondingSourceObject: {fileID: 1253365200111565818, guid: 8109e9e16ba4cc04b8e0928aea897927, type: 3}
m_PrefabInstance: {fileID: 1674143112} m_PrefabInstance: {fileID: 1674143112}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!21 &1678784546
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1 &1684854632 --- !u!1 &1684854632
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -100418,7 +100498,7 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1858459824} m_GameObject: {fileID: 1858459824}
m_Mesh: {fileID: -4998340409580844346, guid: 5dd84852355ea0245a10d97ff191c78f, type: 3} m_Mesh: {fileID: -4998340409580844346, guid: 5dd84852355ea0245a10d97ff191c78f, type: 3}
--- !u!21 &1862098311 --- !u!21 &1860673910
Material: Material:
serializedVersion: 8 serializedVersion: 8
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -100510,46 +100590,6 @@ Transform:
- {fileID: 101782483} - {fileID: 101782483}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &1878892662
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1 &1880602136 --- !u!1 &1880602136
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -102910,7 +102950,7 @@ Transform:
m_CorrespondingSourceObject: {fileID: 382483183088004525, guid: 7ce1db7bd0f3ef4489a44b88ad374b8f, type: 3} m_CorrespondingSourceObject: {fileID: 382483183088004525, guid: 7ce1db7bd0f3ef4489a44b88ad374b8f, type: 3}
m_PrefabInstance: {fileID: 2007526181} m_PrefabInstance: {fileID: 2007526181}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!21 &2024317939 --- !u!21 &2023643871
Material: Material:
serializedVersion: 8 serializedVersion: 8
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -108384,46 +108424,6 @@ MonoBehaviour:
thisIsPrefab: 0 thisIsPrefab: 0
exportToObjStartIndexOffSet: 0 exportToObjStartIndexOffSet: 0
hideWarningsForThisMerge: 0 hideWarningsForThisMerge: 0
--- !u!21 &2060731008
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, 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: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
m_BuildTextureStacks: []
--- !u!1 &2063172523 --- !u!1 &2063172523
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -172516,6 +172516,10 @@ PrefabInstance:
propertyPath: m_Enabled propertyPath: m_Enabled
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5717184229481648856, guid: 8b82ecf5ee06c434a8b6fdf0ce1e8335, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6054367325158247086, guid: 8b82ecf5ee06c434a8b6fdf0ce1e8335, type: 3} - target: {fileID: 6054367325158247086, guid: 8b82ecf5ee06c434a8b6fdf0ce1e8335, type: 3}
propertyPath: m_Enabled propertyPath: m_Enabled
value: 0 value: 0

View File

@ -8,13 +8,13 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/0.0-Menu.unity path: Assets/Scenes/0.0-Menu.unity
guid: c83d90128ed611646968487737573267 guid: c83d90128ed611646968487737573267
- enabled: 0 - enabled: 1
path: Assets/Scenes/0.5-Tutorial.unity path: Assets/Scenes/0.5-Tutorial.unity
guid: c759c76caca997646b54b537cab5ad11 guid: c759c76caca997646b54b537cab5ad11
- enabled: 0 - enabled: 1
path: Assets/Scenes/1.0-SBB.unity path: Assets/Scenes/1.0-SBB.unity
guid: 6a1144d40bbf04513a9929856271d4e7 guid: 6a1144d40bbf04513a9929856271d4e7
- enabled: 0 - enabled: 1
path: Assets/Scenes/2.0-SBB.unity path: Assets/Scenes/2.0-SBB.unity
guid: 0492708372646415eb23036f23680178 guid: 0492708372646415eb23036f23680178
- enabled: 1 - enabled: 1
@ -23,7 +23,7 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/2.6-Castello.unity path: Assets/Scenes/2.6-Castello.unity
guid: 8554de5c9e3d141a1bee7985b31e8313 guid: 8554de5c9e3d141a1bee7985b31e8313
- enabled: 0 - enabled: 1
path: Assets/Scenes/3.0-SBB.unity path: Assets/Scenes/3.0-SBB.unity
guid: a21f6e13e09234179a685c8f89b0e031 guid: a21f6e13e09234179a685c8f89b0e031
- enabled: 1 - enabled: 1