Skip to content

Commit 49f8f5a

Browse files
KassoutKassout
committed
Merge branch 'v0.1.1'
2 parents e86e916 + 24c7184 commit 49f8f5a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1979
-511
lines changed

‎ReallyTinyStrategies_Script/Assets/Editor.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ReallyTinyStrategies_Script/Assets/Editor/BuildingDataEditor.cs‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
using UnityEditor;
2+
using UnityEngine;
3+
4+
/// <summary>
5+
/// Class <c>BuildingDataEditor</c> is a Unity editor script used to change the <c>BuildingData</c> component inspector display depending on enum values choice.
6+
/// </summary>
7+
[CustomEditor(typeof(BuildingData)), CanEditMultipleObjects]
8+
public class BuildingDataEditor : Editor
9+
{
10+
/// <summary>
11+
/// Serialized properties of <c>BuildingData</c> attributes.
12+
/// </summary>
13+
public SerializedProperty
14+
idProp,
15+
iconProp,
16+
buildingPreviewProp,
17+
priceProp,
18+
maxHealthProp,
19+
buildingTypeProp,
20+
resourcesPerIntervalProp,
21+
intervalProp,
22+
unitPrefabProp,
23+
maxUnitQueueProp,
24+
spawnMoveRangeProp,
25+
unitSpawnDurationProp;
26+
27+
/// <summary>
28+
/// This function is called when the object becomes enabled and active.
29+
/// </summary>
30+
private void OnEnable()
31+
{
32+
idProp = serializedObject.FindProperty("id");
33+
iconProp = serializedObject.FindProperty("icon");
34+
buildingPreviewProp = serializedObject.FindProperty("buildingPreview");
35+
priceProp = serializedObject.FindProperty("price");
36+
maxHealthProp = serializedObject.FindProperty("maxHealth");
37+
buildingTypeProp = serializedObject.FindProperty("buildingType");
38+
resourcesPerIntervalProp = serializedObject.FindProperty("resourcesPerInterval");
39+
intervalProp = serializedObject.FindProperty("interval");
40+
unitPrefabProp = serializedObject.FindProperty("unitPrefab");
41+
maxUnitQueueProp = serializedObject.FindProperty("maxUnitQueue");
42+
spawnMoveRangeProp = serializedObject.FindProperty("spawnMoveRange");
43+
unitSpawnDurationProp = serializedObject.FindProperty("unitSpawnDuration");
44+
}
45+
46+
/// <summary>
47+
/// This function is responsible to make a custom inspector display for the associated type of component.
48+
/// </summary>
49+
public override void OnInspectorGUI()
50+
{
51+
serializedObject.Update();
52+
53+
EditorGUILayout.PropertyField(idProp, new GUIContent("id"));
54+
EditorGUILayout.PropertyField(iconProp, new GUIContent("icon"));
55+
EditorGUILayout.PropertyField(buildingPreviewProp, new GUIContent("buildingPreview"));
56+
EditorGUILayout.PropertyField(priceProp, new GUIContent("price"));
57+
EditorGUILayout.PropertyField(maxHealthProp, new GUIContent("maxHealth"));
58+
59+
EditorGUILayout.PropertyField(buildingTypeProp);
60+
61+
BuildingData.BuildingType bt = (BuildingData.BuildingType)buildingTypeProp.enumValueIndex;
62+
63+
switch (bt)
64+
{
65+
case BuildingData.BuildingType.ResourceGenerator:
66+
EditorGUILayout.PropertyField(resourcesPerIntervalProp, new GUIContent("resourcesPerInterval"));
67+
EditorGUILayout.PropertyField(intervalProp, new GUIContent("interval"));
68+
break;
69+
70+
case BuildingData.BuildingType.UnitSpawner:
71+
EditorGUILayout.PropertyField(unitPrefabProp, new GUIContent("unitPrefab"));
72+
EditorGUILayout.PropertyField(maxUnitQueueProp, new GUIContent("maxUnitQueue"));
73+
EditorGUILayout.PropertyField(spawnMoveRangeProp, new GUIContent("spawnMoveRange"));
74+
EditorGUILayout.PropertyField(unitSpawnDurationProp, new GUIContent("unitSpawnDuration"));
75+
break;
76+
}
77+
78+
serializedObject.ApplyModifiedProperties();
79+
}
80+
}

‎ReallyTinyStrategies_Script/Assets/Editor/BuildingDataEditor.cs.meta‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ReallyTinyStrategies_Script/Assets/Editor/UnitDataEditor.cs‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
using UnityEditor;
2+
using UnityEngine;
3+
4+
/// <summary>
5+
/// Class <c>UnitDataEditor</c> is a Unity editor script used to change the <c>UnitData</c> component inspector display depending on enum values choice.
6+
/// </summary>
7+
[CustomEditor(typeof(UnitData)), CanEditMultipleObjects]
8+
public class UnitDataEditor : Editor
9+
{
10+
/// <summary>
11+
/// Serialized properties of <c>UnitData</c> attributes.
12+
/// </summary>
13+
public SerializedProperty
14+
resourceCostProp,
15+
maxHealthProp,
16+
agentTypeProp,
17+
speedProp,
18+
angularSpeedProp,
19+
accelerationProp,
20+
stoppingDistanceProp,
21+
rotationSpeedProp,
22+
chaseRangeProp,
23+
attackRangeProp,
24+
attackRateProp,
25+
damageToDealProp,
26+
unitTypeProp,
27+
projectilePrefabProp,
28+
destroyAfterSecondsProp,
29+
launchForceProp;
30+
31+
/// <summary>
32+
/// This function is called when the object becomes enabled and active.
33+
/// </summary>
34+
private void OnEnable()
35+
{
36+
resourceCostProp = serializedObject.FindProperty("resourceCost");
37+
maxHealthProp = serializedObject.FindProperty("maxHealth");
38+
agentTypeProp = serializedObject.FindProperty("agentType");
39+
speedProp = serializedObject.FindProperty("speed");
40+
angularSpeedProp = serializedObject.FindProperty("angularSpeed");
41+
accelerationProp = serializedObject.FindProperty("acceleration");
42+
stoppingDistanceProp = serializedObject.FindProperty("stoppingDistance");
43+
rotationSpeedProp = serializedObject.FindProperty("rotationSpeed");
44+
chaseRangeProp = serializedObject.FindProperty("chaseRange");
45+
attackRangeProp = serializedObject.FindProperty("attackRange");
46+
attackRateProp = serializedObject.FindProperty("attackRate");
47+
damageToDealProp = serializedObject.FindProperty("damageToDeal");
48+
unitTypeProp = serializedObject.FindProperty("unitType");
49+
projectilePrefabProp = serializedObject.FindProperty("projectilePrefab");
50+
destroyAfterSecondsProp = serializedObject.FindProperty("destroyAfterSeconds");
51+
launchForceProp = serializedObject.FindProperty("launchForce");
52+
}
53+
54+
/// <summary>
55+
/// This function is responsible to make a custom inspector display for the associated type of component.
56+
/// </summary>
57+
public override void OnInspectorGUI()
58+
{
59+
serializedObject.Update();
60+
61+
EditorGUILayout.PropertyField(resourceCostProp, new GUIContent("resourceCost"));
62+
EditorGUILayout.PropertyField(maxHealthProp, new GUIContent("maxHealth"));
63+
EditorGUILayout.PropertyField(agentTypeProp, new GUIContent("agentType"));
64+
EditorGUILayout.PropertyField(speedProp, new GUIContent("speed"));
65+
EditorGUILayout.PropertyField(angularSpeedProp, new GUIContent("angularSpeed"));
66+
EditorGUILayout.PropertyField(accelerationProp, new GUIContent("acceleration"));
67+
EditorGUILayout.PropertyField(stoppingDistanceProp, new GUIContent("stoppingDistance"));
68+
EditorGUILayout.PropertyField(rotationSpeedProp, new GUIContent("rotationSpeed"));
69+
EditorGUILayout.PropertyField(chaseRangeProp, new GUIContent("chaseRange"));
70+
EditorGUILayout.PropertyField(attackRangeProp, new GUIContent("attackRange"));
71+
EditorGUILayout.PropertyField(attackRateProp, new GUIContent("attackRate"));
72+
EditorGUILayout.PropertyField(damageToDealProp, new GUIContent("damageToDeal"));
73+
74+
EditorGUILayout.PropertyField(unitTypeProp);
75+
76+
UnitData.UnitType ut = (UnitData.UnitType)unitTypeProp.enumValueIndex;
77+
78+
switch (ut)
79+
{
80+
case UnitData.UnitType.Range:
81+
EditorGUILayout.PropertyField(projectilePrefabProp, new GUIContent("projectilePrefab"));
82+
EditorGUILayout.PropertyField(destroyAfterSecondsProp, new GUIContent("destroyAfterSeconds"));
83+
EditorGUILayout.PropertyField(launchForceProp, new GUIContent("launchForce"));
84+
break;
85+
86+
case UnitData.UnitType.Melee:
87+
break;
88+
}
89+
90+
serializedObject.ApplyModifiedProperties();
91+
}
92+
}

‎ReallyTinyStrategies_Script/Assets/Editor/UnitDataEditor.cs.meta‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ReallyTinyStrategies_Script/Assets/Mirror/Examples/AdditiveScenes/Materials/Capsule.mat‎

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,22 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Capsule
11-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
1212
m_ShaderKeywords: _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1
17-
stringTagMap: {}
17+
stringTagMap:
18+
RenderType: Opaque
1819
disabledShaderPasses: []
1920
m_SavedProperties:
2021
serializedVersion: 3
2122
m_TexEnvs:
23+
- _BaseMap:
24+
m_Texture: {fileID: 0}
25+
m_Scale: {x: 1, y: 1}
26+
m_Offset: {x: 0, y: 0}
2227
- _BumpMap:
2328
m_Texture: {fileID: 0}
2429
m_Scale: {x: 1, y: 1}
@@ -55,23 +60,68 @@ Material:
5560
m_Texture: {fileID: 0}
5661
m_Scale: {x: 1, y: 1}
5762
m_Offset: {x: 0, y: 0}
63+
- _SpecGlossMap:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
- unity_Lightmaps:
68+
m_Texture: {fileID: 0}
69+
m_Scale: {x: 1, y: 1}
70+
m_Offset: {x: 0, y: 0}
71+
- unity_LightmapsInd:
72+
m_Texture: {fileID: 0}
73+
m_Scale: {x: 1, y: 1}
74+
m_Offset: {x: 0, y: 0}
75+
- unity_ShadowMasks:
76+
m_Texture: {fileID: 0}
77+
m_Scale: {x: 1, y: 1}
78+
m_Offset: {x: 0, y: 0}
79+
m_Ints: []
5880
m_Floats:
81+
- _AlphaClip: 0
82+
- _Blend: 0
5983
- _BumpScale: 1
84+
- _ClearCoatMask: 0
85+
- _ClearCoatSmoothness: 0
86+
- _Cull: 2
6087
- _Cutoff: 0.5
88+
- _DetailAlbedoMapScale: 1
6189
- _DetailNormalMapScale: 1
6290
- _DstBlend: 0
91+
- _EnvironmentReflections: 0
6392
- _GlossMapScale: 1
6493
- _Glossiness: 1
6594
- _GlossyReflections: 0
6695
- _Metallic: 0.3
6796
- _Mode: 0
6897
- _OcclusionStrength: 1
6998
- _Parallax: 0.02
99+
- _QueueOffset: 0
100+
- _ReceiveShadows: 1
101+
- _Smoothness: 1
70102
- _SmoothnessTextureChannel: 0
71103
- _SpecularHighlights: 0
72104
- _SrcBlend: 1
105+
- _Surface: 0
73106
- _UVSec: 0
107+
- _WorkflowMode: 1
74108
- _ZWrite: 1
75109
m_Colors:
76-
- _Color: {r: 0, g: 0.07727194, b: 1, a: 1}
110+
- _BaseColor: {r: 0, g: 0.077271916, b: 1, a: 1}
111+
- _Color: {r: 1, g: 1, b: 1, a: 1}
77112
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
113+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
114+
m_BuildTextureStacks: []
115+
--- !u!114 &6769944438050270957
116+
MonoBehaviour:
117+
m_ObjectHideFlags: 11
118+
m_CorrespondingSourceObject: {fileID: 0}
119+
m_PrefabInstance: {fileID: 0}
120+
m_PrefabAsset: {fileID: 0}
121+
m_GameObject: {fileID: 0}
122+
m_Enabled: 1
123+
m_EditorHideFlags: 0
124+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
125+
m_Name:
126+
m_EditorClassIdentifier:
127+
version: 5

0 commit comments

Comments
 (0)