diff --git a/.vs/az_tank_remake/v16/.suo b/.vs/az_tank_remake/v16/.suo new file mode 100644 index 0000000..3c4b2ad Binary files /dev/null and b/.vs/az_tank_remake/v16/.suo differ diff --git a/3D/Assets/Scenes/Main.unity b/3D/Assets/Scenes/Main.unity index 728871b..c1d0552 100644 --- a/3D/Assets/Scenes/Main.unity +++ b/3D/Assets/Scenes/Main.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} + m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.5748171, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -174,7 +174,7 @@ Camera: height: 1 near clip plane: 9 far clip plane: 1000 - field of view: 26.991467 + field of view: 26 orthographic: 0 orthographic size: 5 m_Depth: -1 @@ -331,11 +331,11 @@ Rigidbody: m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 1 + m_UseGravity: 1 + m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 0 - m_CollisionDetection: 3 + m_CollisionDetection: 1 --- !u!114 &915004375 MonoBehaviour: m_ObjectHideFlags: 0 @@ -361,8 +361,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 3.6350038} - m_Center: {x: 0, y: 0, z: 1.3175014} + m_Size: {x: 1, y: 1, z: 0.98748153} + m_Center: {x: 0, y: 0, z: -0.0062598228} --- !u!23 &915004377 MeshRenderer: m_ObjectHideFlags: 0 @@ -503,11 +503,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4940855633812516416, guid: 97fd77a6e795be94a94adfb881cd3bf3, type: 3} propertyPath: m_IsTrigger - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5339856179306045231, guid: 97fd77a6e795be94a94adfb881cd3bf3, type: 3} propertyPath: m_IsTrigger - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5348579737150834501, guid: 97fd77a6e795be94a94adfb881cd3bf3, type: 3} propertyPath: m_StaticEditorFlags @@ -515,7 +515,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5547302978571420027, guid: 97fd77a6e795be94a94adfb881cd3bf3, type: 3} propertyPath: m_IsTrigger - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6593650467854633358, guid: 97fd77a6e795be94a94adfb881cd3bf3, type: 3} propertyPath: m_StaticEditorFlags @@ -523,7 +523,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8082902870318540310, guid: 97fd77a6e795be94a94adfb881cd3bf3, type: 3} propertyPath: m_IsTrigger - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8150313429149362787, guid: 97fd77a6e795be94a94adfb881cd3bf3, type: 3} propertyPath: m_Name diff --git a/3D/Assets/Scripts/PlayerMovement3d.cs b/3D/Assets/Scripts/PlayerMovement3d.cs index 98a6f74..efc10b1 100644 --- a/3D/Assets/Scripts/PlayerMovement3d.cs +++ b/3D/Assets/Scripts/PlayerMovement3d.cs @@ -9,7 +9,7 @@ public class PlayerMovement3d : MonoBehaviour public Rigidbody rb; Vector3 movement; Vector3 rotation; - float x, y; + private float x, y; void Update() { //Input diff --git a/3D/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/3D/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 987158d..af96b10 100644 --- a/3D/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/3D/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -32,6 +32,36 @@ "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "lightmapping.autoUnwrapLightmapUV", "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.backFaceSelectEnabled", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.toolbarIconGUI", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.showSceneInfo", + "value": "{\"m_Value\":false}" + }, + { + "type": "UnityEngine.ProBuilder.SelectionModifierBehavior, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "editor.rectSelectModifier", + "value": "{\"m_Value\":2}" + }, + { + "type": "UnityEngine.ProBuilder.RectSelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "editor.dragSelectRectMode", + "value": "{\"m_Value\":0}" + }, + { + "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "editor.selectMode", + "value": "{\"m_Value\":1}" } ] }