diff --git a/3D/Assets/Assets/Models/Tank 1.blend b/3D/Assets/Assets/Models/Tank 1.blend deleted file mode 100644 index 6ada503..0000000 Binary files a/3D/Assets/Assets/Models/Tank 1.blend and /dev/null differ diff --git a/3D/Assets/Assets/Models/Tank.blend b/3D/Assets/Assets/Models/Tank.blend deleted file mode 100644 index 6ada503..0000000 Binary files a/3D/Assets/Assets/Models/Tank.blend and /dev/null differ diff --git a/3D/Assets/Assets/Models/Tank.blend.meta b/3D/Assets/Assets/Models/Tank.blend.meta deleted file mode 100644 index 7e4504c..0000000 --- a/3D/Assets/Assets/Models/Tank.blend.meta +++ /dev/null @@ -1,102 +0,0 @@ -fileFormatVersion: 2 -guid: 0a433609afdd40d4482a85535730e352 -ModelImporter: - serializedVersion: 20200 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 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 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - 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 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/3D/Assets/Assets/Models/map2.blend b/3D/Assets/Assets/Models/map2.blend new file mode 100644 index 0000000..8b0d0b2 Binary files /dev/null and b/3D/Assets/Assets/Models/map2.blend differ diff --git a/3D/Assets/Assets/Models/Tank 1.blend.meta b/3D/Assets/Assets/Models/map2.blend.meta similarity index 98% rename from 3D/Assets/Assets/Models/Tank 1.blend.meta rename to 3D/Assets/Assets/Models/map2.blend.meta index 17f6056..68b938f 100644 --- a/3D/Assets/Assets/Models/Tank 1.blend.meta +++ b/3D/Assets/Assets/Models/map2.blend.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc +guid: d7b28b953e81a814a96e70685be31262 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] diff --git a/3D/Assets/Scenes/Main.unity b/3D/Assets/Scenes/Main.unity index 348ad8e..bd72a8d 100644 --- a/3D/Assets/Scenes/Main.unity +++ b/3D/Assets/Scenes/Main.unity @@ -310,7 +310,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &711422030 GameObject: @@ -2707,7 +2707,7 @@ Transform: - {fileID: 3155070224141227685} - {fileID: 1149994309874116970} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6978687947768988245 MeshFilter: diff --git a/3D/Assets/Scripts/TankMovement.cs b/3D/Assets/Scripts/TankMovement.cs index eb01563..073822e 100644 --- a/3D/Assets/Scripts/TankMovement.cs +++ b/3D/Assets/Scripts/TankMovement.cs @@ -70,7 +70,5 @@ public class TankMovement : MonoBehaviour float turn = m_TurnInputValue * m_TurnSpeed * Time.deltaTime; Quaternion turnRotation = Quaternion.Euler(0f, turn, 0f); m_Rigidbody.MoveRotation(m_Rigidbody.rotation * turnRotation); - //transform.rotation = Quaternion.Euler(0f, turn * m_TurnSpeed, 0f); - //transform.Rotate(0f, turn * m_TurnSpeed, 0f); } } diff --git a/3D/ProjectSettings/InputManager.asset b/3D/ProjectSettings/InputManager.asset index 12c05b4..8ea4b2c 100644 --- a/3D/ProjectSettings/InputManager.asset +++ b/3D/ProjectSettings/InputManager.asset @@ -36,7 +36,7 @@ InputManager: invert: 0 type: 0 axis: 0 - joyNum: 2 + joyNum: 1 - serializedVersion: 3 m_Name: Vertical1 descriptiveName: @@ -68,7 +68,7 @@ InputManager: invert: 0 type: 0 axis: 0 - joyNum: 2 + joyNum: 1 - serializedVersion: 3 m_Name: Fire1 descriptiveName: @@ -85,6 +85,22 @@ InputManager: type: 0 axis: 0 joyNum: 1 + - serializedVersion: 3 + m_Name: Fire2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: z + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 2 - serializedVersion: 3 m_Name: Mouse X descriptiveName: