diff --git a/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/.cmake/api/v1/reply/index-2024-07-11T20-08-40-0792.json b/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/.cmake/api/v1/reply/index-2024-07-18T17-48-29-0413.json similarity index 100% rename from detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/.cmake/api/v1/reply/index-2024-07-11T20-08-40-0792.json rename to detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/.cmake/api/v1/reply/index-2024-07-18T17-48-29-0413.json diff --git a/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/.ninja_deps b/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/.ninja_deps index 092cc44e0f4462028fbcd9090900c6fc6b70a832..0c3322be93339f1f4b7d7aee52d6f29fffc88a0b 100644 Binary files a/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/.ninja_deps and b/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/.ninja_deps differ diff --git a/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/.ninja_log b/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/.ninja_log index 5a825a8565b2e64332c8e354522d1795b22fb2f5..15d23bf34e4e63217c17bc58a5fc811c4a9afee2 100644 --- a/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/.ninja_log +++ b/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/.ninja_log @@ -1,21 +1,21 @@ # ninja log v5 -7754 8006 1720554475892084041 /Users/finnmahrenholtz/GAMIS project/unity/detectivesherlock/Library/Bee/Android/Prj/IL2CPP/Gradle/unityLibrary/build/intermediates/cxx/RelWithDebInfo/3xhv1l60/obj/arm64-v8a/libgame.so 307dd48a49efc920 -0 7754 1720554475730573585 GameActivity/CMakeFiles/game.dir/UGAApplication.cpp.o 68b2ffadce04f301 -2 6107 1720554474088149952 GameActivity/CMakeFiles/game.dir/UGADebug.cpp.o 32582ac159b35ebb -5 7409 1720554475374469486 GameActivity/CMakeFiles/game.dir/UGAInput.cpp.o 5459bdc93dc866e3 -9 6051 1720554474031693560 GameActivity/CMakeFiles/game.dir/UGASoftKeyboard.cpp.o 46c0d3b0583b806a -3 5337 1720554473246218999 GameActivity/CMakeFiles/game.dir/UGAEntry.cpp.o e6638f52cf600621 -6 5193 1720554473174475695 GameActivity/CMakeFiles/game.dir/UGAInputKeyEvent.cpp.o 49df3135580a3832 -11 869 1720554468858133409 FramePacing/CMakeFiles/swappywrapper.dir/UnitySwappyWrapper.cpp.o ae2c75a5f1c88f37 -870 1077 1720554469009633418 /Users/finnmahrenholtz/GAMIS project/unity/detectivesherlock/Library/Bee/Android/Prj/IL2CPP/Gradle/unityLibrary/build/intermediates/cxx/RelWithDebInfo/3xhv1l60/obj/arm64-v8a/libswappywrapper.so f2881fef4e61f6f9 -8 5450 1720554473431468922 GameActivity/CMakeFiles/game.dir/UGAInputMotionEvent.cpp.o 3ae49d88c3747767 +6 1532 1720728522586697346 GameActivity/CMakeFiles/game.dir/UGAInputMotionEvent.cpp.o 3ae49d88c3747767 +263 3381 1720728524405289160 /Users/finnmahrenholtz/GAMIS project/unity/detectivesherlock/Library/Bee/Android/Prj/IL2CPP/Gradle/unityLibrary/build/intermediates/cxx/RelWithDebInfo/3xhv1l60/obj/arm64-v8a/libswappywrapper.so f2881fef4e61f6f9 8 263 1720728521324473180 FramePacing/CMakeFiles/swappywrapper.dir/UnitySwappyWrapper.cpp.o ae2c75a5f1c88f37 -4 1450 1720728522500685282 GameActivity/CMakeFiles/game.dir/UGAEntry.cpp.o e6638f52cf600621 5 1468 1720728522521154963 GameActivity/CMakeFiles/game.dir/UGAInputKeyEvent.cpp.o 49df3135580a3832 -6 1532 1720728522586697346 GameActivity/CMakeFiles/game.dir/UGAInputMotionEvent.cpp.o 3ae49d88c3747767 +4 1450 1720728522500685282 GameActivity/CMakeFiles/game.dir/UGAEntry.cpp.o e6638f52cf600621 7 1693 1720728522745628290 GameActivity/CMakeFiles/game.dir/UGASoftKeyboard.cpp.o 46c0d3b0583b806a -4 1765 1720728522820826245 GameActivity/CMakeFiles/game.dir/UGADebug.cpp.o 32582ac159b35ebb 5 2015 1720728523071621630 GameActivity/CMakeFiles/game.dir/UGAInput.cpp.o 5459bdc93dc866e3 3 2145 1720728523200242000 GameActivity/CMakeFiles/game.dir/UGAApplication.cpp.o 68b2ffadce04f301 -263 3381 1720728524405289160 /Users/finnmahrenholtz/GAMIS project/unity/detectivesherlock/Library/Bee/Android/Prj/IL2CPP/Gradle/unityLibrary/build/intermediates/cxx/RelWithDebInfo/3xhv1l60/obj/arm64-v8a/libswappywrapper.so f2881fef4e61f6f9 +4 1765 1720728522820826245 GameActivity/CMakeFiles/game.dir/UGADebug.cpp.o 32582ac159b35ebb 2145 3394 1720728524404307830 /Users/finnmahrenholtz/GAMIS project/unity/detectivesherlock/Library/Bee/Android/Prj/IL2CPP/Gradle/unityLibrary/build/intermediates/cxx/RelWithDebInfo/3xhv1l60/obj/arm64-v8a/libgame.so 307dd48a49efc920 +4 761 1721324910255510617 FramePacing/CMakeFiles/swappywrapper.dir/UnitySwappyWrapper.cpp.o ae2c75a5f1c88f37 +762 1188 1721324910675479504 /Users/finnmahrenholtz/GAMIS project/unity/detectivesherlock/Library/Bee/Android/Prj/IL2CPP/Gradle/unityLibrary/build/intermediates/cxx/RelWithDebInfo/3xhv1l60/obj/arm64-v8a/libswappywrapper.so f2881fef4e61f6f9 +2 2171 1721324911691082139 GameActivity/CMakeFiles/game.dir/UGAInputKeyEvent.cpp.o 49df3135580a3832 +1 2218 1721324911736661451 GameActivity/CMakeFiles/game.dir/UGAEntry.cpp.o e6638f52cf600621 +2 2300 1721324911818537304 GameActivity/CMakeFiles/game.dir/UGAInputMotionEvent.cpp.o 3ae49d88c3747767 +3 2473 1721324911987534926 GameActivity/CMakeFiles/game.dir/UGASoftKeyboard.cpp.o 46c0d3b0583b806a +1 2737 1721324912258609743 GameActivity/CMakeFiles/game.dir/UGADebug.cpp.o 32582ac159b35ebb +1 2992 1721324912510072104 GameActivity/CMakeFiles/game.dir/UGAInput.cpp.o 5459bdc93dc866e3 +0 3106 1721324912628351352 GameActivity/CMakeFiles/game.dir/UGAApplication.cpp.o 68b2ffadce04f301 +3106 3265 1721324912744232138 /Users/finnmahrenholtz/GAMIS project/unity/detectivesherlock/Library/Bee/Android/Prj/IL2CPP/Gradle/unityLibrary/build/intermediates/cxx/RelWithDebInfo/3xhv1l60/obj/arm64-v8a/libgame.so 307dd48a49efc920 diff --git a/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/FramePacing/CMakeFiles/swappywrapper.dir/UnitySwappyWrapper.cpp.o b/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/FramePacing/CMakeFiles/swappywrapper.dir/UnitySwappyWrapper.cpp.o index 34b91040990575d1c46bee75a43851dd68739752..9eced61fd1da8c8da461151bbab31d153b562bdd 100644 Binary files a/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/FramePacing/CMakeFiles/swappywrapper.dir/UnitySwappyWrapper.cpp.o and b/detectivesherlock/.utmp/RelWithDebInfo/3xhv1l60/arm64-v8a/FramePacing/CMakeFiles/swappywrapper.dir/UnitySwappyWrapper.cpp.o differ diff --git a/detectivesherlock/Assets/.DS_Store b/detectivesherlock/Assets/.DS_Store index 8dc8bb239d5afa33cc110aa033adb76f9335e30d..ac4f5436eab43529fb8a0e31ab44a7ede3924af6 100644 Binary files a/detectivesherlock/Assets/.DS_Store and b/detectivesherlock/Assets/.DS_Store differ diff --git a/detectivesherlock/Assets/Background/LibraryBack/Group 44.png b/detectivesherlock/Assets/Background/LibraryBack/Group 44.png new file mode 100644 index 0000000000000000000000000000000000000000..7a9f09b6bd5b62990495ef0d28293e2f2bc32cde Binary files /dev/null and b/detectivesherlock/Assets/Background/LibraryBack/Group 44.png differ diff --git a/detectivesherlock/Assets/Background/LibraryBack/image 1.png.meta b/detectivesherlock/Assets/Background/LibraryBack/Group 44.png.meta similarity index 82% rename from detectivesherlock/Assets/Background/LibraryBack/image 1.png.meta rename to detectivesherlock/Assets/Background/LibraryBack/Group 44.png.meta index 6dde32e44e4b0bad6f088528d4dbbde82e5b1e14..bc45bd1c55b025b56460e1c771a0778926a8c4ea 100644 --- a/detectivesherlock/Assets/Background/LibraryBack/image 1.png.meta +++ b/detectivesherlock/Assets/Background/LibraryBack/Group 44.png.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: c5976d97845be45939400cabdd715e4a +guid: 76eef8860acbe41bb987c47821f2f60c TextureImporter: internalIDToNameTable: - first: - 213: 657193517335828509 - second: image 1_0 + 213: -7275747150402431968 + second: Group 44_0 externalObjects: {} serializedVersion: 13 mipmaps: @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,30 +109,17 @@ TextureImporter: ignorePlatformSupport: 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 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: - serializedVersion: 2 - name: image 1_0 + name: Group 44_0 rect: serializedVersion: 2 - x: 0 - y: 0 - width: 273 - height: 368 + x: 12 + y: 16 + width: 597 + height: 699 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -140,8 +127,8 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: d18dd75a502de1900800000000000000 - internalID: 657193517335828509 + spriteID: 024d3b8e38a570b90800000000000000 + internalID: -7275747150402431968 vertices: [] indices: edges: [] @@ -149,7 +136,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: @@ -157,7 +144,7 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: - image 1_0: 657193517335828509 + Group 44_0: -7275747150402431968 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/detectivesherlock/Assets/Background/LibraryBack/image 1.png b/detectivesherlock/Assets/Background/LibraryBack/image 1.png deleted file mode 100644 index e2d791000a98447bb96499a5c092dd482f5ed52b..0000000000000000000000000000000000000000 Binary files a/detectivesherlock/Assets/Background/LibraryBack/image 1.png and /dev/null differ diff --git a/detectivesherlock/Assets/Scenes/.DS_Store b/detectivesherlock/Assets/Scenes/.DS_Store index 27dd7ee4ed6b2dbaad3558d7de7245f6717d3af3..08497bfef14288176ef437788b3eeb64031bba03 100644 Binary files a/detectivesherlock/Assets/Scenes/.DS_Store and b/detectivesherlock/Assets/Scenes/.DS_Store differ diff --git a/detectivesherlock/Assets/Scenes/Cafeteria.unity b/detectivesherlock/Assets/Scenes/Cafeteria.unity index aa2ec6ba2343d699ef2047059b5e91f308706ba4..1adde0f1405a226d5b258af2d074b5b6b09eb69f 100644 --- a/detectivesherlock/Assets/Scenes/Cafeteria.unity +++ b/detectivesherlock/Assets/Scenes/Cafeteria.unity @@ -958,6 +958,7 @@ GameObject: - component: {fileID: 537988822} - component: {fileID: 537988821} - component: {fileID: 537988824} + - component: {fileID: 537988825} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1051,6 +1052,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 634501c6d167e4c8abccf01c64731a10, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &537988825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537988820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16173428f7358476fa784f899e396692, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &587362190 GameObject: m_ObjectHideFlags: 0 @@ -1561,6 +1574,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 895201855} m_CullTransparentMesh: 1 +--- !u!1001 &899138537 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1818151615694338663, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_Name + value: Permission Manager + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalPosition.x + value: 275.68005 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalPosition.y + value: 195.26105 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalPosition.z + value: -12.430616 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} --- !u!1 &915406515 GameObject: m_ObjectHideFlags: 0 @@ -3395,6 +3465,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1430890922} m_CullTransparentMesh: 1 +--- !u!1001 &1495664703 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2014144876360557761, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_Name + value: _KathyLib + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalPosition.x + value: 988.9315 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalPosition.y + value: 425.91058 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalPosition.z + value: -3.0607617 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} --- !u!1 &1503169541 GameObject: m_ObjectHideFlags: 0 @@ -4721,6 +4848,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1853377857} m_CullTransparentMesh: 1 +--- !u!1001 &1899933960 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 144953997491908564, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_Name + value: Network Connection Manager + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalPosition.x + value: 1248.0607 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalPosition.y + value: 754.7044 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalPosition.z + value: 11.548503 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} --- !u!1 &1967050042 GameObject: m_ObjectHideFlags: 0 @@ -5389,3 +5573,6 @@ SceneRoots: - {fileID: 409216566} - {fileID: 2051297097} - {fileID: 1265492094} + - {fileID: 1495664703} + - {fileID: 1899933960} + - {fileID: 899138537} diff --git a/detectivesherlock/Assets/Scenes/Class.unity b/detectivesherlock/Assets/Scenes/Class.unity index b2cfd0546f1cc769731a1d2a31d523f4e5d6047f..2a46958ad626eb0b38a4516576e455b503b686dc 100644 --- a/detectivesherlock/Assets/Scenes/Class.unity +++ b/detectivesherlock/Assets/Scenes/Class.unity @@ -5415,7 +5415,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 6.114929, y: -112.31329} + m_AnchoredPosition: {x: 6.11499, y: -112.31323} m_SizeDelta: {x: -944.0516, y: -292.0449} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1116023615 @@ -5767,7 +5767,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2.7393188, y: -13.833008} + m_AnchoredPosition: {x: 2.7392578, y: -13.833008} m_SizeDelta: {x: -1270.0549, y: -489.0054} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1211847787 @@ -5873,7 +5873,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2.7393188, y: -13.833008} + m_AnchoredPosition: {x: 2.7392578, y: -13.833008} m_SizeDelta: {x: -1270.0549, y: -489.0054} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1256876131 @@ -7164,7 +7164,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2.7393188, y: -13.833008} + m_AnchoredPosition: {x: 2.7392578, y: -13.833008} m_SizeDelta: {x: -1270.0549, y: -489.0054} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1454099125 @@ -7899,7 +7899,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2.7393188, y: -13.833008} + m_AnchoredPosition: {x: 2.7392578, y: -13.833008} m_SizeDelta: {x: -1270.0549, y: -489.0054} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1592158723 @@ -7978,6 +7978,7 @@ GameObject: - component: {fileID: 1592463821} - component: {fileID: 1592463820} - component: {fileID: 1592463823} + - component: {fileID: 1592463824} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -8072,6 +8073,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3a8456d12109d41a0bd96455f0143f12, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1592463824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592463819} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16173428f7358476fa784f899e396692, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1609601970 GameObject: m_ObjectHideFlags: 0 @@ -9614,7 +9627,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2.7393188, y: -13.833008} + m_AnchoredPosition: {x: 2.7392578, y: -13.833008} m_SizeDelta: {x: -1270.0549, y: -489.0054} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2047757614 @@ -9865,7 +9878,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 3.6364136, y: -103.796814} + m_AnchoredPosition: {x: 3.6364746, y: -103.796875} m_SizeDelta: {x: -255.1241, y: -257.4385} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2085618349 diff --git a/detectivesherlock/Assets/Scenes/Final.unity b/detectivesherlock/Assets/Scenes/Final.unity index 90cdcf21fab606302c99abf4e4be7b4a1e15ddd9..162973b1bda18f443346f8d18ca3582a1e966de7 100644 --- a/detectivesherlock/Assets/Scenes/Final.unity +++ b/detectivesherlock/Assets/Scenes/Final.unity @@ -1078,6 +1078,120 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 812117632} m_CullTransparentMesh: 1 +--- !u!1001 &890923232 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1818151615694338663, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_Name + value: Permission Manager + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalPosition.x + value: 275.68005 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalPosition.y + value: 195.26105 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalPosition.z + value: -12.430616 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} +--- !u!1001 &899401316 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 144953997491908564, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_Name + value: Network Connection Manager + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalPosition.x + value: 1248.0607 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalPosition.y + value: 754.7044 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalPosition.z + value: 11.548503 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} --- !u!1 &1091931909 GameObject: m_ObjectHideFlags: 0 @@ -1500,9 +1614,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1891936024} m_CullTransparentMesh: 1 +--- !u!1001 &1943667818 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2014144876360557761, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_Name + value: _KathyLib + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalPosition.x + value: 988.9315 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalPosition.y + value: 425.91058 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalPosition.z + value: -3.0607617 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 276811286} - {fileID: 299928563} + - {fileID: 1943667818} + - {fileID: 899401316} + - {fileID: 890923232} diff --git a/detectivesherlock/Assets/Scenes/Garden.unity b/detectivesherlock/Assets/Scenes/Garden.unity index 71c8d84b90be014d383cc5397ab48ad5a252b2bd..38349723de907785c1f86384a58898ead26c8635 100644 --- a/detectivesherlock/Assets/Scenes/Garden.unity +++ b/detectivesherlock/Assets/Scenes/Garden.unity @@ -473,7 +473,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.10588236, g: 0.24705884, b: 0, a: 1} + m_Color: {r: 0.0292809, g: 0.09023054, b: 0.8867924, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2540,6 +2540,63 @@ RectTransform: m_AnchoredPosition: {x: 529.1244, y: -450.99994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &632797275 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2014144876360557761, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_Name + value: _KathyLib + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalPosition.x + value: 988.9315 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalPosition.y + value: 425.91058 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalPosition.z + value: -3.0607617 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} --- !u!1 &635939818 GameObject: m_ObjectHideFlags: 0 @@ -3085,6 +3142,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727976640} m_CullTransparentMesh: 1 +--- !u!1001 &802501687 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1818151615694338663, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_Name + value: Permission Manager + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalPosition.x + value: 275.68005 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalPosition.y + value: 195.26105 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalPosition.z + value: -12.430616 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} --- !u!1 &804793262 GameObject: m_ObjectHideFlags: 0 @@ -3892,6 +4006,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 962581590} m_CullTransparentMesh: 1 +--- !u!1001 &968397747 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 144953997491908564, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_Name + value: Network Connection Manager + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalPosition.x + value: 1248.0607 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalPosition.y + value: 754.7044 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalPosition.z + value: 11.548503 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} --- !u!1 &1027642155 GameObject: m_ObjectHideFlags: 0 @@ -7699,7 +7870,7 @@ MonoBehaviour: trueColor: {r: 0, g: 255, b: 0, a: 1} falseColor: {r: 255, g: 0, b: 0, a: 1} startRecButton: {fileID: 460431111} - stopRecButton: {fileID: 62894466} + stopRecButton: {fileID: 0} requestHypoButton: {fileID: 62894466} modelTypeDropdown: {fileID: 0} segmentatonTypeDropdown: {fileID: 0} @@ -8774,6 +8945,7 @@ GameObject: - component: {fileID: 1942796329} - component: {fileID: 1942796328} - component: {fileID: 1942796331} + - component: {fileID: 1942796332} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -8867,6 +9039,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 86ac9e92f28d643e7a3b3ece246c6062, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1942796332 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942796327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e6510ee5f07474494b40f97f2926fb70, type: 3} + m_Name: + m_EditorClassIdentifier: + setupDelay: 1 + trueColor: {r: 0, g: 255, b: 0, a: 1} + falseColor: {r: 255, g: 0, b: 0, a: 1} + startGesaStreamButton: {fileID: 0} + stopGesaStreamButton: {fileID: 418465449} + jumpGestureRearToggle: {fileID: 0} + jumpGestureFrontToggle: {fileID: 0} + shakeGestureToggle: {fileID: 0} + penRollToggle: {fileID: 0} + penPressureToggle: {fileID: 0} + writeSpeedToggle: {fileID: 0} + surfaceTouchCountToggle: {fileID: 0} + jumpGestureRearImage: {fileID: 0} + jumpGestureFrontImage: {fileID: 0} + shakeGestureImage: {fileID: 0} + jumpGestureRearCountText: {fileID: 0} + jumpGestureFrontCountText: {fileID: 0} + shakeGestureCountText: {fileID: 0} + penRollText: {fileID: 0} + penPressureText: {fileID: 0} + writeSpeedText: {fileID: 0} + surfaceTouchCountText: {fileID: 0} --- !u!1 &2051441919 GameObject: m_ObjectHideFlags: 0 @@ -9230,3 +9436,6 @@ SceneRoots: - {fileID: 1942796330} - {fileID: 726972544} - {fileID: 635939821} + - {fileID: 632797275} + - {fileID: 968397747} + - {fileID: 802501687} diff --git a/detectivesherlock/Assets/Scenes/Library.unity b/detectivesherlock/Assets/Scenes/Library.unity index 12e80c52bc0c0d6886c67d3c00f31fb89feb20a9..89f4b4a5cdb7289c967c6f8f1697c9258132ce04 100644 --- a/detectivesherlock/Assets/Scenes/Library.unity +++ b/detectivesherlock/Assets/Scenes/Library.unity @@ -489,82 +489,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 181057745} m_CullTransparentMesh: 1 ---- !u!1 &235102846 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 235102847} - - component: {fileID: 235102849} - - component: {fileID: 235102848} - m_Layer: 0 - m_Name: Instruction 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &235102847 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 235102846} - 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: 377748942} - m_Father: {fileID: 1632231949} - 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: 137.06406, y: 72.36391} - m_SizeDelta: {x: 1189, y: 1165.7449} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &235102848 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 235102846} - 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: 5776710518294095848, guid: f8c889d6007434869a0e3e8e19669f95, 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!222 &235102849 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 235102846} - m_CullTransparentMesh: 1 --- !u!1 &306059602 GameObject: m_ObjectHideFlags: 0 @@ -776,151 +700,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 373425764} m_CullTransparentMesh: 1 ---- !u!1 &377748941 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 377748942} - - component: {fileID: 377748945} - - component: {fileID: 377748944} - - component: {fileID: 377748943} - m_Layer: 0 - m_Name: Button (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &377748942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 377748941} - 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: 2024123153} - m_Father: {fileID: 235102847} - 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: 452.93582, y: -493.65393} - m_SizeDelta: {x: 219.378, y: 81.956} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &377748943 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 377748941} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 377748944} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 235102846} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 1525371986} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 ---- !u!114 &377748944 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 377748941} - 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: 0} - 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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!222 &377748945 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 377748941} - m_CullTransparentMesh: 1 --- !u!1 &409695984 GameObject: m_ObjectHideFlags: 0 @@ -5136,7 +4915,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1350048986} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 96bc415a4a906409ea4c365faf559476, type: 3} m_Name: @@ -5162,7 +4941,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1350048986} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 39231a29dddd94d83b0ac23692c85c3f, type: 3} m_Name: @@ -5183,7 +4962,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1350048986} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 96bc415a4a906409ea4c365faf559476, type: 3} m_Name: @@ -5764,7 +5543,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1525371987 RectTransform: m_ObjectHideFlags: 0 @@ -6157,7 +5936,6 @@ RectTransform: m_Children: - {fileID: 1266755260} - {fileID: 1225663618} - - {fileID: 235102847} - {fileID: 1525371987} - {fileID: 1548108233} m_Father: {fileID: 1832109282} @@ -6332,7 +6110,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 657193517335828509, guid: c5976d97845be45939400cabdd715e4a, type: 3} + m_Sprite: {fileID: 21300000, guid: 76eef8860acbe41bb987c47821f2f60c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7478,142 +7256,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023028524} m_CullTransparentMesh: 1 ---- !u!1 &2024123152 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2024123153} - - component: {fileID: 2024123155} - - component: {fileID: 2024123154} - m_Layer: 0 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2024123153 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2024123152} - 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: 377748942} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -148, y: -18} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2024123154 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2024123152} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &2024123155 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2024123152} - m_CullTransparentMesh: 1 --- !u!1 &2116189611 GameObject: m_ObjectHideFlags: 0 diff --git a/detectivesherlock/Assets/Scenes/MAIN MENU/MAIN MENU.unity b/detectivesherlock/Assets/Scenes/MAIN MENU/MAIN MENU.unity index 0f94f23e357dfbbc10ff47364debdb83e06962de..85e50acb3cb62bb2517c897038f1fdd6a668c03f 100644 --- a/detectivesherlock/Assets/Scenes/MAIN MENU/MAIN MENU.unity +++ b/detectivesherlock/Assets/Scenes/MAIN MENU/MAIN MENU.unity @@ -155,7 +155,7 @@ RectTransform: 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: 536.409, y: -88.525} + m_AnchoredPosition: {x: 536.41, y: -19.181992} m_SizeDelta: {x: 574.686, y: 138.364} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &15101938 @@ -343,6 +343,7 @@ GameObject: - component: {fileID: 196740129} - component: {fileID: 196740128} - component: {fileID: 196740131} + - component: {fileID: 196740132} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -437,6 +438,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0bb17f652b4b641fdbeae110ebf92eb7, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &196740132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 196740127} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e6510ee5f07474494b40f97f2926fb70, type: 3} + m_Name: + m_EditorClassIdentifier: + setupDelay: 1 + trueColor: {r: 0, g: 255, b: 0, a: 1} + falseColor: {r: 255, g: 0, b: 0, a: 1} + startGesaStreamButton: {fileID: 713820153} + stopGesaStreamButton: {fileID: 0} + jumpGestureRearToggle: {fileID: 0} + jumpGestureFrontToggle: {fileID: 0} + shakeGestureToggle: {fileID: 0} + penRollToggle: {fileID: 0} + penPressureToggle: {fileID: 0} + writeSpeedToggle: {fileID: 0} + surfaceTouchCountToggle: {fileID: 0} + jumpGestureRearImage: {fileID: 0} + jumpGestureFrontImage: {fileID: 0} + shakeGestureImage: {fileID: 0} + jumpGestureRearCountText: {fileID: 0} + jumpGestureFrontCountText: {fileID: 0} + shakeGestureCountText: {fileID: 0} + penRollText: {fileID: 0} + penPressureText: {fileID: 0} + writeSpeedText: {fileID: 0} + surfaceTouchCountText: {fileID: 0} --- !u!1 &247726849 GameObject: m_ObjectHideFlags: 0 @@ -480,6 +515,9 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 464427910} + - {fileID: 1809595953} + - {fileID: 2053318960} + - {fileID: 1828707029} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &272637749 @@ -518,7 +556,7 @@ RectTransform: 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: -1.3807, y: -1.3806} + m_AnchoredPosition: {x: 0.000010967, y: 165.48} m_SizeDelta: {x: 422.3119, y: 507.6837} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &272637751 @@ -1542,7 +1580,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 67, y: 393} + m_AnchoredPosition: {x: 61, y: 251} m_SizeDelta: {x: -544.8947, y: -841.499} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1271896875 @@ -2136,7 +2174,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.03773582, g: 0.034353837, b: 0.034353837, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2165,6 +2203,72 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1538907957} m_CullTransparentMesh: 1 +--- !u!1001 &1809595952 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 247726851} + m_Modifications: + - target: {fileID: 2014144876360557761, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_Name + value: _KathyLib + objectReference: {fileID: 0} + - target: {fileID: 2014144876360557761, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalPosition.x + value: 119.964966 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalPosition.y + value: -294.08185 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalPosition.z + value: 3.4192464 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} +--- !u!4 &1809595953 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + m_PrefabInstance: {fileID: 1809595952} + m_PrefabAsset: {fileID: 0} --- !u!1 &1825014640 GameObject: m_ObjectHideFlags: 0 @@ -2244,6 +2348,130 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1825014640} m_CullTransparentMesh: 1 +--- !u!1001 &1828707028 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 247726851} + m_Modifications: + - target: {fileID: 1818151615694338663, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_Name + value: Permission Manager + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalPosition.x + value: -593.2865 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalPosition.y + value: -524.7314 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalPosition.z + value: -5.9506083 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} +--- !u!4 &1828707029 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1992678156920569408, guid: 3ac3d98cab2b3451e89170d1d834ad86, type: 3} + m_PrefabInstance: {fileID: 1828707028} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2053318959 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 247726851} + m_Modifications: + - target: {fileID: 144953997491908564, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_Name + value: Network Connection Manager + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalPosition.x + value: 379.09412 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalPosition.y + value: 34.711975 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalPosition.z + value: 18.028511 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} +--- !u!4 &2053318960 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1307708913374387498, guid: 20c778a5c351f4f568834e964d1594ec, type: 3} + m_PrefabInstance: {fileID: 2053318959} + m_PrefabAsset: {fileID: 0} --- !u!1 &2055265749 GameObject: m_ObjectHideFlags: 0 diff --git a/detectivesherlock/Assets/Scenes/MAIN MENU/SETTING MENU.unity b/detectivesherlock/Assets/Scenes/MAIN MENU/SETTING MENU.unity index 29f0a8610f3ab06207b9e3cde5b6088b3657e965..91bb810fd33c74ece683af90fa17c8e6abe3e29d 100644 --- a/detectivesherlock/Assets/Scenes/MAIN MENU/SETTING MENU.unity +++ b/detectivesherlock/Assets/Scenes/MAIN MENU/SETTING MENU.unity @@ -669,6 +669,14 @@ PrefabInstance: propertyPath: m_Name value: _KathyLib objectReference: {fileID: 0} + - target: {fileID: 2605318998203152256, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: connectFirstFoundPen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3356475632547914704, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} + propertyPath: startGesaStreamOnConnect + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6820519276854697844, guid: 0ba5038d289d241c8b5e75ed32069618, type: 3} propertyPath: m_LocalScale.x value: 4.2666674 diff --git a/detectivesherlock/Assets/UI Toolkit.meta b/detectivesherlock/Assets/UI Toolkit.meta new file mode 100644 index 0000000000000000000000000000000000000000..d5f90274a6baeb8e5b8a51298cf3e4a67ef9bda2 --- /dev/null +++ b/detectivesherlock/Assets/UI Toolkit.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eab19230d5b4149ab9bcc2f8fa78bfaa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/detectivesherlock/Assets/UI Toolkit/PanelSettings.asset b/detectivesherlock/Assets/UI Toolkit/PanelSettings.asset new file mode 100644 index 0000000000000000000000000000000000000000..b4aa77cf78dc3fa72441d18ca89db811edb3bd65 --- /dev/null +++ b/detectivesherlock/Assets/UI Toolkit/PanelSettings.asset @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 19101, guid: 0000000000000000e000000000000000, type: 0} + m_Name: PanelSettings + m_EditorClassIdentifier: + themeUss: {fileID: -4733365628477956816, guid: f5465dfa1779e4e94958b74cf6e1579d, type: 3} + m_TargetTexture: {fileID: 0} + m_RenderMode: 0 + m_WorldSpaceLayer: 0 + m_ScaleMode: 1 + m_ReferenceSpritePixelsPerUnit: 100 + m_PixelsPerUnit: 100 + m_Scale: 1 + m_ReferenceDpi: 96 + m_FallbackDpi: 96 + m_ReferenceResolution: {x: 1200, y: 800} + m_ScreenMatchMode: 0 + m_Match: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 + m_BindingLogLevel: 0 + m_ClearDepthStencil: 1 + m_ClearColor: 0 + m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0} + m_VertexBudget: 0 + m_DynamicAtlasSettings: + m_MinAtlasSize: 64 + m_MaxAtlasSize: 4096 + m_MaxSubTextureSize: 64 + m_ActiveFilters: 31 + m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} + m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0} + m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0} + textSettings: {fileID: 0} diff --git a/detectivesherlock/Assets/UI Toolkit/PanelSettings.asset.meta b/detectivesherlock/Assets/UI Toolkit/PanelSettings.asset.meta new file mode 100644 index 0000000000000000000000000000000000000000..6ed4378dd78ae35052a10f162a184a036aab15b4 --- /dev/null +++ b/detectivesherlock/Assets/UI Toolkit/PanelSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1d31605e741454365b9bca12d348159c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/detectivesherlock/Assets/UI Toolkit/UnityThemes.meta b/detectivesherlock/Assets/UI Toolkit/UnityThemes.meta new file mode 100644 index 0000000000000000000000000000000000000000..eeb03651201dcc88b70f9706cfa114c34e807775 --- /dev/null +++ b/detectivesherlock/Assets/UI Toolkit/UnityThemes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 817ec7376111c4ee1bcad2ec37fe85fa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/detectivesherlock/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss b/detectivesherlock/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss new file mode 100644 index 0000000000000000000000000000000000000000..1056e07ed4f47c0353c25119d72f3d4e3493d578 --- /dev/null +++ b/detectivesherlock/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss @@ -0,0 +1 @@ +@import url("unity-theme://default"); \ No newline at end of file diff --git a/detectivesherlock/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta b/detectivesherlock/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta new file mode 100644 index 0000000000000000000000000000000000000000..b28aa8eea89c94542a1aaede23fc1215fbb93702 --- /dev/null +++ b/detectivesherlock/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f5465dfa1779e4e94958b74cf6e1579d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12388, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 0