Property adjustments

Hykudoru · Dec 5, 2020 · 2477d6b · 2477d6b
1 parent 8e59c3b
commit 2477d6b
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 46 deletions.
diff --git a/Drones/Assets/Drones/Demo.meta b/Drones/Assets/Drones/Demo.meta
diff --git a/Drones/Assets/Drones/Demo.cs → Drones/Assets/Drones/Demo/Demo.cs b/Drones/Assets/Drones/Demo.cs → Drones/Assets/Drones/Demo/Demo.cs
diff --git a/Drones/Assets/Drones/Demo.cs.meta → Drones/Assets/Drones/Demo/Demo.cs.meta b/Drones/Assets/Drones/Demo.cs.meta → Drones/Assets/Drones/Demo/Demo.cs.meta
diff --git a/Drones/Assets/Drones/Demo.unity → Drones/Assets/Drones/Demo/Demo.unity b/Drones/Assets/Drones/Demo.unity → Drones/Assets/Drones/Demo/Demo.unity
@@ -413,16 +413,6 @@ PrefabInstance:
       propertyPath: rollPitchSpeed
       value: 28
       objectReference: {fileID: 0}
-    - target: {fileID: 3893937143131440852, guid: 9feb64c7d592fb247ae0139596c5abc1,
-        type: 3}
-      propertyPath: tiltSpeed
-      value: 20
-      objectReference: {fileID: 0}
-    - target: {fileID: 3893937143131440852, guid: 9feb64c7d592fb247ae0139596c5abc1,
-        type: 3}
-      propertyPath: counterGravity
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 3893937143131440853, guid: 9feb64c7d592fb247ae0139596c5abc1,
         type: 3}
       propertyPath: m_UseGravity
@@ -431,7 +421,7 @@ PrefabInstance:
     - target: {fileID: 3893937143131440853, guid: 9feb64c7d592fb247ae0139596c5abc1,
         type: 3}
       propertyPath: m_Drag
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4905939255208150088, guid: 9feb64c7d592fb247ae0139596c5abc1,
         type: 3}
@@ -610,31 +600,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &658021518 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3541209806302926730, guid: 9feb64c7d592fb247ae0139596c5abc1,
-    type: 3}
-  m_PrefabInstance: {fileID: 350319091}
-  m_PrefabAsset: {fileID: 0}
---- !u!95 &658021519
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 658021518}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 12a4648c937e0b044bf3e4de4eaf5cdb, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &679467664
 GameObject:
   m_ObjectHideFlags: 0
@@ -936,7 +901,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: -80, y: -20}
-  m_SizeDelta: {x: 160, y: 40}
+  m_SizeDelta: {x: 160, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1030152421
 MonoBehaviour:
@@ -1384,7 +1349,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 80, y: -20}
-  m_SizeDelta: {x: 160, y: 40}
+  m_SizeDelta: {x: 160, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1530695168
 MonoBehaviour:
@@ -1582,14 +1547,14 @@ MonoBehaviour:
     m_FontStyle: 0
     m_BestFit: 1
     m_MinSize: 10
-    m_MaxSize: 40
+    m_MaxSize: 25
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Reset
+  m_Text: Reset Drone
 --- !u!222 &1643699587
 CanvasRenderer:
   m_ObjectHideFlags: 0

diff --git a/Drones/Assets/Drones/Demo.unity.meta → Drones/Assets/Drones/Demo/Demo.unity.meta b/Drones/Assets/Drones/Demo.unity.meta → Drones/Assets/Drones/Demo/Demo.unity.meta
diff --git a/Drones/Assets/Drones/Drone.cs b/Drones/Assets/Drones/Drone.cs
@@ -8,7 +8,7 @@ public class Drone : MonoBehaviour
     Rigidbody drone;
     DroneInput input;
     Animator animator;
-    [SerializeField] float moveSpeed = 50f;
+    [SerializeField] float moveSpeed = 70f;
     [SerializeField] float throttleSpeed = 50f;
     [SerializeField] float yawSpeed = 360f;
     [SerializeField] float tiltSpeed = 20f;
@@ -82,7 +82,7 @@ private void FixedUpdate()
 
     private void LateUpdate()
     {
-        float currentPropellerSpeed = Mathf.Clamp(thrust.sqrMagnitude, 0f, 10f);
-        animator.SetFloat("Thrust", currentPropellerSpeed);
+        float propellerSpeed = Mathf.Clamp(thrust.sqrMagnitude, 0f, 10f);
+        animator.SetFloat("Thrust", propellerSpeed);
     }
 }
diff --git a/Drones/Assets/Drones/Prefabs/Drone_2_Prototype.prefab b/Drones/Assets/Drones/Prefabs/Drone_2_Prototype.prefab
@@ -189,6 +189,7 @@ GameObject:
   - component: {fileID: 3893937143131440853}
   - component: {fileID: 3893937143131440852}
   - component: {fileID: 8390751280896578834}
+  - component: {fileID: 8879485278695513610}
   m_Layer: 0
   m_Name: Drone_2_Prototype
   m_TagString: Untagged
@@ -239,10 +240,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a28e953817a374a499e09183023a6fa0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  moveSpeed: 50
+  moveSpeed: 70
   throttleSpeed: 50
   yawSpeed: 180
-  tiltSpeed: 25
+  tiltSpeed: 14
   maxRollDeg: 28
   maxPitchDeg: 28
   maxTiltDeg: 28
@@ -278,6 +279,25 @@ MonoBehaviour:
   m_DefaultActionMap: Drone
   m_SplitScreenIndex: -1
   m_Camera: {fileID: 0}
+--- !u!95 &8879485278695513610
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3541209806302926730}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 12a4648c937e0b044bf3e4de4eaf5cdb, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &3541209806589185414
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Drones/ProjectSettings/EditorBuildSettings.asset b/Drones/ProjectSettings/EditorBuildSettings.asset
@@ -6,6 +6,6 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Drones/DroneScene.unity
+    path: Assets/Drones/Demo/Demo.unity
     guid: 4e88f6cfc4dd463428fa880f1cdea980
   m_configObjects: {}
diff --git a/Drones/ProjectSettings/ProjectSettings.asset b/Drones/ProjectSettings/ProjectSettings.asset
@@ -128,6 +128,9 @@ PlayerSettings:
   preloadedAssets:
   - {fileID: 0}
   - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1