Merge pull request #22 from GinoxXP/dev

Demo
GinoxXP · Mar 22, 2023 · 4ecd259 · 4ecd259
2 parents 9ba9a37 + 3933d2d
commit 4ecd259
Show file tree

Hide file tree

Showing 377 changed files with 127,327 additions and 855 deletions.
diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,5 @@ sysinfo.txt
 # Crashlytics generated file
 crashlytics-build.properties
 
+# User Settings
+UserSettings/
diff --git a/Assets/Camera.meta b/Assets/Camera.meta
diff --git a/Assets/Camera/Prefabs.meta b/Assets/Camera/Prefabs.meta
diff --git a/Assets/Camera/Prefabs/Main Camera.prefab b/Assets/Camera/Prefabs/Main Camera.prefab
@@ -0,0 +1,100 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1065788481853754608
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1065788481853754613}
+  - component: {fileID: 1065788481853754610}
+  - component: {fileID: 1065788481853754611}
+  - component: {fileID: 1065788481853754612}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1065788481853754613
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1065788481853754608}
+  m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956}
+  m_LocalPosition: {x: 0, y: 30, z: -25}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
+--- !u!20 &1065788481853754610
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1065788481853754608}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!81 &1065788481853754611
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1065788481853754608}
+  m_Enabled: 1
+--- !u!114 &1065788481853754612
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1065788481853754608}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 34660a68fa3bc99458f5be796cca3929, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  followingObject: {fileID: 0}
diff --git a/Assets/Camera/Prefabs/Main Camera.prefab.meta b/Assets/Camera/Prefabs/Main Camera.prefab.meta
diff --git a/Assets/Camera/Scripts.meta b/Assets/Camera/Scripts.meta
diff --git a/Assets/Camera/Scripts/FollowingCamera.cs b/Assets/Camera/Scripts/FollowingCamera.cs
@@ -0,0 +1,24 @@
+using UnityEngine;
+using Zenject;
+
+public class FollowingCamera : MonoBehaviour
+{
+    private Transform followingObject;
+    private Vector3 deltaPosition;
+
+    private void Start()
+    {
+        deltaPosition = transform.position - followingObject.position;
+    }
+
+    private void Update()
+    {
+        transform.position = followingObject.position + deltaPosition;
+    }
+
+    [Inject]
+    private void Init(Car car)
+    {
+        followingObject = car.transform;
+    }
+}
diff --git a/Assets/Camera/Scripts/FollowingCamera.cs.meta b/Assets/Camera/Scripts/FollowingCamera.cs.meta
diff --git a/Assets/Car.meta b/Assets/Car.meta
diff --git a/Assets/Car/Car Controls.inputactions b/Assets/Car/Car Controls.inputactions
@@ -0,0 +1,140 @@
+{
+    "name": "Car Controls",
+    "maps": [
+        {
+            "name": "Car",
+            "id": "76805dab-b7d0-4052-80be-c1207a42147c",
+            "actions": [
+                {
+                    "name": "Pointer",
+                    "type": "PassThrough",
+                    "id": "88ede8b5-c008-4ad7-b798-2cf502aec2d0",
+                    "expectedControlType": "Vector2",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": true
+                },
+                {
+                    "name": "Move",
+                    "type": "Button",
+                    "id": "596ee732-3b08-49dc-94aa-dfc91e9a21fc",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
+                },
+                {
+                    "name": "Click",
+                    "type": "Value",
+                    "id": "92eab666-7099-4854-bd83-50241149838d",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": true
+                }
+            ],
+            "bindings": [
+                {
+                    "name": "",
+                    "id": "38b4dfd9-fe99-4944-a75d-80709dcd5236",
+                    "path": "<Touchscreen>/touch0/position",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Pointer",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "c7ddf960-62b8-4273-8aa7-99e5be073ee7",
+                    "path": "<Touchscreen>/touch1/position",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Pointer",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "e8c38327-b400-435e-a859-6fe306da377e",
+                    "path": "<Pointer>/position",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Pointer",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "1D Axis",
+                    "id": "02bedb3c-d6e8-499a-b17c-b0526e089689",
+                    "path": "1DAxis",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Move",
+                    "isComposite": true,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "negative",
+                    "id": "7ef94ed2-a141-43c2-b2f9-14e57821d2d2",
+                    "path": "<Keyboard>/a",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Move",
+                    "isComposite": false,
+                    "isPartOfComposite": true
+                },
+                {
+                    "name": "positive",
+                    "id": "1f24f970-542d-4604-af2b-03a8d54e200a",
+                    "path": "<Keyboard>/d",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Move",
+                    "isComposite": false,
+                    "isPartOfComposite": true
+                },
+                {
+                    "name": "",
+                    "id": "a2bd7ca6-571f-4717-94f0-716f566dfd54",
+                    "path": "<Touchscreen>/touch0/press",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Click",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "7cb71352-b3a9-4691-8c38-a1bdff0c2b92",
+                    "path": "<Touchscreen>/touch1/press",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Click",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "d6d6f2ad-6130-48d9-83c0-724503544fa4",
+                    "path": "<Pointer>/press",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Click",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                }
+            ]
+        }
+    ],
+    "controlSchemes": []
+}
diff --git a/Assets/Car/Car Controls.inputactions.meta b/Assets/Car/Car Controls.inputactions.meta
diff --git a/Assets/Car/Materials.meta b/Assets/Car/Materials.meta
diff --git a/Assets/Car/Materials/Gazel.meta b/Assets/Car/Materials/Gazel.meta