diff --git a/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene1.mat b/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene1.mat index c982326..c91cc87 100644 --- a/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene1.mat +++ b/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene1.mat @@ -119,7 +119,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.048059784, g: 0.091398515, b: 0.22641507, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.04805976, g: 0.091398485, b: 0.22641504, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene2.mat b/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene2.mat index 6f8ca8a..50ebb2c 100644 --- a/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene2.mat +++ b/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene2.mat @@ -132,7 +132,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.08451105, g: 0, b: 0.25471696, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.08451102, g: 0, b: 0.25471693, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene3.mat b/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene3.mat index 8702df8..c4af673 100644 --- a/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene3.mat +++ b/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene3.mat @@ -132,7 +132,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0.33018863, b: 0.073129036, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0.3301886, b: 0.073129006, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene4.mat b/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene4.mat index c8aa937..b9040b5 100644 --- a/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene4.mat +++ b/Assets/Art/Gameplay/Models/Low Poly Soviet Car Pack/Materials/Scene4.mat @@ -119,7 +119,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.07547168, g: 0.07547168, b: 0.07547168, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.07547165, g: 0.07547165, b: 0.07547165, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Data/Settings/Тестовый/Setting.asset b/Assets/Data/Settings/Тестовый/Setting.asset index 3d48b34..0f40f08 100644 --- a/Assets/Data/Settings/Тестовый/Setting.asset +++ b/Assets/Data/Settings/Тестовый/Setting.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} m_Name: Setting m_EditorClassIdentifier: Assembly-CSharp::Setting - Type: 0 + Type: 4 Id: ASD Alias: intovaya Description: "\u0422\u0435\u0441\u0442 \u0438\u043D\u0442" @@ -27,3 +27,4 @@ MonoBehaviour: FloatStep: 0 StringValue: AllowedValues: [] + SignalValue: diff --git a/Assets/Scripts/Settings/Editor/SettingEditor.cs b/Assets/Scripts/Settings/Editor/SettingEditor.cs index d71cf9a..6d8f2ff 100644 --- a/Assets/Scripts/Settings/Editor/SettingEditor.cs +++ b/Assets/Scripts/Settings/Editor/SettingEditor.cs @@ -28,6 +28,10 @@ public class SettingEditor : Editor private SerializedProperty stringValueProperty; private SerializedProperty allowedValuesProperty; + //Signal fields + private SerializedProperty signalProperty; + + private void OnEnable() { // General fields @@ -54,6 +58,9 @@ public class SettingEditor : Editor // String fields stringValueProperty = serializedObject.FindProperty("StringValue"); allowedValuesProperty = serializedObject.FindProperty("AllowedValues"); + + //Signal fields + signalProperty = serializedObject.FindProperty("SignalValue"); } public override void OnInspectorGUI() @@ -100,6 +107,10 @@ public class SettingEditor : Editor EditorGUILayout.PropertyField(stringValueProperty); EditorGUILayout.PropertyField(allowedValuesProperty); break; + case Setting.SettingType.Signal: + EditorGUILayout.LabelField("Signal Settings", EditorStyles.boldLabel); + EditorGUILayout.PropertyField(signalProperty); + break; } serializedObject.ApplyModifiedProperties(); diff --git a/Assets/Scripts/Settings/Setting.cs b/Assets/Scripts/Settings/Setting.cs index dacf278..8fd58dc 100644 --- a/Assets/Scripts/Settings/Setting.cs +++ b/Assets/Scripts/Settings/Setting.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using UnityEngine; -[CreateAssetMenu(fileName = "Setting", menuName = "Settings/Setting")] -[System.Serializable] +[CreateAssetMenu(fileName = "Setting", menuName = "Settings/Setting"), System.Serializable] public class Setting : ScriptableObject { //general @@ -30,13 +29,16 @@ public class Setting : ScriptableObject //type: String public string StringValue; public List AllowedValues; - + + //type: Signal + public string SignalValue; + public enum SettingType { Int, Float, String, - Bool + Bool, + Signal } - } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d9273fd..ab32780 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: SeaBattle. Torpeda + companyName: Robotic Retailers + productName: Sea battle. Torpeda defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}