diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index e7604a7..94ce1de 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -304,6 +304,7 @@ GameObject: - 33: {fileID: 736567787} - 23: {fileID: 736567785} - 114: {fileID: 736567789} + - 54: {fileID: 736567786} m_Layer: 0 m_Name: Center m_TagString: Untagged @@ -335,6 +336,21 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 +--- !u!54 &736567786 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 736567784} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: .800000012 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!33 &736567787 MeshFilter: m_ObjectHideFlags: 0 @@ -370,6 +386,7 @@ MonoBehaviour: PointsAmount: 400 SphereRadius: 7 rotationSpeed: .699999988 + torqueForce: 50 --- !u!1 &1057734534 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/sphereMove.unity b/Assets/Scenes/sphereMove.unity index 4aad0d3..991b2e0 100644 --- a/Assets/Scenes/sphereMove.unity +++ b/Assets/Scenes/sphereMove.unity @@ -159,7 +159,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: .0219999999 - m_StereoMirrorMode: 0 --- !u!4 &61719365 Transform: m_ObjectHideFlags: 0 @@ -259,7 +258,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Link: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2} - SpherePrototype: {fileID: 140654, guid: 646dd6566f9e1374caa3af8ad37c43d3, type: 2} + Person: {fileID: 11406500, guid: 646dd6566f9e1374caa3af8ad37c43d3, type: 2} PointsAmount: 200 SphereRadius: 7 rotationSpeed: .699999988 diff --git a/Assets/Tests/PersonTest.cs b/Assets/Tests/PersonTest.cs index 9e5d4a9..72cfb01 100644 --- a/Assets/Tests/PersonTest.cs +++ b/Assets/Tests/PersonTest.cs @@ -21,6 +21,7 @@ public class PersonTest : MonoBehaviour void OnMouseOver() { + Debug.Log("abc"); if (!_highlighted) { _highlighted = true; diff --git a/Assets/Tests/PersonTest.prefab b/Assets/Tests/PersonTest.prefab index 4aadda6..ce9c0d8 100644 --- a/Assets/Tests/PersonTest.prefab +++ b/Assets/Tests/PersonTest.prefab @@ -12,6 +12,7 @@ GameObject: - 135: {fileID: 13525706} - 23: {fileID: 2372112} - 114: {fileID: 11406500} + - 54: {fileID: 5488610} m_Layer: 0 m_Name: PersonTest m_TagString: Untagged @@ -62,6 +63,21 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 140654} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!54 &5488610 +Rigidbody: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 140654} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: .0500000007 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!114 &11406500 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 84deb8f..dd32a95 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,14 +3,17 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 6 AndroidProfiler: 0 defaultScreenOrientation: 4 targetDevice: 2 + targetGlesGraphics: -1 + targetIOSGraphics: -1 targetResolution: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: DeathBook + cloudProjectId: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_ShowUnitySplashScreen: 1 @@ -23,6 +26,7 @@ PlayerSettings: m_ActiveColorSpace: 0 m_MTRendering: 1 m_MobileMTRendering: 0 + m_UseDX11: 1 m_Stereoscopic3D: 0 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -77,7 +81,6 @@ PlayerSettings: metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 xboxOneDisableKinectGpuReservation: 0 - virtualRealitySupported: 0 productGUID: 402278fad2098ce4eab29439139ae9ad AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 @@ -120,7 +123,6 @@ PlayerSettings: iOSLaunchScreenCustomXibPath: AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 - androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: AndroidTVCompatibility: 1 @@ -134,7 +136,6 @@ PlayerSettings: resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetBatching: [] - m_BuildTargetGraphicsAPIs: [] webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} actionOnDotNetUnhandledException: 1 @@ -196,7 +197,6 @@ PlayerSettings: ps4ApplicationParam2: 0 ps4ApplicationParam3: 0 ps4ApplicationParam4: 0 - ps4GarlicHeapSize: 2048 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 @@ -339,7 +339,8 @@ PlayerSettings: blackberrySquareSplashScreen: {fileID: 0} tizenProductDescription: tizenProductURL: - tizenSigningProfileName: + tizenCertificatePath: + tizenCertificatePassword: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 stvDeviceAddress: @@ -397,9 +398,4 @@ PlayerSettings: - WebGL::template WebGL::emscriptenArgs: WebGL::template: APPLICATION:Default - firstStreamedSceneWithResources: 0 - cloudProjectId: - projectId: - projectName: - organizationId: - cloudEnabled: 0 + firstStreamedLevelWithResources: 0