From b079471fb1ca37abc118cacafb201aded8f92665 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Thu, 25 Jul 2024 22:33:46 +0100 Subject: [PATCH] More enemies - Added Polygo(n)lem basic enemy and boss --- .../Materials/HP_Golem.mat | 2 +- .../Materials/PolyartStandard.mat | 4 +- ...emyPrefab_VineGolem_Polygon_Variant.prefab | 246 +++++++++++ ...efab_VineGolem_Polygon_Variant.prefab.meta | 7 + .../BossEnemyPrefab_VineGolem_Variant.prefab | 8 + ...emyPrefab_VineGolem_Polygon_Variant.prefab | 262 ++++++++++++ ...efab_VineGolem_Polygon_Variant.prefab.meta | 7 + .../BasicEnemyPrefab_VineGolem_Variant.prefab | 14 +- Assets/Resources/Rifts/BlueRift.prefab | 6 +- Assets/Resources/Rifts/GreenRift.prefab | 6 +- Assets/Resources/Rifts/PurpleRift.prefab | 6 +- Assets/Resources/Rifts/RedRift.prefab | 6 +- Assets/Resources/Rifts/YellowRift.prefab | 6 +- Assets/Scenes/2-CharacterList.unity | 70 +--- Assets/Scenes/2-CreateCharacter.unity | 395 +++++++++++++++++- Assets/Scripts/Game/GameConstants.cs | 16 +- Assets/Scripts/Networking/NetworkManager.cs | 9 +- Assets/Starfield Skybox/Skybox.mat | 2 +- 18 files changed, 976 insertions(+), 96 deletions(-) create mode 100644 Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Polygon_Variant.prefab create mode 100644 Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Polygon_Variant.prefab.meta create mode 100644 Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Polygon_Variant.prefab create mode 100644 Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Polygon_Variant.prefab.meta diff --git a/Assets/Mini Legion Rock Golem PBR HP Polyart/Materials/HP_Golem.mat b/Assets/Mini Legion Rock Golem PBR HP Polyart/Materials/HP_Golem.mat index aefd46ac..faa4d053 100644 --- a/Assets/Mini Legion Rock Golem PBR HP Polyart/Materials/HP_Golem.mat +++ b/Assets/Mini Legion Rock Golem PBR HP Polyart/Materials/HP_Golem.mat @@ -14,7 +14,7 @@ Material: - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Mini Legion Rock Golem PBR HP Polyart/Materials/PolyartStandard.mat b/Assets/Mini Legion Rock Golem PBR HP Polyart/Materials/PolyartStandard.mat index 3490d28f..561ec6ff 100644 --- a/Assets/Mini Legion Rock Golem PBR HP Polyart/Materials/PolyartStandard.mat +++ b/Assets/Mini Legion Rock Golem PBR HP Polyart/Materials/PolyartStandard.mat @@ -12,7 +12,7 @@ Material: m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} @@ -63,7 +63,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.3 - _GlossyReflections: 1 - _Metallic: 0.3 - _Mode: 0 diff --git a/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Polygon_Variant.prefab b/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Polygon_Variant.prefab new file mode 100644 index 00000000..900ba2f4 --- /dev/null +++ b/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Polygon_Variant.prefab @@ -0,0 +1,246 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1159067516213386458 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 457396336866213361, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: sceneViewId + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: targetTag + value: + objectReference: {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2} + - target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: targetTag.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: targetTag.Array.data[2] + value: + objectReference: {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2} + - target: {fileID: 457396336866213365, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: maxValue + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 457396336866213366, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: maxValue + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 457396336866213367, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: Spirit.BaseValue + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 457396336866213367, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: Agility.BaseValue + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 457396336866213367, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: Strength.BaseValue + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 457396336866213367, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: Vitality.BaseValue + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 457396336866213367, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: Intelligence.BaseValue + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1251925248802329697, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_text + value: Bossy PolyGo(n)lem + objectReference: {fileID: 0} + - target: {fileID: 1251925248802329697, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_fontSize + value: 294.55 + objectReference: {fileID: 0} + - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2278116590711127943, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_Name + value: BossEnemyPrefab_VineGolem_Polygon_Variant + objectReference: {fileID: 0} + - target: {fileID: 5690275390890447421, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_Avatar + value: + objectReference: {fileID: 9000000, guid: 8b2d11d64877f0b4cad5d45ec7d53473, type: 3} + - target: {fileID: 5690275390890447421, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 907fdddd7dfa102408eabb3febdd1234, type: 2} + - target: {fileID: 6283201126310809669, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_Height + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 6283201126310809669, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_Radius + value: 0.9 + objectReference: {fileID: 0} + - target: {fileID: 6283201126310809669, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_Center.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6614235737253219669, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.4 + objectReference: {fileID: 0} + - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: abilityPriorityList.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: abilityPriorityList.Array.data[0].ability + value: + objectReference: {fileID: 11400000, guid: 44d3aad893d771343950a3b3cfde096b, type: 2} + - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: abilityPriorityList.Array.data[1].ability + value: + objectReference: {fileID: 11400000, guid: 44d3aad893d771343950a3b3cfde096b, type: 2} + - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.data[0].conditionType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.data[1].conditionType + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.data[0].conditionType + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d9b43fa944715a7489818765baa8fc11, type: 3} +--- !u!4 &577043796391761053 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1736075556783507527, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + m_PrefabInstance: {fileID: 1159067516213386458} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8799581818400670472 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 577043796391761053} + m_Modifications: + - target: {fileID: 1077356408, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_Name + value: Polyart_Golem + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1077356409, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} diff --git a/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Polygon_Variant.prefab.meta b/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Polygon_Variant.prefab.meta new file mode 100644 index 00000000..bd27c938 --- /dev/null +++ b/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Polygon_Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 571331eb308897645819d0ac2d280aee +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Variant.prefab b/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Variant.prefab index 26f228b2..b824f08d 100644 --- a/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Variant.prefab +++ b/Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Variant.prefab @@ -129,6 +129,14 @@ PrefabInstance: propertyPath: Intelligence.BaseValue value: 3 objectReference: {fileID: 0} + - target: {fileID: 1251925248802329697, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_text + value: Bossy Vine Golem + objectReference: {fileID: 0} + - target: {fileID: 1251925248802329697, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: m_fontSize + value: 300 + objectReference: {fileID: 0} - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: m_RootOrder value: 0 diff --git a/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Polygon_Variant.prefab b/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Polygon_Variant.prefab new file mode 100644 index 00000000..9c5b336e --- /dev/null +++ b/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Polygon_Variant.prefab @@ -0,0 +1,262 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1824014964239969232 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8360648553730510347} + m_Modifications: + - target: {fileID: 1077356408, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_Name + value: Polyart_Golem + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalScale.x + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalScale.y + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalScale.z + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077356410, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1077356409, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: c6cfc32748fb5004aa11a1be074b5c58, type: 3} +--- !u!1001 &9078439433637109387 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 50553228471717030, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_text + value: PolyGo(n)lem + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195968, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_Name + value: BasicEnemyPrefab_VineGolem_Polygon_Variant + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195969, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195969, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195969, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195969, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195969, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195969, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195969, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195969, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195969, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195969, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195969, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1040714684719195971, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: distanceToChangePatrolDestination + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282800, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: Spirit.BaseValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282800, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: Strength.BaseValue + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282800, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: Vitality.BaseValue + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282800, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: Intelligence.BaseValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282801, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: maxValue + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282802, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: maxValue + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: targetTag + value: + objectReference: {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2} + - target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: targetTag.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: targetTag.Array.data[1] + value: + objectReference: {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2} + - target: {fileID: 1708233211970282805, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_StoppingDistance + value: 1.65 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282805, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_ObstacleAvoidanceType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1708233211970282806, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: sceneViewId + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4411435976634846358, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5106598912658884738, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_Height + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 5106598912658884738, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_Radius + value: 0.85 + objectReference: {fileID: 0} + - target: {fileID: 5106598912658884738, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_Center.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5343062316551689618, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 6045638370208658194, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6559508008017082157, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6853293170635492090, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_Avatar + value: + objectReference: {fileID: 9000000, guid: 8b2d11d64877f0b4cad5d45ec7d53473, type: 3} + - target: {fileID: 6853293170635492090, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 907fdddd7dfa102408eabb3febdd1234, type: 2} + - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: abilityPriorityList.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: abilityPriorityList.Array.data[0].ability + value: + objectReference: {fileID: 11400000, guid: 44d3aad893d771343950a3b3cfde096b, type: 2} + - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: abilityPriorityList.Array.data[1].ability + value: + objectReference: {fileID: 11400000, guid: 9b34a79c173c62f4baf36af8c1e1ce41, type: 2} + - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.data[0].conditionType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.data[1].conditionType + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.data[0].conditionType + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e02787002b78154db83a830e460a4a9, type: 3} +--- !u!4 &8360648553730510347 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 719420356144337024, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + m_PrefabInstance: {fileID: 9078439433637109387} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Polygon_Variant.prefab.meta b/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Polygon_Variant.prefab.meta new file mode 100644 index 00000000..e0628805 --- /dev/null +++ b/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Polygon_Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4449a7a312bc04043a1d86bc9df6689f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Variant.prefab b/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Variant.prefab index 62e91a8a..0bc46aa9 100644 --- a/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Variant.prefab +++ b/Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Variant.prefab @@ -7,6 +7,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 50553228471717030, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_text + value: Vine Golem + objectReference: {fileID: 0} - target: {fileID: 1040714684719195968, guid: 5e02787002b78154db83a830e460a4a9, type: 3} propertyPath: m_Name value: BasicEnemyPrefab_VineGolem_Variant @@ -123,6 +127,10 @@ PrefabInstance: propertyPath: m_Center.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 5343062316551689618, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1.5 + objectReference: {fileID: 0} - target: {fileID: 6045638370208658194, guid: 5e02787002b78154db83a830e460a4a9, type: 3} propertyPath: m_IsActive value: 1 @@ -195,15 +203,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4168634819871070, guid: c9bc790a133e19c40b64d6db4cfb7a22, type: 3} propertyPath: m_LocalScale.x - value: 0.4 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 4168634819871070, guid: c9bc790a133e19c40b64d6db4cfb7a22, type: 3} propertyPath: m_LocalScale.y - value: 0.4 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 4168634819871070, guid: c9bc790a133e19c40b64d6db4cfb7a22, type: 3} propertyPath: m_LocalScale.z - value: 0.4 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 4168634819871070, guid: c9bc790a133e19c40b64d6db4cfb7a22, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Resources/Rifts/BlueRift.prefab b/Assets/Resources/Rifts/BlueRift.prefab index a506f437..cdbfca4c 100644 --- a/Assets/Resources/Rifts/BlueRift.prefab +++ b/Assets/Resources/Rifts/BlueRift.prefab @@ -329,13 +329,15 @@ MonoBehaviour: maintain: {fileID: 8063846275999589655} closing: {fileID: 8063846276807231464} enemyPrefabs: - - {fileID: 552434039695226610, guid: fb5a487663bff2847825c24f3d8d1922, type: 3} - {fileID: 4291276754621478353, guid: ee896970b81a31145bf11df223d0884c, type: 3} + - {fileID: 552434039695226610, guid: fb5a487663bff2847825c24f3d8d1922, type: 3} - {fileID: 8326105597207312843, guid: ea00ae0f757f414478600bb529afe75f, type: 3} + - {fileID: 8326105597207312843, guid: 4449a7a312bc04043a1d86bc9df6689f, type: 3} bossPrefabs: - - {fileID: 4960561399765869754, guid: dea9ec2c951615d4497b8c6475a75292, type: 3} - {fileID: 5241804620475976932, guid: bf1e3fcaca0fbe14ab9610edad000d10, type: 3} + - {fileID: 4960561399765869754, guid: dea9ec2c951615d4497b8c6475a75292, type: 3} - {fileID: 1119332781400613725, guid: 46d61d44d12d89348838b0b443c836a0, type: 3} + - {fileID: 1119332781400613725, guid: 571331eb308897645819d0ac2d280aee, type: 3} spawnpoints: - {fileID: 5451875612762668648} - {fileID: 7678544414829387191} diff --git a/Assets/Resources/Rifts/GreenRift.prefab b/Assets/Resources/Rifts/GreenRift.prefab index e80fbb34..7dc71e82 100644 --- a/Assets/Resources/Rifts/GreenRift.prefab +++ b/Assets/Resources/Rifts/GreenRift.prefab @@ -273,13 +273,15 @@ MonoBehaviour: maintain: {fileID: 2128458797638590199} closing: {fileID: 2128458797217557967} enemyPrefabs: - - {fileID: 552434039695226610, guid: fb5a487663bff2847825c24f3d8d1922, type: 3} - {fileID: 4291276754621478353, guid: ee896970b81a31145bf11df223d0884c, type: 3} + - {fileID: 552434039695226610, guid: fb5a487663bff2847825c24f3d8d1922, type: 3} - {fileID: 8326105597207312843, guid: ea00ae0f757f414478600bb529afe75f, type: 3} + - {fileID: 8326105597207312843, guid: 4449a7a312bc04043a1d86bc9df6689f, type: 3} bossPrefabs: - - {fileID: 4960561399765869754, guid: dea9ec2c951615d4497b8c6475a75292, type: 3} - {fileID: 5241804620475976932, guid: bf1e3fcaca0fbe14ab9610edad000d10, type: 3} + - {fileID: 4960561399765869754, guid: dea9ec2c951615d4497b8c6475a75292, type: 3} - {fileID: 1119332781400613725, guid: 46d61d44d12d89348838b0b443c836a0, type: 3} + - {fileID: 1119332781400613725, guid: 571331eb308897645819d0ac2d280aee, type: 3} spawnpoints: - {fileID: 4949157927882937514} - {fileID: 7058831629260188007} diff --git a/Assets/Resources/Rifts/PurpleRift.prefab b/Assets/Resources/Rifts/PurpleRift.prefab index 054ad1a0..55b1a57d 100644 --- a/Assets/Resources/Rifts/PurpleRift.prefab +++ b/Assets/Resources/Rifts/PurpleRift.prefab @@ -329,13 +329,15 @@ MonoBehaviour: maintain: {fileID: 3581964227521330063} closing: {fileID: 3581964228063459394} enemyPrefabs: - - {fileID: 552434039695226610, guid: fb5a487663bff2847825c24f3d8d1922, type: 3} - {fileID: 4291276754621478353, guid: ee896970b81a31145bf11df223d0884c, type: 3} + - {fileID: 552434039695226610, guid: fb5a487663bff2847825c24f3d8d1922, type: 3} - {fileID: 8326105597207312843, guid: ea00ae0f757f414478600bb529afe75f, type: 3} + - {fileID: 8326105597207312843, guid: 4449a7a312bc04043a1d86bc9df6689f, type: 3} bossPrefabs: - - {fileID: 4960561399765869754, guid: dea9ec2c951615d4497b8c6475a75292, type: 3} - {fileID: 5241804620475976932, guid: bf1e3fcaca0fbe14ab9610edad000d10, type: 3} + - {fileID: 4960561399765869754, guid: dea9ec2c951615d4497b8c6475a75292, type: 3} - {fileID: 1119332781400613725, guid: 46d61d44d12d89348838b0b443c836a0, type: 3} + - {fileID: 1119332781400613725, guid: 571331eb308897645819d0ac2d280aee, type: 3} spawnpoints: - {fileID: 2780178934867625489} - {fileID: 5544780457462496371} diff --git a/Assets/Resources/Rifts/RedRift.prefab b/Assets/Resources/Rifts/RedRift.prefab index 78d4fbae..889fd941 100644 --- a/Assets/Resources/Rifts/RedRift.prefab +++ b/Assets/Resources/Rifts/RedRift.prefab @@ -273,13 +273,15 @@ MonoBehaviour: maintain: {fileID: 2063187934433234997} closing: {fileID: 2063187934415583615} enemyPrefabs: - - {fileID: 552434039695226610, guid: fb5a487663bff2847825c24f3d8d1922, type: 3} - {fileID: 4291276754621478353, guid: ee896970b81a31145bf11df223d0884c, type: 3} + - {fileID: 552434039695226610, guid: fb5a487663bff2847825c24f3d8d1922, type: 3} - {fileID: 8326105597207312843, guid: ea00ae0f757f414478600bb529afe75f, type: 3} + - {fileID: 8326105597207312843, guid: 4449a7a312bc04043a1d86bc9df6689f, type: 3} bossPrefabs: - - {fileID: 4960561399765869754, guid: dea9ec2c951615d4497b8c6475a75292, type: 3} - {fileID: 5241804620475976932, guid: bf1e3fcaca0fbe14ab9610edad000d10, type: 3} + - {fileID: 4960561399765869754, guid: dea9ec2c951615d4497b8c6475a75292, type: 3} - {fileID: 1119332781400613725, guid: 46d61d44d12d89348838b0b443c836a0, type: 3} + - {fileID: 1119332781400613725, guid: 571331eb308897645819d0ac2d280aee, type: 3} spawnpoints: - {fileID: 6724545809562415564} - {fileID: 291582153113598064} diff --git a/Assets/Resources/Rifts/YellowRift.prefab b/Assets/Resources/Rifts/YellowRift.prefab index a9b3411c..2ee14c5f 100644 --- a/Assets/Resources/Rifts/YellowRift.prefab +++ b/Assets/Resources/Rifts/YellowRift.prefab @@ -118,13 +118,15 @@ MonoBehaviour: maintain: {fileID: 5841939681755274367} closing: {fileID: 5841939681118875177} enemyPrefabs: - - {fileID: 552434039695226610, guid: fb5a487663bff2847825c24f3d8d1922, type: 3} - {fileID: 4291276754621478353, guid: ee896970b81a31145bf11df223d0884c, type: 3} + - {fileID: 552434039695226610, guid: fb5a487663bff2847825c24f3d8d1922, type: 3} - {fileID: 8326105597207312843, guid: ea00ae0f757f414478600bb529afe75f, type: 3} + - {fileID: 8326105597207312843, guid: 4449a7a312bc04043a1d86bc9df6689f, type: 3} bossPrefabs: - - {fileID: 4960561399765869754, guid: dea9ec2c951615d4497b8c6475a75292, type: 3} - {fileID: 5241804620475976932, guid: bf1e3fcaca0fbe14ab9610edad000d10, type: 3} + - {fileID: 4960561399765869754, guid: dea9ec2c951615d4497b8c6475a75292, type: 3} - {fileID: 1119332781400613725, guid: 46d61d44d12d89348838b0b443c836a0, type: 3} + - {fileID: 1119332781400613725, guid: 571331eb308897645819d0ac2d280aee, type: 3} spawnpoints: - {fileID: 7334180896030974630} - {fileID: 5857959500174199677} diff --git a/Assets/Scenes/2-CharacterList.unity b/Assets/Scenes/2-CharacterList.unity index ead37b40..1ac5b34d 100644 --- a/Assets/Scenes/2-CharacterList.unity +++ b/Assets/Scenes/2-CharacterList.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.057015043, g: 0.11458523, b: 0.11961866, a: 1} + m_IndirectSpecularColor: {r: 0.055156343, g: 0.11138782, b: 0.11632264, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -5648,74 +5648,6 @@ Transform: m_Father: {fileID: 1892752761} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!1 &2075506322 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2075506325} - - component: {fileID: 2075506324} - - component: {fileID: 2075506323} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2075506323 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2075506322} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &2075506324 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2075506322} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &2075506325 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2075506322} - 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: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2113954741 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/2-CreateCharacter.unity b/Assets/Scenes/2-CreateCharacter.unity index d685efe7..50a34510 100644 --- a/Assets/Scenes/2-CreateCharacter.unity +++ b/Assets/Scenes/2-CreateCharacter.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.03488619, g: 0.0729729, b: 0.076595984, a: 1} + m_IndirectSpecularColor: {r: 0.055156343, g: 0.11138782, b: 0.11632264, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -3253,6 +3253,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 807795995} m_CullTransparentMesh: 1 +--- !u!1 &822902670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 822902671} + - component: {fileID: 822902672} + m_Layer: 0 + m_Name: LoadPrevious + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &822902671 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 822902670} + 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: 1377185790} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &822902672 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 822902670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b77bdd6e00341854b9348c5dd9bd3fef, type: 3} + m_Name: + m_EditorClassIdentifier: + nextScene: 2-CharacterList --- !u!1001 &828060875 PrefabInstance: m_ObjectHideFlags: 0 @@ -4672,6 +4717,7 @@ Transform: - {fileID: 1581953137} - {fileID: 1903974504} - {fileID: 637749053} + - {fileID: 822902671} m_Father: {fileID: 0} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5117,6 +5163,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1523448342} m_CullTransparentMesh: 1 +--- !u!1 &1562189030 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1562189031} + - component: {fileID: 1562189033} + - component: {fileID: 1562189032} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1562189031 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1562189030} + 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: 2044282013} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1562189032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1562189030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: 663a79f194b91454aa36d58ffb23feb0, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1562189033 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1562189030} + m_CullTransparentMesh: 1 --- !u!1 &1581953135 GameObject: m_ObjectHideFlags: 0 @@ -6672,6 +6794,141 @@ GameObject: m_CorrespondingSourceObject: {fileID: 104922, guid: 4caaae2897c6836438838e1a44287ce7, type: 3} m_PrefabInstance: {fileID: 543345696} m_PrefabAsset: {fileID: 0} +--- !u!1 &2044282012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2044282013} + - component: {fileID: 2044282016} + - component: {fileID: 2044282015} + - component: {fileID: 2044282014} + m_Layer: 5 + m_Name: Button (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2044282013 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2044282012} + 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: 2115180840} + - {fileID: 1562189031} + m_Father: {fileID: 2113954745} + m_RootOrder: 3 + 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: -110, y: -65} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2044282014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2044282012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2044282015} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 822902672} + m_TargetAssemblyTypeName: LoadNextScene, Assembly-CSharp + m_MethodName: LoadNext + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &2044282015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2044282012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: dd4120968d53c4341ba6879310b178c4, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2044282016 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2044282012} + m_CullTransparentMesh: 1 --- !u!1 &2075108195 GameObject: m_ObjectHideFlags: 0 @@ -6879,6 +7136,7 @@ RectTransform: - {fileID: 1376262978} - {fileID: 81676894} - {fileID: 966793466} + - {fileID: 2044282013} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6887,3 +7145,138 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &2115180839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2115180840} + - component: {fileID: 2115180842} + - component: {fileID: 2115180841} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2115180840 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115180839} + 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: 2044282013} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2115180841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115180839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e53b4ab145ea90a4f893624318d62bf8, type: 2} + m_sharedMaterial: {fileID: -2669144802238463443, guid: e53b4ab145ea90a4f893624318d62bf8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2115180842 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115180839} + m_CullTransparentMesh: 1 diff --git a/Assets/Scripts/Game/GameConstants.cs b/Assets/Scripts/Game/GameConstants.cs index d225ec3b..411b1cf0 100644 --- a/Assets/Scripts/Game/GameConstants.cs +++ b/Assets/Scripts/Game/GameConstants.cs @@ -67,6 +67,9 @@ public static class GameConstants public static int MinimumQuantityVineGolem = 2; public static int MaximumQuantityVineGolem = 5; + public static int MinimumQuantityPolygonGolem = 2; + public static int MaximumQuantityPolygonGolem = 5; + public static float RiftDelayBetweenSpawns = 1f; public static float BossTargetLockInPhaseDuration = 6f; @@ -76,12 +79,15 @@ public static class GameConstants public static float PermaDeathInfoTime = 2f; } - public static class EnemyID + public static class EnemySpawning { - public static int AngrySkelly = 0; - public static int SkellyMage = 1; - public static int VineGolem = 2; - + public enum EnemyID + { + AngrySkelly = 0, + SkellyMage = 1, + VineGolem = 2, + PolygonGolem = 3, + } } diff --git a/Assets/Scripts/Networking/NetworkManager.cs b/Assets/Scripts/Networking/NetworkManager.cs index 5396a25b..ec182c6b 100644 --- a/Assets/Scripts/Networking/NetworkManager.cs +++ b/Assets/Scripts/Networking/NetworkManager.cs @@ -152,11 +152,12 @@ public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback riftIndex = Random.Range(0, 5), enemyIndexes_Quantity = new Dictionary() { - { GameConstants.EnemyID.AngrySkelly, Random.Range(GameConstants.GameBalancing.MinimumQuantityAngrySkelly, GameConstants.GameBalancing.MaximumQuantityAngrySkelly) }, - { GameConstants.EnemyID.SkellyMage, Random.Range(GameConstants.GameBalancing.MinimumQuantitySkellyMage, GameConstants.GameBalancing.MaximumQuantitySkellyMage) }, - { GameConstants.EnemyID.VineGolem, Random.Range(GameConstants.GameBalancing.MinimumQuantityVineGolem, GameConstants.GameBalancing.MaximumQuantityVineGolem) }, + { (int)GameConstants.EnemySpawning.EnemyID.AngrySkelly, Random.Range(GameConstants.GameBalancing.MinimumQuantityAngrySkelly, GameConstants.GameBalancing.MaximumQuantityAngrySkelly) }, + { (int)GameConstants.EnemySpawning.EnemyID.SkellyMage, Random.Range(GameConstants.GameBalancing.MinimumQuantitySkellyMage, GameConstants.GameBalancing.MaximumQuantitySkellyMage) }, + { (int)GameConstants.EnemySpawning.EnemyID.VineGolem, Random.Range(GameConstants.GameBalancing.MinimumQuantityVineGolem, GameConstants.GameBalancing.MaximumQuantityVineGolem) }, + { (int)GameConstants.EnemySpawning.EnemyID.PolygonGolem, Random.Range(GameConstants.GameBalancing.MinimumQuantityPolygonGolem, GameConstants.GameBalancing.MaximumQuantityPolygonGolem) }, }, - bossIndex = Random.Range(0, 3) + bossIndex = Random.Range(0, 4) }); ; } diff --git a/Assets/Starfield Skybox/Skybox.mat b/Assets/Starfield Skybox/Skybox.mat index fba3cf32..065122c3 100644 --- a/Assets/Starfield Skybox/Skybox.mat +++ b/Assets/Starfield Skybox/Skybox.mat @@ -94,7 +94,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 9.476569 + - _Rotation: 13.096323 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1