diff --git a/Assets/Editor/AutomatedBuild.cs b/Assets/Editor/AutomatedBuild.cs index d9f0aa3..0f14ee0 100644 --- a/Assets/Editor/AutomatedBuild.cs +++ b/Assets/Editor/AutomatedBuild.cs @@ -165,6 +165,46 @@ static void GetAllDependenciesForScenes() UnityEngine.Debug.Log("Completed build for - "+OS ); } + + // [MenuItem("Air Control/Build/CreateGitZip")] + // public static void CreateGitZip() + // { + // try + // { + // ProcessStartInfo procStartInfo = new ProcessStartInfo("/usr/bin/git", "archive HEAD -o ${PWD##*/}.zip"); + + // procStartInfo.RedirectStandardError = procStartInfo.RedirectStandardInput = procStartInfo.RedirectStandardOutput = true; + // procStartInfo.UseShellExecute = false; + // procStartInfo.CreateNoWindow = true; + + // procStartInfo.WorkingDirectory = "/home/supatel/Games/New_AirControl_2020/"; + + + // Process proc = new Process(); + // proc.StartInfo = procStartInfo; + // proc.Start(); + + // StringBuilder sb = new StringBuilder(); + // proc.OutputDataReceived += delegate (object sender, DataReceivedEventArgs e) + // { + // sb.AppendLine(e.Data); + // }; + // proc.ErrorDataReceived += delegate (object sender, DataReceivedEventArgs e) + // { + // sb.AppendLine(e.Data); + // }; + + // proc.BeginOutputReadLine(); + // proc.BeginErrorReadLine(); + // proc.WaitForExit(); + // UnityEngine.Debug.Log($"Error in command: {sb.ToString()}"); + // } + // catch (Exception objException) + // { + // UnityEngine.Debug.Log($"Error in command: {objException.Message}"); + // } + // } + /// /// After build switch back to the original edior plat form based on the os /// diff --git a/Assets/Scene/v0.1.5-AirControl.unity b/Assets/Scene/v0.1.5-AirControl.unity index cc21cad..e03993b 100644 --- a/Assets/Scene/v0.1.5-AirControl.unity +++ b/Assets/Scene/v0.1.5-AirControl.unity @@ -602,7 +602,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.05660379, g: 0.0040049846, b: 0.0040049846, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -836,6 +836,7 @@ RectTransform: - {fileID: 266981515} - {fileID: 313520482} - {fileID: 1710438471} + - {fileID: 1370739786} m_Father: {fileID: 1744620695} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1470,7 +1471,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.01886791, g: 0.00080099585, b: 0.00080099585, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2874,6 +2875,86 @@ MonoBehaviour: input: {fileID: 1277489899} idleSource: {fileID: 542205353} fullThrottleSource: {fileID: 804405185} +--- !u!1 &1370739785 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1370739786} + - component: {fileID: 1370739789} + - component: {fileID: 1370739788} + m_Layer: 0 + m_Name: FPS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1370739786 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1370739785} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1759728824} + m_Father: {fileID: 252995766} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -340.6, y: -19.7} + m_SizeDelta: {x: 120, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1370739788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1370739785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: FPS +--- !u!222 &1370739789 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1370739785} + m_CullTransparentMesh: 1 --- !u!1 &1383728948 GameObject: m_ObjectHideFlags: 0 @@ -2973,7 +3054,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1383941249} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.61, z: 0} + m_LocalPosition: {x: 0, y: -8.96, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6182990085044994289} @@ -3897,6 +3978,55 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8b5ea5a49c45eb2668014dacf848cff1, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1759728823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1759728824} + - component: {fileID: 1759728825} + m_Layer: 0 + m_Name: ScriptHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1759728824 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759728823} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1370739786} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1759728825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759728823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e696307178becba3a3636680c9a1b5d, type: 3} + m_Name: + m_EditorClassIdentifier: + fpsText: {fileID: 1370739788} --- !u!1 &1791669347 GameObject: m_ObjectHideFlags: 0 @@ -4005,8 +4135,8 @@ MonoBehaviour: m_EditorClassIdentifier: longitude: -504.55 latitude: -1650.4 - hour: 12 - minutes: 32 + hour: 14 + minutes: 2 timeSpeed: 1 frameSteps: 1 --- !u!1 &1835753706