diff --git a/Assets/Materials/DarkGreenMat.mat b/Assets/Materials/DarkGreenMat.mat index 7cc2131..70bc249 100644 --- a/Assets/Materials/DarkGreenMat.mat +++ b/Assets/Materials/DarkGreenMat.mat @@ -84,7 +84,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0.5019608, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Materials/GreenMat.mat b/Assets/Materials/GreenMat.mat index 05935cc..f692026 100644 --- a/Assets/Materials/GreenMat.mat +++ b/Assets/Materials/GreenMat.mat @@ -91,7 +91,7 @@ Material: - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 1, b: 0, a: 1} + - _Color: {r: 1, g: 0.63082826, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index d271eaa..5c67709 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -231,6 +231,108 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 104400496} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &233643650 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 233643654} + - component: {fileID: 233643653} + - component: {fileID: 233643652} + - component: {fileID: 233643651} + m_Layer: 5 + m_Name: INGUI-World + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &233643651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 233643650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &233643652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 233643650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &233643653 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 233643650} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 519420031} + m_PlaneDistance: 5 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &233643654 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 233643650} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1227804578} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -415,7 +517,7 @@ GameObject: - component: {fileID: 1158970871} - component: {fileID: 1158970870} m_Layer: 5 - m_Name: IGUI + m_Name: IGUI-Overlay m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -470,7 +572,7 @@ Canvas: m_GameObject: {fileID: 1158970869} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 0 m_Camera: {fileID: 519420031} m_PlaneDistance: 5 m_PixelPerfect: 0 @@ -497,7 +599,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1501855167} - - {fileID: 1227804578} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -516,6 +617,7 @@ GameObject: - component: {fileID: 1227804578} - component: {fileID: 1227804580} - component: {fileID: 1227804579} + - component: {fileID: 1227804581} m_Layer: 5 m_Name: ModifierText m_TagString: Untagged @@ -530,17 +632,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1227804577} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1158970873} + m_Father: {fileID: 233643654} 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: 160, y: 30} + m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1227804579 MonoBehaviour: @@ -555,7 +657,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 1, a: 1} + 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 @@ -564,11 +666,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 50 + m_FontSize: 65 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 50 + m_MaxSize: 65 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -584,6 +686,21 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1227804577} m_CullTransparentMesh: 1 +--- !u!114 &1227804581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1227804577} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 1, g: 1, b: 1, a: 1} + m_EffectDistance: {x: 2, y: 2} + m_UseGraphicAlpha: 1 --- !u!1 &1501855166 GameObject: m_ObjectHideFlags: 0 @@ -790,3 +907,4 @@ SceneRoots: - {fileID: 519420032} - {fileID: 1158970873} - {fileID: 1692737944} + - {fileID: 233643654} diff --git a/Assets/Scripts/GlobalOrbitalManager.cs b/Assets/Scripts/GlobalOrbitalManager.cs index c52520a..d6cd13c 100644 --- a/Assets/Scripts/GlobalOrbitalManager.cs +++ b/Assets/Scripts/GlobalOrbitalManager.cs @@ -128,7 +128,7 @@ public partial class OrbitalBehaviour m_LastGeneratedRing = ring.m_ID; m_TimeOfLastRingSpawn = Time.time; - m_CurrentRingAllowsSpawning = Random.Range(0, 5) != 0; + m_CurrentRingAllowsSpawning = Random.Range(0, 25) != 0; if (!m_CurrentRingAllowsSpawning && m_AllowPlayerInput) { Instantiate(Settings.Instance.ModifierPrefab, m_ModiferParent.transform); @@ -225,7 +225,7 @@ public partial class OrbitalBehaviour orbital.OnOrbitalCollision(m_PlayerInstance); } - if (Random.Range(0, 20) == 0 && m_AllowPlayerInput && m_CurrentRingAllowsSpawning) + if (Random.Range(0, 15) == 0 && m_AllowPlayerInput && m_CurrentRingAllowsSpawning) { Instantiate(Settings.Instance.EnemyPrefab, m_EnemyParent.transform); } diff --git a/WebGL-Build.zip b/WebGL-Build.zip new file mode 100644 index 0000000..da4ea24 Binary files /dev/null and b/WebGL-Build.zip differ