Nicola/TalesOfNovariel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed HUD buttons, added eastereggs, fixed object spawn, added coordinates, enabled new tutorial, v1.2.0

Browse Source
This commit is contained in:
Nicola Sovic 2022-04-12 14:18:37 +02:00
parent cb7541ce85
commit 0ce547fb74
10 changed files with 382 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

286
Assets/Scenes/GameScene.unity
View File

@ -1954,7 +1954,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 115448904}
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_Children:
@ -1962,13 +1962,13 @@ RectTransform:
- {fileID: 1360577094}
- {fileID: 918246691}
- {fileID: 773815172}
m_Father: {fileID: 1456932137}
m_Father: {fileID: 1509962783}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.825, y: 0.7}
m_AnchorMin: {x: 0, y: 0.2}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 15}
m_SizeDelta: {x: 0, y: -30}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &115448906
MonoBehaviour:
@ -6248,6 +6248,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 441464071}
m_CullTransparentMesh: 1
--- !u!1 &445308057
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 445308058}
- component: {fileID: 445308060}
- component: {fileID: 445308059}
m_Layer: 5
m_Name: txtCoordinates
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &445308058
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 445308057}
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_Children: []
m_Father: {fileID: 1509962783}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0.2}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &445308059
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 445308057}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'Tile: Spawn (X/Y/Z)'
--- !u!222 &445308060
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 445308057}
m_CullTransparentMesh: 1
--- !u!1 &463007573
GameObject:
m_ObjectHideFlags: 0
@ -8871,6 +8950,85 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &643073979
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 643073980}
- component: {fileID: 643073982}
- component: {fileID: 643073981}
m_Layer: 5
m_Name: txtTutorial
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &643073980
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 643073979}
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_Children: []
m_Father: {fileID: 718596642}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0.1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &643073981
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 643073979}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: (Close this tutorial by clicking anywhere on screen)
--- !u!222 &643073982
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 643073979}
m_CullTransparentMesh: 1
--- !u!1 &643507027
GameObject:
m_ObjectHideFlags: 0
@ -9571,7 +9729,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d858d7fd66f78a44e9e67ec2a2d4f1e1, type: 3}
m_Name:
m_EditorClassIdentifier:
compass: {fileID: 115448904}
compass: {fileID: 1509962780}
information: {fileID: 814591215}
fight: {fileID: 1156143264}
message: {fileID: 1114695176}
@ -10492,6 +10650,7 @@ GameObject:
- component: {fileID: 718596642}
- component: {fileID: 718596644}
- component: {fileID: 718596643}
- component: {fileID: 718596645}
m_Layer: 5
m_Name: pnlTutorial
m_TagString: Untagged
@ -10513,6 +10672,7 @@ RectTransform:
- {fileID: 1695792616}
- {fileID: 2025004928}
- {fileID: 653632098}
- {fileID: 643073980}
m_Father: {fileID: 1456932137}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -10559,6 +10719,35 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 718596641}
m_CullTransparentMesh: 1
--- !u!114 &718596645
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 718596641}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Delegates:
- eventID: 4
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 659994602}
m_TargetAssemblyTypeName: Assets.Scripts.UIHandler, Assembly-CSharp
m_MethodName: closeTutorial
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!1 &720945273
GameObject:
m_ObjectHideFlags: 0
@ -20076,7 +20265,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 115448905}
- {fileID: 1509962783}
- {fileID: 814591216}
- {fileID: 1156143265}
- {fileID: 1114695177}
@ -20904,6 +21093,83 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1502432821}
m_CullTransparentMesh: 1
--- !u!1 &1509962780
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1509962783}
- component: {fileID: 1509962782}
- component: {fileID: 1509962781}
m_Layer: 5
m_Name: pnlNavigation
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1509962781
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1509962780}
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: 0.392}
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: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
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 &1509962782
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1509962780}
m_CullTransparentMesh: 1
--- !u!224 &1509962783
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1509962780}
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_Children:
- {fileID: 115448905}
- {fileID: 445308058}
m_Father: {fileID: 1456932137}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.825, y: 0.7}
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!1 &1510172559
GameObject:
m_ObjectHideFlags: 0
@ -23662,8 +23928,8 @@ RectTransform:
m_Father: {fileID: 718596642}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.67, y: 0.75}
m_AnchorMax: {x: 0.827, y: 1}
m_AnchorMin: {x: 0.67, y: 0.76500005}
m_AnchorMax: {x: 0.825, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -27323,7 +27589,7 @@ RectTransform:
m_Father: {fileID: 718596642}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.17, y: 0.75}
m_AnchorMin: {x: 0.175, y: 0.75}
m_AnchorMax: {x: 0.35, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}

2
Assets/Scripts/ButtonHandler.cs
View File

@ -138,7 +138,5 @@ namespace Assets.Scripts
audioHandler.playButtonClick();
uihandler.switchPauseMenu();
}
}
}

25
Assets/Scripts/EasterEggHandler.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
namespace Assets.Scripts
{
@ -10,7 +11,10 @@ namespace Assets.Scripts
{
public static void applyEasterEgg(Player player)
{
applyNameEasterEgg(player);
if (player.getPlayerName().ToLower().Length > 0)
{
applyNameEasterEgg(player);
}
}
private static void applyNameEasterEgg(Player player)
@ -40,8 +44,27 @@ namespace Assets.Scripts
result[3] = 47;
result[4] = 47;
break;
default:
//health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence, level, experience, maxExperience, points
int[] stats = player.getStats();
result[0] = stats[1];
result[1] = stats[3];
result[2] = stats[4];
result[3] = stats[5];
result[4] = stats[6];
break;
}
player.setStats(result);
}
public static bool isGodMode(Player player)
{
bool result = false;
if (player.getPlayerName().ToLower() == "nicola")
{
result = true;
}
return result;
}
}
}

11
Assets/Scripts/EasterEggHandler.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b2fc753c5a9822f42a6cb9451e7ac30a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

5
Assets/Scripts/NoiseGenerator.cs
View File

@ -118,14 +118,12 @@ public class NoiseGenerator
private float[] calculateSamplesPlane(GameObject tile)
{
float[] samples = calculateBasicSamples(tile);
Debug.Log("Plane");
return samples;
}
private float[] calculateSamplesForest(GameObject tile)
{
float[] samples = calculateBasicSamples(tile);
Debug.Log("Forest");
return samples;
}
@ -149,7 +147,6 @@ public class NoiseGenerator
}
} while (true);
}
Debug.Log("Mountain");
return samples;
}
@ -192,7 +189,6 @@ public class NoiseGenerator
}
}
Debug.Log("River");
return samples;
}
@ -219,7 +215,6 @@ public class NoiseGenerator
}
}
}
Debug.Log("Lake");
return samples;
}

22
Assets/Scripts/Player.cs
View File

@ -67,6 +67,7 @@ namespace Assets.Scripts
this.role.applyBonus(this);
this.difficulty = difficulty;
generateSkills();
EasterEggHandler.applyEasterEgg(this);
}
private void generateSkills()
@ -253,7 +254,9 @@ namespace Assets.Scripts
public void setStats(int[] stats)
{
maxHealth = stats[0];
health = maxHealth;
maxSecondary = stats[1];
secondary = maxSecondary;
strength = stats[2];
dexterity = stats[3];
intelligence = stats[4];
@ -354,16 +357,19 @@ namespace Assets.Scripts
{
if (amount > 0)
{
if (isDodging)
if (!EasterEggHandler.isGodMode(this))
{
isDodging = false;
}
else
{
if (rand.Next(1, 101) > dexterity + (intelligence / 2))
if (isDodging)
{
health = health - amount;
audioHandler.playDamage();
isDodging = false;
}
else
{
if (rand.Next(1, 101) > dexterity + (intelligence / 2))
{
health = health - amount;
audioHandler.playDamage();
}
}
}
}

5
Assets/Scripts/Tile.cs
View File

@ -209,4 +209,9 @@ public class Tile : MonoBehaviour
enemy.GetComponent<Collider>().enabled = false;
aliveEnemies.Remove(enemy);
}
public string getTileType()
{
return tiletype;
}
}

24
Assets/Scripts/UIHandler.cs
View File

@ -45,9 +45,26 @@ namespace Assets.Scripts
{
updatePlayerHUD();
switchWaterLayer();
updateCoordinates();
}
}
private void updateCoordinates()
{
GameObject coordinates = GameObject.Find("txtCoordinates");
Vector3 position = GameObject.Find("Player").transform.position;
string tiletype = GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>().getCurrentTile().GetComponent<Tile>().getTileType();
if (tiletype != null)
{
tiletype = tiletype.Replace("Tile", "");
}
else
{
tiletype = "Spawn";
}
coordinates.GetComponent<Text>().text = tiletype + "(" + (int)position.x + "/" + (int)position.y + "/" + (int)position.z + ")";
}
private void switchWaterLayer()
{
if (GameObject.Find("Player").transform.position.y < -1)
@ -101,7 +118,7 @@ namespace Assets.Scripts
}
GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>().resetGame(cityAmount);
setPlayerInformation();
compass.transform.localScale = new Vector3(1, 1, 1);
tutorial.transform.localScale = new Vector3(1, 1, 1);
showHUD();
state = UIState.GAME;
EventSystem.current.SetSelectedGameObject(null);
@ -572,5 +589,10 @@ namespace Assets.Scripts
GameObject.Find("txtSecondary_Creation").GetComponent<Text>().text = "Mana: " + playerstats[3];
}
public void closeTutorial()
{
tutorial.transform.localScale = new Vector3(0,0,0);
}
}
}

18
Assets/Standard Assets/Environment/Water (Basic)/Prefabs/WaterBasicDaytime.prefab
View File

@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 3300000}
- component: {fileID: 2300000}
- component: {fileID: 11400000}
- component: {fileID: 4129755677539343163}
m_Layer: 4
m_Name: WaterBasicDaytime
m_TagString: Untagged
@ -55,6 +56,8 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@ -66,6 +69,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
@ -78,6 +82,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@ -90,3 +95,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0d2f50a8e0bb841a5aaa90ae55db8849, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!65 &4129755677539343163
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.9999993, y: 0, z: 1.9999988}
m_Center: {x: -0.00000032782555, y: 0, z: 0.00000032782555}

11
Assets/Standard Assets/Environment/Water (Basic)/Scripts/WaterBasic.cs
View File

@ -28,5 +28,16 @@ namespace UnityStandardAssets.Water
Mathf.Repeat(offset4.z, 1.0f), Mathf.Repeat(offset4.w, 1.0f));
mat.SetVector("_WaveOffset", offsetClamped);
}
private void OnTriggerEnter(Collider other)
{
if (other.gameObject.tag != null)
{
if (other.gameObject.tag.ToLower().Contains("object"))
{
Destroy(other.gameObject);
}
}
}
}
}