From fea3f0bd0a2f886ca5c826cd28e499719287ab75 Mon Sep 17 00:00:00 2001
From: wiepke <wiepke@uni-potsdam.de>
Date: Thu, 13 Feb 2025 16:23:04 +0100
Subject: [PATCH] WallOffset is WIP
---
.../AddressableAssetSettings.asset | 4 +-
.../Materials/Green_Board_Dif.mat | 4 +-
Assets/Scenes/ChemistryRoom.unity | 4 +-
Assets/Scenes/MediaRoom.unity | 4 +-
.../vr.teachr.teacher/Runtime/Teacher.prefab | 59 +++++++++++++++++++
5 files changed, 67 insertions(+), 8 deletions(-)
diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
index f25dcfac4..8b55e8b30 100644
--- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 030920c944e92214db8e05eab53f7242
m_currentHash:
serializedVersion: 2
- Hash: 00000000000000000000000000000000
+ Hash: b4a3c83f1722202e6fbd217c24f1488f
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_CatalogRequestsTimeout: 0
@@ -60,10 +60,10 @@ MonoBehaviour:
m_overridePlayerVersion:
m_GroupAssets:
- {fileID: 11400000, guid: 98d00eeced02f02408340a5cc1622f0a, type: 2}
- - {fileID: 11400000, guid: fe331dc95997f284e904721f3a9952c9, type: 2}
- {fileID: 11400000, guid: 52006ac27baf7464e8052d92bf4bc120, type: 2}
- {fileID: 11400000, guid: 41bfff40ce84bc34aa956c650c95730e, type: 2}
- {fileID: 11400000, guid: dc96978859ec3de47beb7c358b37de8c, type: 2}
+ - {fileID: 11400000, guid: fe331dc95997f284e904721f3a9952c9, type: 2}
- {fileID: 11400000, guid: bbaa0b1be3534a442979413f69da8d67, type: 2}
- {fileID: 11400000, guid: fce371e4edc4f6b4ba5b2dc66d3281cd, type: 2}
- {fileID: 11400000, guid: a890e87942ecaae47b8daef2696d058e, type: 2}
diff --git a/Assets/AssetStore/ClassRoom Stuff/Materials/Green_Board_Dif.mat b/Assets/AssetStore/ClassRoom Stuff/Materials/Green_Board_Dif.mat
index 185ba0b5a..7efe237f4 100644
--- a/Assets/AssetStore/ClassRoom Stuff/Materials/Green_Board_Dif.mat
+++ b/Assets/AssetStore/ClassRoom Stuff/Materials/Green_Board_Dif.mat
@@ -31,7 +31,7 @@ Material:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 8895e2248a3da784b8cae5ca949768a8, type: 3}
m_Scale: {x: 1.05, y: 1.03}
- m_Offset: {x: 0, y: -0.01}
+ m_Offset: {x: 0.02, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 3239d3d71eec7194e858a944d0fa259c, type: 3}
m_Scale: {x: 1, y: 1}
@@ -43,7 +43,7 @@ Material:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 8895e2248a3da784b8cae5ca949768a8, type: 3}
m_Scale: {x: 1.05, y: 1.03}
- m_Offset: {x: 0, y: -0.01}
+ m_Offset: {x: 0.02, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
diff --git a/Assets/Scenes/ChemistryRoom.unity b/Assets/Scenes/ChemistryRoom.unity
index c5b01e2cf..61cf4c129 100644
--- a/Assets/Scenes/ChemistryRoom.unity
+++ b/Assets/Scenes/ChemistryRoom.unity
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9ad395cc5980ba3dea8b4406779a90bcb9a5dbb86ab8c338381bc45e6e12a702
-size 1354136
+oid sha256:86d9caf6a042f7679fe4de9732dce78d9fb1a8abe403f8718dc8947db5e17a57
+size 1354862
diff --git a/Assets/Scenes/MediaRoom.unity b/Assets/Scenes/MediaRoom.unity
index cff32240c..c411d6a85 100644
--- a/Assets/Scenes/MediaRoom.unity
+++ b/Assets/Scenes/MediaRoom.unity
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:55fc66d5ac64e1b34103efe46b1e5f09695ce6e4804e1d196de0726a2e05322e
-size 2137738
+oid sha256:b739150db5864e539c16e63631de6c3cf0d287da5f208a5790782b43a1b9656e
+size 2134936
diff --git a/Packages/vr.teachr.teacher/Runtime/Teacher.prefab b/Packages/vr.teachr.teacher/Runtime/Teacher.prefab
index 7f6d55b25..c35dc26d0 100644
--- a/Packages/vr.teachr.teacher/Runtime/Teacher.prefab
+++ b/Packages/vr.teachr.teacher/Runtime/Teacher.prefab
@@ -141,6 +141,51 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_ActionAssets:
- {fileID: -944628639613478452, guid: c348712bda248c246b8c49b3db54643f, type: 3}
+--- !u!1 &6852499209344917460
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2887379690186442434}
+ - component: {fileID: 2702172846433826872}
+ m_Layer: 0
+ m_Name: WallOffset
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2887379690186442434
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6852499209344917460}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 7214747441197479988}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2702172846433826872
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6852499209344917460}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a807e1003469e8349ad4334bbe5ddc5b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ xrOrigin: {fileID: 8377827832917385450}
--- !u!1 &7226706047367608979
GameObject:
m_ObjectHideFlags: 0
@@ -1174,6 +1219,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 1767192434, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
insertIndex: -1
addedObject: {fileID: 4669687390590526664}
+ - targetCorrespondingSourceObject: {fileID: 1767192434, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 2887379690186442434}
- targetCorrespondingSourceObject: {fileID: 202364688, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
insertIndex: -1
addedObject: {fileID: 4558250204184180996}
@@ -1454,6 +1502,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
m_PrefabInstance: {fileID: 7214747442693984070}
m_PrefabAsset: {fileID: 0}
+--- !u!114 &8377827832917385450 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 1178791450436251564, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
+ m_PrefabInstance: {fileID: 7214747442693984070}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e0cb9aa70a22847b5925ee5f067c10a9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!114 &8961319089329344169 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1748222016861356527, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
--
GitLab