From 9a2335542decda0e39a648eb3bc2709367f4db6b Mon Sep 17 00:00:00 2001 From: Branden J Brown Date: Sun, 30 Jul 2023 15:12:20 -0500 Subject: [PATCH 1/5] add hero class type --- Assets/Scriptables/HeroClass.asset | 16 ++++++++++++++++ Assets/Scriptables/HeroClass.asset.meta | 8 ++++++++ Assets/Scripts/HeroClassSO.cs | 8 ++++++++ Assets/Scripts/HeroClassSO.cs.meta | 11 +++++++++++ 4 files changed, 43 insertions(+) create mode 100644 Assets/Scriptables/HeroClass.asset create mode 100644 Assets/Scriptables/HeroClass.asset.meta create mode 100644 Assets/Scripts/HeroClassSO.cs create mode 100644 Assets/Scripts/HeroClassSO.cs.meta diff --git a/Assets/Scriptables/HeroClass.asset b/Assets/Scriptables/HeroClass.asset new file mode 100644 index 0000000..a81ae79 --- /dev/null +++ b/Assets/Scriptables/HeroClass.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b153bf1124e797a4ca8a1c4acd0e787d, type: 3} + m_Name: HeroClass + m_EditorClassIdentifier: + Name: + Help: diff --git a/Assets/Scriptables/HeroClass.asset.meta b/Assets/Scriptables/HeroClass.asset.meta new file mode 100644 index 0000000..c10b7b2 --- /dev/null +++ b/Assets/Scriptables/HeroClass.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b690599e540c0c442ad13de1827e7cd6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/HeroClassSO.cs b/Assets/Scripts/HeroClassSO.cs new file mode 100644 index 0000000..81b75b1 --- /dev/null +++ b/Assets/Scripts/HeroClassSO.cs @@ -0,0 +1,8 @@ +using UnityEngine; + +[CreateAssetMenu(fileName = "HeroClass", menuName = "Hero Class")] +public class HeroClassSO : ScriptableObject +{ + [SerializeField] private string Name; + [SerializeField] private string Help; +} diff --git a/Assets/Scripts/HeroClassSO.cs.meta b/Assets/Scripts/HeroClassSO.cs.meta new file mode 100644 index 0000000..b6a9cf9 --- /dev/null +++ b/Assets/Scripts/HeroClassSO.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b153bf1124e797a4ca8a1c4acd0e787d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- 2.40.1 From 5920e63d0cd009b354ef223492e3a554f46c29de Mon Sep 17 00:00:00 2001 From: Branden J Brown Date: Sun, 30 Jul 2023 17:56:11 -0500 Subject: [PATCH 2/5] add hero component --- Assets/Scripts/Heroism.cs | 16 ++++++++++++++++ Assets/Scripts/Heroism.cs.meta | 11 +++++++++++ 2 files changed, 27 insertions(+) create mode 100644 Assets/Scripts/Heroism.cs create mode 100644 Assets/Scripts/Heroism.cs.meta diff --git a/Assets/Scripts/Heroism.cs b/Assets/Scripts/Heroism.cs new file mode 100644 index 0000000..e181286 --- /dev/null +++ b/Assets/Scripts/Heroism.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// Component that makes a duder a duder. +/// Manages class, skills, level, attrs, and AI. +/// +public class Heroism : MonoBehaviour +{ + [SerializeField] private string Name; + [SerializeField] private HeroClassSO Class; + [SerializeField] private long Level; + [SerializeField] private long XP; + [SerializeField] private HeroAttributesSO Attrs; +} diff --git a/Assets/Scripts/Heroism.cs.meta b/Assets/Scripts/Heroism.cs.meta new file mode 100644 index 0000000..105df75 --- /dev/null +++ b/Assets/Scripts/Heroism.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 583304b24f3e6394f9e4d49747e22193 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- 2.40.1 From 3cc3e74f0122b4a49adc0321db454484a71b3c07 Mon Sep 17 00:00:00 2001 From: Branden J Brown Date: Tue, 1 Aug 2023 14:03:52 -0500 Subject: [PATCH 3/5] add hero prefab --- Assets/Prefabs.meta | 8 ++ Assets/Prefabs/Hero.prefab | 157 ++++++++++++++++++++++++++++ Assets/Prefabs/Hero.prefab.meta | 7 ++ Assets/Scriptables/HeroClass.asset | 4 +- Assets/Scriptables/StatEffect.asset | 3 + 5 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 Assets/Prefabs.meta create mode 100644 Assets/Prefabs/Hero.prefab create mode 100644 Assets/Prefabs/Hero.prefab.meta diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 0000000..600cb41 --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a3945a1a19aebe41a5bb5f9188d6fce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Hero.prefab b/Assets/Prefabs/Hero.prefab new file mode 100644 index 0000000..9a662fd --- /dev/null +++ b/Assets/Prefabs/Hero.prefab @@ -0,0 +1,157 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4266554956241441996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8131132593237417405} + - component: {fileID: 7347972816793018538} + m_Layer: 0 + m_Name: Hero + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8131132593237417405 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266554956241441996} + 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: + - {fileID: 4157508313357080045} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7347972816793018538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266554956241441996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 583304b24f3e6394f9e4d49747e22193, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: + Class: {fileID: 0} + Level: 0 + XP: 0 + Attrs: {fileID: 0} +--- !u!1 &4632618406133265053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4157508313357080045} + - component: {fileID: 4035501944472890363} + - component: {fileID: 6674764498643525653} + - component: {fileID: 8501611724909554060} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4157508313357080045 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4632618406133265053} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.5} + m_LocalScale: {x: 0.1, y: 0.1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8131132593237417405} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4035501944472890363 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4632618406133265053} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6674764498643525653 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4632618406133265053} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &8501611724909554060 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4632618406133265053} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Hero.prefab.meta b/Assets/Prefabs/Hero.prefab.meta new file mode 100644 index 0000000..2d7e2fc --- /dev/null +++ b/Assets/Prefabs/Hero.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d11d2f36660d2b2449892cb25c074616 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/HeroClass.asset b/Assets/Scriptables/HeroClass.asset index a81ae79..c8e49f8 100644 --- a/Assets/Scriptables/HeroClass.asset +++ b/Assets/Scriptables/HeroClass.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b153bf1124e797a4ca8a1c4acd0e787d, type: 3} m_Name: HeroClass m_EditorClassIdentifier: - Name: - Help: + Name: Example + Help: This is an example class that a hero could have. diff --git a/Assets/Scriptables/StatEffect.asset b/Assets/Scriptables/StatEffect.asset index 8f4ca8c..08af650 100644 --- a/Assets/Scriptables/StatEffect.asset +++ b/Assets/Scriptables/StatEffect.asset @@ -12,3 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 494a21c06960ec442a7a6806f8aefedb, type: 3} m_Name: StatEffect m_EditorClassIdentifier: + Base: 0 + Permyriad: 0 + Flat: 0 -- 2.40.1 From 830444211f1799affe5ab3a4e59bcd70883470c4 Mon Sep 17 00:00:00 2001 From: Branden J Brown Date: Tue, 1 Aug 2023 14:42:58 -0500 Subject: [PATCH 4/5] rename private serialized fields --- Assets/Scripts/HeroClassSO.cs | 4 ++-- Assets/Scripts/Heroism.cs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/HeroClassSO.cs b/Assets/Scripts/HeroClassSO.cs index 81b75b1..e38e167 100644 --- a/Assets/Scripts/HeroClassSO.cs +++ b/Assets/Scripts/HeroClassSO.cs @@ -3,6 +3,6 @@ using UnityEngine; [CreateAssetMenu(fileName = "HeroClass", menuName = "Hero Class")] public class HeroClassSO : ScriptableObject { - [SerializeField] private string Name; - [SerializeField] private string Help; + [SerializeField] private new string name; + [SerializeField] private string help; } diff --git a/Assets/Scripts/Heroism.cs b/Assets/Scripts/Heroism.cs index e181286..df2d9be 100644 --- a/Assets/Scripts/Heroism.cs +++ b/Assets/Scripts/Heroism.cs @@ -8,9 +8,9 @@ using UnityEngine; /// public class Heroism : MonoBehaviour { - [SerializeField] private string Name; - [SerializeField] private HeroClassSO Class; - [SerializeField] private long Level; - [SerializeField] private long XP; - [SerializeField] private HeroAttributesSO Attrs; + [SerializeField] private new string name; + [SerializeField] private HeroClassSO class_; + [SerializeField] private long level; + [SerializeField] private long xp; + [SerializeField] private HeroAttributesSO attrs; } -- 2.40.1 From fc14ef1780091f5c724943591badbe143923fc6c Mon Sep 17 00:00:00 2001 From: Branden J Brown Date: Wed, 2 Aug 2023 21:31:10 -0500 Subject: [PATCH 5/5] rename Heroism -> HeroUnit --- Assets/Scripts/{Heroism.cs => HeroUnit.cs} | 2 +- Assets/Scripts/{Heroism.cs.meta => HeroUnit.cs.meta} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename Assets/Scripts/{Heroism.cs => HeroUnit.cs} (91%) rename Assets/Scripts/{Heroism.cs.meta => HeroUnit.cs.meta} (100%) diff --git a/Assets/Scripts/Heroism.cs b/Assets/Scripts/HeroUnit.cs similarity index 91% rename from Assets/Scripts/Heroism.cs rename to Assets/Scripts/HeroUnit.cs index df2d9be..293ea78 100644 --- a/Assets/Scripts/Heroism.cs +++ b/Assets/Scripts/HeroUnit.cs @@ -6,7 +6,7 @@ using UnityEngine; /// Component that makes a duder a duder. /// Manages class, skills, level, attrs, and AI. /// -public class Heroism : MonoBehaviour +public class HeroUnit : MonoBehaviour { [SerializeField] private new string name; [SerializeField] private HeroClassSO class_; diff --git a/Assets/Scripts/Heroism.cs.meta b/Assets/Scripts/HeroUnit.cs.meta similarity index 100% rename from Assets/Scripts/Heroism.cs.meta rename to Assets/Scripts/HeroUnit.cs.meta -- 2.40.1