Skip to content

Commit

Permalink
Merge branch 'version_1.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
StanislauNos committed Oct 24, 2019
2 parents a80731f + 7999a5f commit f9bfca9
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Assets/2_NewHelicopter/DustEffects/Dust.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 121626}
m_LocalRotation: {x: 0.70710677, y: -0, z: -0, w: 0.7071068}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: -0.78000003}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
Expand Down Expand Up @@ -865,7 +865,7 @@ ParticleSystem:
rateOverTime:
serializedVersion: 2
minMaxState: 0
scalar: 10
scalar: 30
minScalar: 10
maxCurve:
serializedVersion: 2
Expand Down
12 changes: 8 additions & 4 deletions Assets/2_NewHelicopter/FreeRide.unity
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,14 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 11482524, guid: c58830211c8af3a4eaf180ce9b4b8a21, type: 3}
propertyPath: PlayerCamera
value:
objectReference: {fileID: 1805356199}
- target: {fileID: 11482524, guid: c58830211c8af3a4eaf180ce9b4b8a21, type: 3}
propertyPath: PlayerTarget
value:
objectReference: {fileID: 1072598091}
- target: {fileID: 11482524, guid: c58830211c8af3a4eaf180ce9b4b8a21, type: 3}
propertyPath: PlayerCamera
value:
objectReference: {fileID: 1805356199}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c58830211c8af3a4eaf180ce9b4b8a21, type: 3}
--- !u!1001 &6262868
Expand Down Expand Up @@ -20360,6 +20360,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 19895798, guid: 925a67e4c2809914e9baecbf3e65469c, type: 3}
propertyPath: EmissionModule.rateOverTime.scalar
value: 30
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 925a67e4c2809914e9baecbf3e65469c, type: 3}
--- !u!1001 &7214277571439519321
Expand Down
Binary file modified Assets/2_NewHelicopter/_RadarSystem/RadarSystem.prefab
Binary file not shown.
5 changes: 5 additions & 0 deletions Assets/2_NewHelicopter/_RadarSystem/Scripts/RadarSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ public class RadarSystem : MonoBehaviour

public Transform PlayerTarget;
public Transform PlayerCamera;
[Header("View")]
public CanvasScaler RadarCanvas;
public float ScaleFactor = 3f;

[Header("")]
public float RadarDistance;
Expand All @@ -35,6 +38,8 @@ private void Awake()
runtime = this;
if (!PlayerCamera)
PlayerCamera = Camera.main.transform;

RadarCanvas.scaleFactor = ScaleFactor;
}
private void FixedUpdate()
{
Expand Down
50 changes: 49 additions & 1 deletion Assets/2_NewHelicopter/_UIView/Params_UIController.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ GameObject:
- component: {fileID: 22453142}
- component: {fileID: 22213438}
- component: {fileID: 11438832}
- component: {fileID: 921570324}
m_Layer: 5
m_Name: LeftPart
m_TagString: Untagged
Expand Down Expand Up @@ -406,6 +407,21 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &921570324
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 133724}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 1, b: 0.25517225, a: 0.32156864}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &136654
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -417,6 +433,7 @@ GameObject:
- component: {fileID: 22467304}
- component: {fileID: 22232338}
- component: {fileID: 11436210}
- component: {fileID: 875616877}
m_Layer: 5
m_Name: FrontAngle
m_TagString: Untagged
Expand Down Expand Up @@ -481,6 +498,21 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &875616877
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 136654}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 1, b: 0.25517225, a: 0.32156864}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &144578
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -980,6 +1012,7 @@ GameObject:
- component: {fileID: 22459778}
- component: {fileID: 22281060}
- component: {fileID: 11484300}
- component: {fileID: 175417041}
m_Layer: 5
m_Name: RightPart
m_TagString: Untagged
Expand Down Expand Up @@ -1043,6 +1076,21 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &175417041
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 188568}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 1, b: 0.25517225, a: 0.32156864}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &189378
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -1056,7 +1104,7 @@ GameObject:
- component: {fileID: 11488314}
- component: {fileID: 7214277571532940115}
m_Layer: 5
m_Name: PC_UIController
m_Name: Params_UIController
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,17 @@
[![AssetStore](https://img.shields.io/badge/-AssetStore-lightgrey.svg)](https://assetstore.unity.com/publishers/14506)
![GitHub followers](https://img.shields.io/github/followers/suncube.svg?label=Folow&style=social)

[![Promo](/ReadmeSource/preview1.gif)](https://youtu.be/OLRNz2fY18Q)
### Version 1.6
[![Promo](/ReadmeSource/preview4.gif)](https://youtu.be/rSJo0wo1zOU)

- added universal RadarSystem
- added flight HUD
- added temp DustFX(animated ground dust of working propeller)



### Version 1.5
[![Promo](/ReadmeSource/preview1.gif)](https://youtu.be/OLRNz2fY18Q)

- implement Unity's system inputs
- added mobile joystick
Expand All @@ -28,4 +37,3 @@ External resources links:
[Helicopter models](https://assetstore.unity.com/packages/3d/vehicles/air/low-poly-helicopters-pack-free-121151)

[Virtual Joystick](https://assetstore.unity.com/packages/tools/input-management/simple-input-system-113033)

Binary file added ReadmeSource/preview4.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f9bfca9

Please sign in to comment.