diff --git a/Assets/DefaultPrefabObjects.asset b/Assets/DefaultPrefabObjects.asset index c0a672cf..5f81ef69 100644 --- a/Assets/DefaultPrefabObjects.asset +++ b/Assets/DefaultPrefabObjects.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7deca6e9982aaa23aff989f294b089e4efed6349174a9ed0f7bc8ea38259b04a +oid sha256:b824dfcc0800631ab60fd7291056035798563881fb4f7e6e620e65ef9342109c size 2411 diff --git a/Assets/_PROJECT/Components/Bow/Scripts/ArcheryRange.cs b/Assets/_PROJECT/Components/Bow/Scripts/ArcheryRange.cs index aafc3f07..dc465d89 100644 --- a/Assets/_PROJECT/Components/Bow/Scripts/ArcheryRange.cs +++ b/Assets/_PROJECT/Components/Bow/Scripts/ArcheryRange.cs @@ -28,7 +28,7 @@ public class ArcheryRange : NetworkBehaviour public float roundLength = 60f; public float targetSpawnTime = 3f; - public ModelGenerationBox modelGenerationBox; + public ArcheryRangeModelGenerationController modelGenerationController; public KeyboardManager keyboardManager; public NPCController npcController; @@ -139,14 +139,14 @@ public class ArcheryRange : NetworkBehaviour private ArcheryTarget SpawnTarget(Vector3 randomPos) { GameObject targetObject; - if (modelGenerationBox.GeneratedModel == null) + if (modelGenerationController.GeneratedModel == null) { // spawn default UFO targetObject = Instantiate(targetPrefab, randomPos, Quaternion.identity, null); } else { // spawn generated model - targetObject = Instantiate(modelGenerationBox.GeneratedModel, randomPos, Quaternion.identity, null); + targetObject = Instantiate(modelGenerationController.GeneratedModel, randomPos, Quaternion.identity, null); InitializeArcherytargetObject(targetObject); } diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Left Hand Colliding Prefab.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Left Hand Colliding Prefab.prefab index 7a10fca9..4cbfca19 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Left Hand Colliding Prefab.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Left Hand Colliding Prefab.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 8764262191404547501} m_Layer: 21 m_Name: hands:b_l_pinky0 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -68,7 +68,7 @@ GameObject: - component: {fileID: 1723365827026859764} m_Layer: 21 m_Name: hands:b_l_thumb3 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -123,7 +123,7 @@ GameObject: - component: {fileID: 2608288486353606751} m_Layer: 21 m_Name: hands:b_l_grip - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -155,7 +155,7 @@ GameObject: - component: {fileID: 1944697586618938354} m_Layer: 21 m_Name: hands:b_l_index1 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -210,7 +210,7 @@ GameObject: - component: {fileID: 4543854955624006782} m_Layer: 21 m_Name: hands:b_l_ring1 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -243,7 +243,7 @@ GameObject: - component: {fileID: 4269470585016323320} m_Layer: 21 m_Name: hands:b_l_index3 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -298,7 +298,7 @@ GameObject: - component: {fileID: 5275753966706537763} m_Layer: 21 m_Name: hands:b_l_thumb_ignore - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -329,7 +329,7 @@ GameObject: - component: {fileID: 2961322539409618699} m_Layer: 21 m_Name: Hand transform target - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -361,7 +361,7 @@ GameObject: - component: {fileID: 6986205080506681598} m_Layer: 21 m_Name: Thumb collider - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -415,7 +415,7 @@ GameObject: - component: {fileID: 1637212737629950891} m_Layer: 21 m_Name: hands:b_l_hand_ignore - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -447,7 +447,7 @@ GameObject: - component: {fileID: 2120999288498951984} m_Layer: 21 m_Name: hands:b_l_index2 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -502,7 +502,7 @@ GameObject: - component: {fileID: 5750800257835108047} m_Layer: 21 m_Name: hands:b_l_ring_ignore - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -534,7 +534,7 @@ GameObject: - component: {fileID: 716960368701313914} m_Layer: 21 m_Name: hands:b_l_pinky2 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -590,7 +590,7 @@ GameObject: - component: {fileID: 3386814274893541678} m_Layer: 21 m_Name: hands:Lhand - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -699,7 +699,7 @@ GameObject: - component: {fileID: 5919874647378539971} m_Layer: 21 m_Name: hands:b_l_pinky_ignore - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -732,7 +732,7 @@ GameObject: - component: {fileID: 6957428246676485499} m_Layer: 21 m_Name: hands:l_hand_world - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -804,7 +804,7 @@ GameObject: - component: {fileID: 5887795241378656881} m_Layer: 21 m_Name: hands:b_l_middle_ignore - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -836,7 +836,7 @@ GameObject: - component: {fileID: 4322167853205774804} m_Layer: 21 m_Name: Ring collider - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -890,7 +890,7 @@ GameObject: - component: {fileID: 7553050096824511736} m_Layer: 21 m_Name: hands:b_l_index_ignore - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -922,7 +922,7 @@ GameObject: - component: {fileID: 1415566195781121907} m_Layer: 21 m_Name: hands:b_l_pinky3 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -978,7 +978,7 @@ GameObject: - component: {fileID: 4386306177358856345} m_Layer: 21 m_Name: Index collider - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1033,7 +1033,7 @@ GameObject: - component: {fileID: 6789557385548509388} m_Layer: 21 m_Name: hands:b_l_thumb2 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1088,7 +1088,7 @@ GameObject: - component: {fileID: 2944632011470922523} m_Layer: 21 m_Name: Palm colliders - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1125,7 +1125,7 @@ GameObject: - component: {fileID: 3014115217857052780} m_Layer: 21 m_Name: hands:b_l_middle1 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1181,7 +1181,7 @@ GameObject: - component: {fileID: 8109105434051733588} m_Layer: 21 m_Name: hands:b_l_middle3 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1237,7 +1237,7 @@ GameObject: - component: {fileID: 3769065761299449432} m_Layer: 21 m_Name: hands:b_l_ring3 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1293,7 +1293,7 @@ GameObject: - component: {fileID: 8506477102816967445} m_Layer: 21 m_Name: hands:b_l_hand - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1356,7 +1356,7 @@ GameObject: - component: {fileID: 1591964882275427419} m_Layer: 21 m_Name: hands:b_l_ring2 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1412,7 +1412,7 @@ GameObject: - component: {fileID: 8576740011717174536} m_Layer: 21 m_Name: Left Hand Colliding Prefab - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1468,7 +1468,7 @@ GameObject: - component: {fileID: 1079438441252743571} m_Layer: 21 m_Name: hands:b_l_thumb1 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1524,7 +1524,7 @@ GameObject: - component: {fileID: 2798374626865133994} m_Layer: 21 m_Name: Middle collider - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1579,7 +1579,7 @@ GameObject: - component: {fileID: 5949439093540659439} m_Layer: 21 m_Name: hands:b_l_pinky1 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1634,7 +1634,7 @@ GameObject: - component: {fileID: 8548538124938550778} m_Layer: 21 m_Name: hands:hands_geom - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1667,7 +1667,7 @@ GameObject: - component: {fileID: 1579608193995075263} m_Layer: 21 m_Name: hands:b_l_middle2 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1723,7 +1723,7 @@ GameObject: - component: {fileID: 919376631072681037} m_Layer: 21 m_Name: Pinky collider - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Right Hand Colliding Prefab.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Right Hand Colliding Prefab.prefab index 6a8b1931..4a140090 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Right Hand Colliding Prefab.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Right Hand Colliding Prefab.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 8052033317495986407} m_Layer: 21 m_Name: hands:b_r_middle1 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -67,7 +67,7 @@ GameObject: - component: {fileID: 2906946168806256316} m_Layer: 21 m_Name: hands:b_r_thumb_ignore - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -99,7 +99,7 @@ GameObject: - component: {fileID: 3715643930745057324} m_Layer: 21 m_Name: hands:b_r_middle2 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -154,7 +154,7 @@ GameObject: - component: {fileID: 7300301753511705056} m_Layer: 21 m_Name: hands:b_r_hand - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -194,7 +194,7 @@ GameObject: - component: {fileID: 2690371468463167305} m_Layer: 21 m_Name: Thumb collider - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -248,7 +248,7 @@ GameObject: - component: {fileID: 5327335418779228248} m_Layer: 21 m_Name: Palm colliders - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -284,7 +284,7 @@ GameObject: - component: {fileID: 3590037039866930948} m_Layer: 21 m_Name: hands:b_r_ring_ignore - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -316,7 +316,7 @@ GameObject: - component: {fileID: 7768949610396455723} m_Layer: 21 m_Name: Right Hand Colliding Prefab - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -371,7 +371,7 @@ GameObject: - component: {fileID: 2252869937798432446} m_Layer: 21 m_Name: Hand transform target - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -403,7 +403,7 @@ GameObject: - component: {fileID: 4819224731497084625} m_Layer: 21 m_Name: Ring collider - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -458,7 +458,7 @@ GameObject: - component: {fileID: 5988830187266270822} m_Layer: 21 m_Name: hands:b_r_index2 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -514,7 +514,7 @@ GameObject: - component: {fileID: 3490267647208294616} m_Layer: 21 m_Name: hands:b_r_pinky1 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -569,7 +569,7 @@ GameObject: - component: {fileID: 6375747935274843628} m_Layer: 21 m_Name: hands:hands_geom - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -603,7 +603,7 @@ GameObject: - component: {fileID: 5764046989862461349} m_Layer: 21 m_Name: hands:r_hand_world - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -676,7 +676,7 @@ GameObject: - component: {fileID: 6416395892737682491} m_Layer: 21 m_Name: hands:b_r_ring1 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -732,7 +732,7 @@ GameObject: - component: {fileID: 2137975461030589968} m_Layer: 21 m_Name: hands:b_r_thumb1 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -788,7 +788,7 @@ GameObject: - component: {fileID: 3641471949121660872} m_Layer: 21 m_Name: hands:b_r_middle3 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -844,7 +844,7 @@ GameObject: - component: {fileID: 1533912411679244991} m_Layer: 21 m_Name: hands:b_r_thumb2 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -900,7 +900,7 @@ GameObject: - component: {fileID: 7674578750026270476} m_Layer: 21 m_Name: hands:b_r_index3 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -956,7 +956,7 @@ GameObject: - component: {fileID: 4783864064774963216} m_Layer: 21 m_Name: hands:b_r_index1 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1012,7 +1012,7 @@ GameObject: - component: {fileID: 8883393763632736373} m_Layer: 21 m_Name: hands:b_r_pinky3 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1068,7 +1068,7 @@ GameObject: - component: {fileID: 4631915003324200488} m_Layer: 21 m_Name: Index collider - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1123,7 +1123,7 @@ GameObject: - component: {fileID: 5712925273267891514} m_Layer: 21 m_Name: hands:b_r_ring3 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1178,7 +1178,7 @@ GameObject: - component: {fileID: 4156920047406755595} m_Layer: 21 m_Name: hands:b_r_middle_ignore - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1210,7 +1210,7 @@ GameObject: - component: {fileID: 6299028004636604754} m_Layer: 21 m_Name: hands:Rhand - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1320,7 +1320,7 @@ GameObject: - component: {fileID: 2117998936123800384} m_Layer: 21 m_Name: hands:b_r_thumb3 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1376,7 +1376,7 @@ GameObject: - component: {fileID: 4519742811004900486} m_Layer: 21 m_Name: hands:b_r_ring2 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1431,7 +1431,7 @@ GameObject: - component: {fileID: 2440932897317841026} m_Layer: 21 m_Name: hands:b_r_grip - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1462,7 +1462,7 @@ GameObject: - component: {fileID: 8288052402374024699} m_Layer: 21 m_Name: hands:b_r_hand_ignore - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1494,7 +1494,7 @@ GameObject: - component: {fileID: 2652303807040277245} m_Layer: 21 m_Name: Pinky collider - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1548,7 +1548,7 @@ GameObject: - component: {fileID: 2250556033546852906} m_Layer: 21 m_Name: hands:b_r_pinky_ignore - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1579,7 +1579,7 @@ GameObject: - component: {fileID: 9123958269350278631} m_Layer: 21 m_Name: hands:b_r_index_ignore - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1610,7 +1610,7 @@ GameObject: - component: {fileID: 6538895829321691740} m_Layer: 21 m_Name: hands:b_r_pinky0 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1643,7 +1643,7 @@ GameObject: - component: {fileID: 7691745531460669440} m_Layer: 21 m_Name: hands:b_r_pinky2 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1699,7 +1699,7 @@ GameObject: - component: {fileID: 8227723562108441212} m_Layer: 21 m_Name: Middle collider - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Left Hand Prefab.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Left Hand Prefab.prefab index 35777599..7bacb08f 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Left Hand Prefab.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Left Hand Prefab.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 6766972025625897185} m_Layer: 0 m_Name: hands:hands_geom - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -43,7 +43,7 @@ GameObject: - component: {fileID: 6766972025625897187} m_Layer: 0 m_Name: hands:l_hand_world - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -76,7 +76,7 @@ GameObject: - component: {fileID: 6766972025630685681} m_Layer: 0 m_Name: hands:Lhand - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -186,7 +186,7 @@ GameObject: - component: {fileID: 6766972025634883377} m_Layer: 0 m_Name: Left Hand Prefab - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -228,6 +228,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &6766972025625408657 GameObject: m_ObjectHideFlags: 0 @@ -239,7 +240,7 @@ GameObject: - component: {fileID: 6766972025625897201} m_Layer: 0 m_Name: hands:b_l_ring1 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -271,7 +272,7 @@ GameObject: - component: {fileID: 6766972025625897203} m_Layer: 0 m_Name: hands:b_l_ring2 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -303,7 +304,7 @@ GameObject: - component: {fileID: 6766972025625897205} m_Layer: 0 m_Name: hands:b_l_ring3 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -335,7 +336,7 @@ GameObject: - component: {fileID: 6766972025625897207} m_Layer: 0 m_Name: hands:b_l_ring_ignore - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -366,7 +367,7 @@ GameObject: - component: {fileID: 6766972025625897209} m_Layer: 0 m_Name: hands:b_l_thumb1 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -398,7 +399,7 @@ GameObject: - component: {fileID: 6766972025625897211} m_Layer: 0 m_Name: hands:b_l_thumb2 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -430,7 +431,7 @@ GameObject: - component: {fileID: 6766972025625897213} m_Layer: 0 m_Name: hands:b_l_thumb3 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -462,7 +463,7 @@ GameObject: - component: {fileID: 6766972025625897215} m_Layer: 0 m_Name: hands:b_l_thumb_ignore - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -493,7 +494,7 @@ GameObject: - component: {fileID: 6766972025625897153} m_Layer: 0 m_Name: hands:b_l_middle2 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -525,7 +526,7 @@ GameObject: - component: {fileID: 6766972025625897155} m_Layer: 0 m_Name: hands:b_l_middle3 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -557,7 +558,7 @@ GameObject: - component: {fileID: 6766972025625897157} m_Layer: 0 m_Name: hands:b_l_middle_ignore - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -588,7 +589,7 @@ GameObject: - component: {fileID: 6766972025625897159} m_Layer: 0 m_Name: hands:b_l_pinky0 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -620,7 +621,7 @@ GameObject: - component: {fileID: 6766972025625897161} m_Layer: 0 m_Name: hands:b_l_pinky1 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -652,7 +653,7 @@ GameObject: - component: {fileID: 6766972025625897163} m_Layer: 0 m_Name: hands:b_l_pinky2 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -684,7 +685,7 @@ GameObject: - component: {fileID: 6766972025625897165} m_Layer: 0 m_Name: hands:b_l_pinky3 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -716,7 +717,7 @@ GameObject: - component: {fileID: 6766972025625897167} m_Layer: 0 m_Name: hands:b_l_pinky_ignore - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -747,7 +748,7 @@ GameObject: - component: {fileID: 6766972025625897169} m_Layer: 0 m_Name: hands:b_l_grip - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -778,7 +779,7 @@ GameObject: - component: {fileID: 6766972025625897171} m_Layer: 0 m_Name: hands:b_l_hand - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -816,7 +817,7 @@ GameObject: - component: {fileID: 6766972025625897173} m_Layer: 0 m_Name: hands:b_l_hand_ignore - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -847,7 +848,7 @@ GameObject: - component: {fileID: 6766972025625897175} m_Layer: 0 m_Name: hands:b_l_index1 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -879,7 +880,7 @@ GameObject: - component: {fileID: 6766972025625897177} m_Layer: 0 m_Name: hands:b_l_index2 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -911,7 +912,7 @@ GameObject: - component: {fileID: 6766972025625897179} m_Layer: 0 m_Name: hands:b_l_index3 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -943,7 +944,7 @@ GameObject: - component: {fileID: 6766972025625897181} m_Layer: 0 m_Name: hands:b_l_index_ignore - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -974,7 +975,7 @@ GameObject: - component: {fileID: 6766972025625897183} m_Layer: 0 m_Name: hands:b_l_middle1 - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Right Hand Prefab.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Right Hand Prefab.prefab index 32a11b9c..a9daab20 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Right Hand Prefab.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Right Hand Prefab.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 5553551016358058816} m_Layer: 0 m_Name: hands:b_r_thumb2 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -43,7 +43,7 @@ GameObject: - component: {fileID: 5553551016358058818} m_Layer: 0 m_Name: hands:b_r_thumb1 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -75,7 +75,7 @@ GameObject: - component: {fileID: 5553551016358058820} m_Layer: 0 m_Name: hands:b_r_thumb_ignore - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -106,7 +106,7 @@ GameObject: - component: {fileID: 5553551016358058822} m_Layer: 0 m_Name: hands:b_r_thumb3 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -138,7 +138,7 @@ GameObject: - component: {fileID: 5553551016358058824} m_Layer: 0 m_Name: hands:b_r_ring2 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -170,7 +170,7 @@ GameObject: - component: {fileID: 5553551016358058826} m_Layer: 0 m_Name: hands:b_r_ring1 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -202,7 +202,7 @@ GameObject: - component: {fileID: 5553551016358058828} m_Layer: 0 m_Name: hands:b_r_ring_ignore - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -233,7 +233,7 @@ GameObject: - component: {fileID: 5553551016358058830} m_Layer: 0 m_Name: hands:b_r_ring3 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -265,7 +265,7 @@ GameObject: - component: {fileID: 5553551016358058840} m_Layer: 0 m_Name: hands:r_hand_world - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -297,7 +297,7 @@ GameObject: - component: {fileID: 5553551016358058842} m_Layer: 0 m_Name: hands:hands_geom - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -330,7 +330,7 @@ GameObject: - component: {fileID: 5553551016367944842} m_Layer: 0 m_Name: Right Hand Prefab - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -372,6 +372,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &5553551016358545214 GameObject: m_ObjectHideFlags: 0 @@ -384,7 +385,7 @@ GameObject: - component: {fileID: 5553551016372144714} m_Layer: 0 m_Name: hands:Rhand - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -493,7 +494,7 @@ GameObject: - component: {fileID: 5553551016358058848} m_Layer: 0 m_Name: hands:b_r_index3 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -525,7 +526,7 @@ GameObject: - component: {fileID: 5553551016358058850} m_Layer: 0 m_Name: hands:b_r_index2 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -557,7 +558,7 @@ GameObject: - component: {fileID: 5553551016358058852} m_Layer: 0 m_Name: hands:b_r_middle1 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -589,7 +590,7 @@ GameObject: - component: {fileID: 5553551016358058854} m_Layer: 0 m_Name: hands:b_r_index_ignore - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -620,7 +621,7 @@ GameObject: - component: {fileID: 5553551016358058856} m_Layer: 0 m_Name: hands:b_r_hand - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -658,7 +659,7 @@ GameObject: - component: {fileID: 5553551016358058858} m_Layer: 0 m_Name: hands:b_r_grip - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -689,7 +690,7 @@ GameObject: - component: {fileID: 5553551016358058860} m_Layer: 0 m_Name: hands:b_r_index1 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -721,7 +722,7 @@ GameObject: - component: {fileID: 5553551016358058862} m_Layer: 0 m_Name: hands:b_r_hand_ignore - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -752,7 +753,7 @@ GameObject: - component: {fileID: 5553551016358058864} m_Layer: 0 m_Name: hands:b_r_pinky2 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -784,7 +785,7 @@ GameObject: - component: {fileID: 5553551016358058866} m_Layer: 0 m_Name: hands:b_r_pinky1 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -816,7 +817,7 @@ GameObject: - component: {fileID: 5553551016358058868} m_Layer: 0 m_Name: hands:b_r_pinky_ignore - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -847,7 +848,7 @@ GameObject: - component: {fileID: 5553551016358058870} m_Layer: 0 m_Name: hands:b_r_pinky3 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -879,7 +880,7 @@ GameObject: - component: {fileID: 5553551016358058872} m_Layer: 0 m_Name: hands:b_r_middle3 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -911,7 +912,7 @@ GameObject: - component: {fileID: 5553551016358058874} m_Layer: 0 m_Name: hands:b_r_middle2 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -943,7 +944,7 @@ GameObject: - component: {fileID: 5553551016358058876} m_Layer: 0 m_Name: hands:b_r_pinky0 - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -975,7 +976,7 @@ GameObject: - component: {fileID: 5553551016358058878} m_Layer: 0 m_Name: hands:b_r_middle_ignore - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab index 0e014aac..eb599658 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab @@ -3848,7 +3848,7 @@ GameObject: - component: {fileID: 6319035899684778083} m_Layer: 0 m_Name: Left Hand - m_TagString: Untagged + m_TagString: Player Left Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -6181,7 +6181,7 @@ GameObject: - component: {fileID: 2428925342826453737} m_Layer: 0 m_Name: Right Hand - m_TagString: Untagged + m_TagString: Player Right Hand m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/_PROJECT/Images/mic_off-transparent.png b/Assets/_PROJECT/Images/mic_off-transparent.png new file mode 100644 index 00000000..2b973620 --- /dev/null +++ b/Assets/_PROJECT/Images/mic_off-transparent.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea22e1e4669db01f3d2a85bb7433c8b2fd28eddad51da94f77fb5b4b9f9c38f5 +size 89725 diff --git a/Assets/_PROJECT/Images/mic_off-transparent.png.meta b/Assets/_PROJECT/Images/mic_off-transparent.png.meta new file mode 100644 index 00000000..492c2fe6 --- /dev/null +++ b/Assets/_PROJECT/Images/mic_off-transparent.png.meta @@ -0,0 +1,148 @@ +fileFormatVersion: 2 +guid: 68669679d082ba94bb4a39c08fa91e0d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Images/mic_on-transparent.png b/Assets/_PROJECT/Images/mic_on-transparent.png new file mode 100644 index 00000000..bddc1d75 --- /dev/null +++ b/Assets/_PROJECT/Images/mic_on-transparent.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f61af1531078919d9d3c3b8d354d661b168cd400899e957fcec808f8dc806802 +size 66020 diff --git a/Assets/_PROJECT/Images/mic_on-transparent.png.meta b/Assets/_PROJECT/Images/mic_on-transparent.png.meta new file mode 100644 index 00000000..eb8765bf --- /dev/null +++ b/Assets/_PROJECT/Images/mic_on-transparent.png.meta @@ -0,0 +1,148 @@ +fileFormatVersion: 2 +guid: 3f2516f6ee1cb5c4ba7f85f24c3d4f43 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Models/ModelGeneration.meta b/Assets/_PROJECT/Models/ModelGeneration.meta new file mode 100644 index 00000000..ffca884b --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b178bdf9bc7865043be6b1d12e072b59 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Models/ModelGeneration/Button.fbx b/Assets/_PROJECT/Models/ModelGeneration/Button.fbx new file mode 100644 index 00000000..fcb590d7 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Button.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8db052cda6a9cff66c1ac2e0f23fbbf7f711ef8d8df4e0656b00e3f25533c93 +size 90800 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Button.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Button.fbx.meta new file mode 100644 index 00000000..d3a6db34 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Button.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 8360cb58a6640db4fafae736bb1b0393 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand.meta b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand.meta new file mode 100644 index 00000000..b6686950 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb5850db4a54143459f5726604c877d5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/MicrophoneStand.mat b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/MicrophoneStand.mat new file mode 100644 index 00000000..0b59d5d7 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/MicrophoneStand.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MicrophoneStand + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, 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: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ece692bd0a972854ca30e8e24bb5f635, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ece692bd0a972854ca30e8e24bb5f635, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &2216343319369955251 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/MicrophoneStand.mat.meta b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/MicrophoneStand.mat.meta new file mode 100644 index 00000000..45d7d7eb --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/MicrophoneStand.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19c6f99eccf0c69469fd5c281f18b5c0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/microphone_stand.fbx b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/microphone_stand.fbx new file mode 100644 index 00000000..83ac3a15 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/microphone_stand.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88a9d4840597b0bb30e145da65e062ece5064f4afbecc32ea9c0762a6673256d +size 1387276 diff --git a/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/microphone_stand.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/microphone_stand.fbx.meta new file mode 100644 index 00000000..1830cb7b --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/microphone_stand.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 7c81a7464d27596489f008c96d1971c8 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 0 + importBlendShapes: 1 + importCameras: 0 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/microphone_stand.png b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/microphone_stand.png new file mode 100644 index 00000000..95c33073 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/microphone_stand.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac47b723e183335612ee232895d9ba07e4d701c6dd96648a37b58b28a2776950 +size 1236013 diff --git a/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/microphone_stand.png.meta b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/microphone_stand.png.meta new file mode 100644 index 00000000..8f5d7667 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/MicrophoneStand/microphone_stand.png.meta @@ -0,0 +1,148 @@ +fileFormatVersion: 2 +guid: ece692bd0a972854ca30e8e24bb5f635 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Multiplayer/NetworkPrefabs/Kyle Head.prefab b/Assets/_PROJECT/Multiplayer/NetworkPrefabs/Kyle Head.prefab index 3f4692fc..024117ec 100644 --- a/Assets/_PROJECT/Multiplayer/NetworkPrefabs/Kyle Head.prefab +++ b/Assets/_PROJECT/Multiplayer/NetworkPrefabs/Kyle Head.prefab @@ -11,9 +11,10 @@ GameObject: - component: {fileID: 4543634915546932302} - component: {fileID: 5893868613512797762} - component: {fileID: 2641940034920470259} + - component: {fileID: 7343580558529594842} m_Layer: 0 m_Name: Kyle Head - m_TagString: Untagged + m_TagString: Player Head m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -83,3 +84,25 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &7343580558529594842 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5706508759349694606} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -3248716571764886803, guid: 0f6a9ca50b7cc814b97069156050165a, type: 3} diff --git a/Assets/_PROJECT/Prefabs/Characters.meta b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters.meta similarity index 100% rename from Assets/_PROJECT/Prefabs/Characters.meta rename to Assets/_PROJECT/Prefabs/ModelGeneration/Characters.meta diff --git a/Assets/_PROJECT/Prefabs/Characters/BillboardNPC.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/BillboardNPC.prefab similarity index 99% rename from Assets/_PROJECT/Prefabs/Characters/BillboardNPC.prefab rename to Assets/_PROJECT/Prefabs/ModelGeneration/Characters/BillboardNPC.prefab index 6abb34d7..55586dd7 100644 --- a/Assets/_PROJECT/Prefabs/Characters/BillboardNPC.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/BillboardNPC.prefab @@ -247,7 +247,7 @@ MonoBehaviour: k__BackingField: 0 _scenePathHash: 0 k__BackingField: 0 - k__BackingField: 9749221921362668639 + k__BackingField: 13803629248975202771 _sceneNetworkObjects: [] --- !u!114 &483845010817450077 MonoBehaviour: diff --git a/Assets/_PROJECT/Prefabs/Characters/BillboardNPC.prefab.meta b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/BillboardNPC.prefab.meta similarity index 100% rename from Assets/_PROJECT/Prefabs/Characters/BillboardNPC.prefab.meta rename to Assets/_PROJECT/Prefabs/ModelGeneration/Characters/BillboardNPC.prefab.meta diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand 1.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand 1.prefab new file mode 100644 index 00000000..b84f80db --- /dev/null +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand 1.prefab @@ -0,0 +1,412 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4291579148315658230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6761968278529855575} + - component: {fileID: 4763701867718457502} + - component: {fileID: 7203143526414218131} + - component: {fileID: 2568780590385977406} + - component: {fileID: 1523408157143897080} + - component: {fileID: 2918895218826581840} + m_Layer: 0 + m_Name: MicrophoneStand 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6761968278529855575 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4291579148315658230} + 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: + - {fileID: 1850758373829337931} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4763701867718457502 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4291579148315658230} + m_Mesh: {fileID: -8524547844719368960, guid: 7c81a7464d27596489f008c96d1971c8, type: 3} +--- !u!23 &7203143526414218131 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4291579148315658230} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 19c6f99eccf0c69469fd5c281f18b5c0, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!135 &2568780590385977406 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4291579148315658230} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.47 + m_Center: {x: 0, y: 0.48, z: 0} +--- !u!114 &1523408157143897080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4291579148315658230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 357101b2cface4943b04dfd25d4944e3, type: 3} + m_Name: + m_EditorClassIdentifier: + whisper: {fileID: 0} + microphoneRecord: {fileID: 2918895218826581840} + microphoneDevice: + outputText: {fileID: 0} + microphoneOffStatus: {fileID: 8977839985090371394} + microphoneOnStatus: {fileID: 6537061652288108950} +--- !u!114 &2918895218826581840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4291579148315658230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3bc03a4c19604ea394e364f8fc632928, type: 3} + m_Name: + m_EditorClassIdentifier: + maxLengthSec: 60 + loop: 0 + frequency: 16000 + chunksLengthSec: 0.5 + echo: 1 + useVad: 1 + vadUpdateRateSec: 0.1 + vadContextSec: 30 + vadLastSec: 1.25 + vadThd: 1 + vadFreqThd: 100 + vadIndicatorImage: {fileID: 0} + vadStop: 0 + dropVadPart: 1 + vadStopTime: 3 + microphoneDropdown: {fileID: 0} + microphoneDefaultLabel: Default microphone +--- !u!1 &5819798980962142350 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1850758373829337931} + - component: {fileID: 2106466490739867277} + - component: {fileID: 4587043586550884435} + - component: {fileID: 8719646384572601803} + m_Layer: 0 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1850758373829337931 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5819798980962142350} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0405} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4321634455225286656} + - {fileID: 3972028686577586524} + m_Father: {fileID: 6761968278529855575} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.6033} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &2106466490739867277 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5819798980962142350} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &4587043586550884435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5819798980962142350} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &8719646384572601803 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5819798980962142350} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &6537061652288108950 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3972028686577586524} + - component: {fileID: 3263217202320683959} + - component: {fileID: 6147207569465961459} + m_Layer: 0 + m_Name: MicrophoneOnStatus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3972028686577586524 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6537061652288108950} + 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: 1850758373829337931} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3263217202320683959 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6537061652288108950} + m_CullTransparentMesh: 1 +--- !u!114 &6147207569465961459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6537061652288108950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3f2516f6ee1cb5c4ba7f85f24c3d4f43, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8977839985090371394 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4321634455225286656} + - component: {fileID: 1842889781999843329} + - component: {fileID: 6304871477875013403} + m_Layer: 0 + m_Name: MicrophoneOffStatus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4321634455225286656 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8977839985090371394} + 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: 1850758373829337931} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1842889781999843329 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8977839985090371394} + m_CullTransparentMesh: 1 +--- !u!114 &6304871477875013403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8977839985090371394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 68669679d082ba94bb4a39c08fa91e0d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand 1.prefab.meta b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand 1.prefab.meta new file mode 100644 index 00000000..37a4036e --- /dev/null +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 44b369698b4397b45b9424694c46f2f5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/PushableButton.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/PushableButton.prefab new file mode 100644 index 00000000..5bb9b9d0 --- /dev/null +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/PushableButton.prefab @@ -0,0 +1,950 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1169182471819634640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4240401643028668239} + - component: {fileID: 273463341747264742} + - component: {fileID: 3692162826506377719} + - component: {fileID: 2380080891026113594} + m_Layer: 0 + m_Name: Cylinder001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4240401643028668239 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169182471819634640} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 0.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 482679184226219918} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &273463341747264742 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169182471819634640} + m_Mesh: {fileID: -951608786083511892, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!23 &3692162826506377719 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169182471819634640} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: e91db078e551c294ebe28046b39b12e9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &2380080891026113594 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169182471819634640} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -951608786083511892, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!1 &2536833106027243940 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2207676128236083891} + - component: {fileID: 2694329122806799587} + - component: {fileID: 6056201921433813319} + m_Layer: 0 + m_Name: Cylinder003 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2207676128236083891 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2536833106027243940} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0.17, y: 0.26500002, z: -0.17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 482679184226219918} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2694329122806799587 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2536833106027243940} + m_Mesh: {fileID: 8245426573784773463, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!23 &6056201921433813319 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2536833106027243940} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 8827041594150943702, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3878322464778129187 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7076239066448273417} + m_Layer: 0 + m_Name: MovingParts + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7076239066448273417 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3878322464778129187} + 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: + - {fileID: 4336361997087478217} + - {fileID: 6576810485851996243} + m_Father: {fileID: 482679184226219918} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4775535348344811059 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5562008773316150738} + - component: {fileID: 877170626360368607} + - component: {fileID: 4944163138911610293} + - component: {fileID: 3699043554713949368} + m_Layer: 0 + m_Name: ButtonTop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5562008773316150738 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4775535348344811059} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0.00000009689331, y: 0.14999992, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 482679184226219918} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &877170626360368607 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4775535348344811059} + m_Mesh: {fileID: -5555371156602442440, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!23 &4944163138911610293 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4775535348344811059} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: e91db078e551c294ebe28046b39b12e9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &3699043554713949368 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4775535348344811059} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -5555371156602442440, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!1 &5197025108969329577 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1893747331554953798} + - component: {fileID: 2521276515104329971} + - component: {fileID: 341820865862404799} + m_Layer: 0 + m_Name: Cylinder005 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1893747331554953798 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5197025108969329577} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0.17, y: 0.26500002, z: 0.17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 482679184226219918} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2521276515104329971 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5197025108969329577} + m_Mesh: {fileID: -7816157650164661064, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!23 &341820865862404799 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5197025108969329577} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 8827041594150943702, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5819324442668357760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 482679184226219918} + m_Layer: 0 + m_Name: PushableButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &482679184226219918 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5819324442668357760} + 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: + - {fileID: 7076239066448273417} + - {fileID: 4078966097693282274} + - {fileID: 5562008773316150738} + - {fileID: 4240401643028668239} + - {fileID: 5194222186652980404} + - {fileID: 2207676128236083891} + - {fileID: 6308964038308262145} + - {fileID: 1893747331554953798} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6495126190302863702 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5194222186652980404} + - component: {fileID: 8092211601091532622} + - component: {fileID: 158914536223107651} + m_Layer: 0 + m_Name: Cylinder002 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5194222186652980404 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6495126190302863702} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0.16999999, y: 0.26500002, z: 0.17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 482679184226219918} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8092211601091532622 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6495126190302863702} + m_Mesh: {fileID: -2128599272216676504, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!23 &158914536223107651 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6495126190302863702} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 8827041594150943702, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6673437544611594859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4336361997087478217} + - component: {fileID: 6254159533804701904} + - component: {fileID: 5949385500310894080} + - component: {fileID: 5138955312328330918} + m_Layer: 0 + m_Name: ButtonMid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4336361997087478217 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6673437544611594859} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.316, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7076239066448273417} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6254159533804701904 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6673437544611594859} + m_Mesh: {fileID: 3370307122583468558, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!23 &5949385500310894080 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6673437544611594859} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 707a698b0ec80454a8c68700bca72941, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &5138955312328330918 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6673437544611594859} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 3370307122583468558, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!1 &7239982701835230558 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6308964038308262145} + - component: {fileID: 5075223532662673685} + - component: {fileID: 9209277692448190339} + m_Layer: 0 + m_Name: Cylinder004 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6308964038308262145 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7239982701835230558} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0.17, y: 0.26500002, z: -0.17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 482679184226219918} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5075223532662673685 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7239982701835230558} + m_Mesh: {fileID: -5208879343037863941, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!23 &9209277692448190339 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7239982701835230558} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 8827041594150943702, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &8106115827673679234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4078966097693282274} + - component: {fileID: 5363703099776344735} + - component: {fileID: 5109974040983004693} + - component: {fileID: 3851278602059192841} + m_Layer: 0 + m_Name: ButtonBase + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4078966097693282274 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8106115827673679234} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 482679184226219918} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5363703099776344735 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8106115827673679234} + m_Mesh: {fileID: 6686689856544752723, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!23 &5109974040983004693 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8106115827673679234} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: e91db078e551c294ebe28046b39b12e9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &3851278602059192841 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8106115827673679234} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 6686689856544752723, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!1 &8708035160588895096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6576810485851996243} + - component: {fileID: 394584629206694651} + - component: {fileID: 6368194004820412582} + - component: {fileID: 913943368950141711} + - component: {fileID: 2817281613977337957} + m_Layer: 0 + m_Name: ButtonPress + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6576810485851996243 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8708035160588895096} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.466, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7076239066448273417} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &394584629206694651 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8708035160588895096} + m_Mesh: {fileID: 6565873828156177285, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!23 &6368194004820412582 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8708035160588895096} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 707a698b0ec80454a8c68700bca72941, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &913943368950141711 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8708035160588895096} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 6565873828156177285, guid: 8360cb58a6640db4fafae736bb1b0393, type: 3} +--- !u!114 &2817281613977337957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8708035160588895096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 682848c63dbd4614880393ae570f719c, type: 3} + m_Name: + m_EditorClassIdentifier: + movableParts: {fileID: 7076239066448273417} diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/PushableButton.prefab.meta b/Assets/_PROJECT/Prefabs/ModelGeneration/PushableButton.prefab.meta new file mode 100644 index 00000000..60f8152e --- /dev/null +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/PushableButton.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4453f13d185929b4583c1274b082226c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 6b207c4c..a63fbf57 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b004b66d38e7989cf5cf7841337a4c90405b8c788bb7a36e05b418d0d81e8bee -size 67844080 +oid sha256:1590b22f049a10c3dd81ead55fd565b7cdb28aa2335d1f0baa7cc32d4bd16c29 +size 67757922 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRangeModelGenerationController.cs b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRangeModelGenerationController.cs new file mode 100644 index 00000000..5b42cf74 --- /dev/null +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRangeModelGenerationController.cs @@ -0,0 +1,86 @@ +using System; +using UnityEngine; +using UnityEngine.UI; + +public class ArcheryRangeModelGenerationController : MonoBehaviour +{ + public MicrophoneStand microphoneStand; + public PushableButton imageGenerationButton; + public PushableButton modelGenerationButton; + + public string imageGenerationPromptSuffix = ", single object, front and side fully visible, realistic style, plain neutral background, clear details, soft studio lighting, true-to-scale"; + public Texture2D GeneratedTexture { get; private set; } + public Image imageDisplay; + + public Transform modelSpawnPoint; + public GameObject GeneratedModel { get; private set; } + + // Start is called before the first frame update + void Start() + { + imageGenerationButton.OnButtonPressed += InvokeImageGeneration; + modelGenerationButton.OnButtonPressed += InvokeModelGeneration; + } + + // Update is called once per frame + void Update() + { + + } + + private async void InvokeImageGeneration() + { + string inputPrompt = microphoneStand.GetTextOutput(); + string refinedPrompt = inputPrompt + imageGenerationPromptSuffix; + + + byte[] imageBytes = await InvokeAiClient.Instance.GenerateImage(refinedPrompt); + GeneratedTexture = CreateTexture(imageBytes); + Sprite sprite = CreateSprite(GeneratedTexture); + imageDisplay.sprite = sprite; + + imageGenerationButton.MoveButtonUp(); + } + + private async void InvokeModelGeneration() + { + string encodedTexture = Convert.ToBase64String(GeneratedTexture.EncodeToJPG()); + byte[] encodedModel = await TrellisClient.Instance.GenerateModel(encodedTexture); + + GameObject spawnedObject = await PipelineManager.Instance.SpawnModel(encodedModel); + spawnedObject.AddComponent(); + spawnedObject.transform.parent = modelSpawnPoint; + spawnedObject.transform.position = modelSpawnPoint.position; + GeneratedModel = spawnedObject; + + modelGenerationButton.MoveButtonUp(); + } + + private Texture2D CreateTexture(byte[] imageBytes) + { + var tex = new Texture2D(2, 2, TextureFormat.RGBA32, false); + // ImageConversion.LoadImage returns bool (true = success) + if (!ImageConversion.LoadImage(tex, imageBytes, markNonReadable: false)) + { + Destroy(tex); + throw new InvalidOperationException("Failed to decode image bytes into Texture2D."); + } + + tex.filterMode = FilterMode.Bilinear; + tex.wrapMode = TextureWrapMode.Clamp; + + return tex; + } + + private Sprite CreateSprite(Texture2D tex) + { + var sprite = Sprite.Create( + tex, + new Rect(0, 0, tex.width, tex.height), + new Vector2(0.5f, 0.5f), + pixelsPerUnit: 100f + ); + + return sprite; + } +} diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRangeModelGenerationController.cs.meta b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRangeModelGenerationController.cs.meta new file mode 100644 index 00000000..eab28103 --- /dev/null +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRangeModelGenerationController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 99e1fdda206b5d04082b6a45593a1e84 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/MicrophoneStand.cs b/Assets/_PROJECT/Scripts/ModeGeneration/MicrophoneStand.cs new file mode 100644 index 00000000..3cbfb7a0 --- /dev/null +++ b/Assets/_PROJECT/Scripts/ModeGeneration/MicrophoneStand.cs @@ -0,0 +1,87 @@ +using TMPro; +using UnityEngine; +using Whisper; +using Whisper.Utils; + +public class MicrophoneStand : MonoBehaviour +{ + public WhisperManager whisper; + public MicrophoneRecord microphoneRecord; + public string microphoneDevice; + public TextMeshProUGUI outputText; + + private WhisperStream stream; + + private string textOutput; + + public GameObject microphoneOffStatus; + public GameObject microphoneOnStatus; + + // Start is called before the first frame update + async void Start() + { + Debug.Log("Mic devices: " + string.Join(", ", Microphone.devices)); + Debug.Log("Using mic device: " + microphoneDevice); + microphoneRecord.SelectedMicDevice = microphoneDevice; + + // This causes about 1 sec long freeze, has to be done once at the start of the game + microphoneRecord.StartRecord(); + + stream = await whisper.CreateStream(microphoneRecord); + stream.OnResultUpdated += OnWhisperResult; + + microphoneOffStatus.SetActive(true); + microphoneOnStatus.SetActive(false); + } + + // Update is called once per frame + void Update() + { + + } + + void OnTriggerEnter(Collider other) + { + KbmController controller = other.GetComponent(); + Debug.Log("Mic stand collided with object " + other.gameObject.name); + + if (controller != null || other.gameObject.tag == "Player Head") + { + microphoneOffStatus.SetActive(false); + microphoneOnStatus.SetActive(true); + + stream.StartStream(); + Debug.Log("Whisper stream started."); + } + } + + private void OnTriggerExit(Collider other) + { + KbmController controller = other.GetComponent(); + if (controller != null | other.gameObject.tag == "Player Head") + { + microphoneOffStatus.SetActive(true); + microphoneOnStatus.SetActive(false); + + stream.StopStream(); + textOutput = outputText.text; + } + } + + private void OnWhisperResult(string result) + { + Debug.Log("Whisper result processed: " + result); + outputText.text = result; + } + + private void OnDestroy() + { + microphoneRecord.StopRecord(); + Destroy(gameObject); + } + + public string GetTextOutput() + { + return textOutput; + } +} diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/MicrophoneStand.cs.meta b/Assets/_PROJECT/Scripts/ModeGeneration/MicrophoneStand.cs.meta new file mode 100644 index 00000000..c3192547 --- /dev/null +++ b/Assets/_PROJECT/Scripts/ModeGeneration/MicrophoneStand.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 357101b2cface4943b04dfd25d4944e3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs b/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs new file mode 100644 index 00000000..7de136fa --- /dev/null +++ b/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs @@ -0,0 +1,52 @@ + +using DG.Tweening; +using UnityEngine; + +public class PushableButton : MonoBehaviour +{ + public delegate void OnButtonPressedDelegate(); + public event OnButtonPressedDelegate OnButtonPressed; + + + public Transform movableParts; + public float moveDuration = 0.25f; + + private float upPositionY; + private float downPositionY; + private bool isButtonDown; + + private void Awake() + { + upPositionY = movableParts.localPosition.y; + downPositionY = movableParts.localPosition.y - 0.1f; + isButtonDown = false; + } + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + private void OnCollisionEnter(Collision collision) + { + if (!isButtonDown && collision.gameObject.tag.EndsWith("Hand")) + { + movableParts.DOLocalMoveY(downPositionY, moveDuration); + isButtonDown = true; + OnButtonPressed?.Invoke(); + } + } + + public void MoveButtonUp() + { + movableParts.DOLocalMoveY(upPositionY, moveDuration); + isButtonDown = false; + } +} diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs.meta b/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs.meta new file mode 100644 index 00000000..ccf5cd07 --- /dev/null +++ b/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 682848c63dbd4614880393ae570f719c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scripts/NPCController.cs b/Assets/_PROJECT/Scripts/NPCController.cs index f08868e3..60912fb5 100644 --- a/Assets/_PROJECT/Scripts/NPCController.cs +++ b/Assets/_PROJECT/Scripts/NPCController.cs @@ -35,7 +35,6 @@ public class NPCController : MonoBehaviour private void OnTriggerEnter(Collider other) { - Debug.Log("Collided with " + other); KbmController controller = other.GetComponent(); XROrigin playerOrigin = other.GetComponent(); if (controller != null) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 982ff64b..558f4158 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69667d5279fb448c3347888d340da965b1e2acd14f1bef8f84a74d290ff6970f -size 26836 +oid sha256:7d0812577ef673b87b04aba8d878bfe8a84068278b9368bcbe0700a93d87ad50 +size 26527 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 5fd24508..f3f4e23e 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e448371fb8158f3b30ee94564465a1679b031a008f04ac5ea9fd4862f28a50e -size 884 +oid sha256:c83c84c4d36e1b0c6a708d778acf75ef622cb298065f419b6b30872a7d47ab84 +size 943