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

fixed controls, texts and added image, v1.4.1

Browse Source
This commit is contained in:
TAASONI3
2023-07-05 17:42:35 +02:00
parent 0dc2ff831f
commit d0d9a6847a
33 changed files with 11964 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/AddressableAssetsData/Linux.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 005a54dfcaa4d39de903e69acfd2e20c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/AddressableAssetsData/Linux/addressables_content_state.bin Normal file
View File

Binary file not shown.

7
Assets/AddressableAssetsData/Linux/addressables_content_state.bin.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c5df39018cdb8c32fa198fbf1e2080a4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/IMG/controller-1827840_1920.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 109 KiB

123
Assets/IMG/controller-1827840_1920.png.meta Normal file
View File

@@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 1f08fe6fdda50ba26b49fb95d69139a1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

104
Assets/Input.inputactions
View File

@@ -89,7 +89,7 @@
{
"name": "Charsheet",
"type": "Button",
"id": "772a3f30-c5b5-4782-9d08-9fcfb6e45902",
"id": "d3e2f9b4-83df-4229-bdab-166ea722b672",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
@@ -98,7 +98,7 @@
{
"name": "Inventory",
"type": "Button",
"id": "6f41ca97-ac56-4d15-831b-5d1ee56fc561",
"id": "2a815faf-7f83-4f8e-b0c0-fb3c27e050f0",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
@@ -107,7 +107,7 @@
{
"name": "Questlog",
"type": "Button",
"id": "89f16da1-10b9-4d1c-9437-70dd3c0e4d54",
"id": "56496e33-3b2a-4950-8e12-0c66d769d3b9",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
@@ -116,7 +116,7 @@
{
"name": "Pause",
"type": "Button",
"id": "24eaf9a7-426f-48ca-a870-20b209478a2b",
"id": "42da73ec-1cff-4563-a69e-b79d164ae159",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
@@ -335,7 +335,7 @@
},
{
"name": "",
"id": "44c2c619-f0b6-42c4-9f6e-d5be7cc9bd2a",
"id": "c3215b19-e6e2-4b38-be31-cb78772547c0",
"path": "<Keyboard>/c",
"interactions": "",
"processors": "",
@@ -346,7 +346,29 @@
},
{
"name": "",
"id": "2d20ea2e-d6fb-4c55-9f20-da09821adcfa",
"id": "198d5b2b-78fa-479f-8a06-ca71e1e8c914",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Charsheet",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "99797d2f-fccb-4165-b1ee-3032683a3e21",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": "Controller",
"action": "Charsheet",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "41d6126e-54e9-4ac3-9fd7-20ecf4db4eaa",
"path": "<Keyboard>/i",
"interactions": "",
"processors": "",
@@ -357,7 +379,29 @@
},
{
"name": "",
"id": "0866f5f0-431c-4019-b23d-d829500d5dce",
"id": "c3be3c24-9ccb-4919-a516-48ea4f5f6a1e",
"path": "<Gamepad>/buttonWest",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Inventory",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9ab4f699-2279-472d-a0c5-cd45c4e2fbce",
"path": "<Gamepad>/buttonWest",
"interactions": "",
"processors": "",
"groups": "Controller",
"action": "Inventory",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "5ecbd7b6-c10e-41d7-8338-064fac48d268",
"path": "<Keyboard>/q",
"interactions": "",
"processors": "",
@@ -368,7 +412,29 @@
},
{
"name": "",
"id": "d548504c-b1de-4505-a23b-2503dcf6f23e",
"id": "2dfaf5e4-6477-4304-9ffd-e0ac589c279f",
"path": "<Gamepad>/select",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Questlog",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "783ace97-9d13-44ed-a722-6b446a33ac08",
"path": "<Gamepad>/select",
"interactions": "",
"processors": "",
"groups": "Controller",
"action": "Questlog",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "6288ecc6-0303-4eb2-a008-3e572a3b9437",
"path": "<Keyboard>/escape",
"interactions": "",
"processors": "",
@@ -376,6 +442,28 @@
"action": "Pause",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8e61b6fe-ed27-435d-b841-64d36d25fc47",
"path": "<Gamepad>/start",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Pause",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3810d8e5-0249-48dd-a379-3efd589b1996",
"path": "<Gamepad>/start",
"interactions": "",
"processors": "",
"groups": "Controller",
"action": "Pause",
"isComposite": false,
"isPartOfComposite": false
}
]
},

57
Assets/Locals/StringTable/MyTexts Shared Data.asset
View File

@@ -1243,6 +1243,63 @@ MonoBehaviour:
m_Key: regeneration
m_Metadata:
m_Items: []
- m_Id: 276380877844480
m_Key: MenuScene/Canvas/Options/Settings/pnlContent/pnlGameplay/dropLanguage
m_Metadata:
m_Items: []
- m_Id: 276402126188544
m_Key: MenuScene/Canvas/Options/Settings/pnlContent/pnlGameplay/dropLanguage
1
m_Metadata:
m_Items: []
- m_Id: 304574532153344
m_Key: to
m_Metadata:
m_Items: []
- m_Id: 306954757730304
m_Key: all
m_Metadata:
m_Items: []
- m_Id: 316984810795008
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy)
m_Metadata:
m_Items: []
- m_Id: 317018918875136
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (1)
m_Metadata:
m_Items: []
- m_Id: 317042218233856
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (2)
m_Metadata:
m_Items: []
- m_Id: 317081271398400
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (3)
m_Metadata:
m_Items: []
- m_Id: 317114062467072
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (4)
m_Metadata:
m_Items: []
- m_Id: 317178335981568
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (5)
m_Metadata:
m_Items: []
- m_Id: 317220790726656
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (6)
m_Metadata:
m_Items: []
- m_Id: 317240193576960
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/binding/legend/Text
(Legacy) (7)
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:

54
Assets/Locals/StringTable/MyTexts_de.asset
View File

@@ -659,7 +659,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 204669767643136
m_Localized: "Aufl\xF6sung:"
m_Localized: 'Sprache:'
m_Metadata:
m_Items: []
- m_Id: 204708862750720
@@ -1014,7 +1014,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 235782057750528
m_Localized: Reise nach
m_Localized: Reise
m_Metadata:
m_Items: []
- m_Id: 235830590042112
@@ -1022,7 +1022,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 235864236748800
m_Localized: "Finde alle St\xE4dte"
m_Localized: "St\xE4dte"
m_Metadata:
m_Items: []
- m_Id: 235946084397056
@@ -1261,6 +1261,54 @@ MonoBehaviour:
m_Localized: regeneration
m_Metadata:
m_Items: []
- m_Id: 276380877844480
m_Localized: Deutsch
m_Metadata:
m_Items: []
- m_Id: 276402126188544
m_Localized: Englisch
m_Metadata:
m_Items: []
- m_Id: 304574532153344
m_Localized: nach
m_Metadata:
m_Items: []
- m_Id: 306954757730304
m_Localized: alle
m_Metadata:
m_Items: []
- m_Id: 316984810795008
m_Localized: Steuerung
m_Metadata:
m_Items: []
- m_Id: 317018918875136
m_Localized: Questbuch
m_Metadata:
m_Items: []
- m_Id: 317042218233856
m_Localized: Pause
m_Metadata:
m_Items: []
- m_Id: 317081271398400
m_Localized: Umschauen
m_Metadata:
m_Items: []
- m_Id: 317114062467072
m_Localized: Spingen / Auswahl
m_Metadata:
m_Items: []
- m_Id: 317178335981568
m_Localized: Interagieren
m_Metadata:
m_Items: []
- m_Id: 317220790726656
m_Localized: Inventar
m_Metadata:
m_Items: []
- m_Id: 317240193576960
m_Localized: Charakterfenster
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

54
Assets/Locals/StringTable/MyTexts_en.asset
View File

@@ -682,7 +682,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 204669767643136
m_Localized: Resolution
m_Localized: 'Language:'
m_Metadata:
m_Items: []
- m_Id: 204708862750720
@@ -1057,7 +1057,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 235782057750528
m_Localized: Travel to
m_Localized: Travel
m_Metadata:
m_Items: []
- m_Id: 235830590042112
@@ -1065,7 +1065,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 235864236748800
m_Localized: Find all cities
m_Localized: cities
m_Metadata:
m_Items: []
- m_Id: 235946084397056
@@ -1304,6 +1304,54 @@ MonoBehaviour:
m_Localized: regeneration
m_Metadata:
m_Items: []
- m_Id: 276380877844480
m_Localized: German
m_Metadata:
m_Items: []
- m_Id: 276402126188544
m_Localized: English
m_Metadata:
m_Items: []
- m_Id: 304574532153344
m_Localized: to
m_Metadata:
m_Items: []
- m_Id: 306954757730304
m_Localized: all
m_Metadata:
m_Items: []
- m_Id: 316984810795008
m_Localized: Movement
m_Metadata:
m_Items: []
- m_Id: 317018918875136
m_Localized: Questlog
m_Metadata:
m_Items: []
- m_Id: 317042218233856
m_Localized: Pause
m_Metadata:
m_Items: []
- m_Id: 317081271398400
m_Localized: Camera
m_Metadata:
m_Items: []
- m_Id: 317114062467072
m_Localized: Jump/Select
m_Metadata:
m_Items: []
- m_Id: 317178335981568
m_Localized: Interact
m_Metadata:
m_Items: []
- m_Id: 317220790726656
m_Localized: Inventory
m_Metadata:
m_Items: []
- m_Id: 317240193576960
m_Localized: Charactersheet
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

32
Assets/Prefabs/newSlot.prefab
View File

@@ -177,6 +177,38 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- eventID: 9
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1023590545195096446}
m_TargetAssemblyTypeName: Assets.Scripts.InventorySlot, Assembly-CSharp
m_MethodName: showTooltipSelect
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
- eventID: 10
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1023590545195096446}
m_TargetAssemblyTypeName: Assets.Scripts.InventorySlot, Assembly-CSharp
m_MethodName: hideTooltip
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 &1023590545195096446
MonoBehaviour:
m_ObjectHideFlags: 0

5619
Assets/Scenes/GameScene.unity
View File

File diff suppressed because it is too large Load Diff

5690
Assets/Scenes/MenuScene.unity
View File

File diff suppressed because it is too large Load Diff

6
Assets/Scripts/Controls.cs
View File

@@ -40,6 +40,9 @@ public class Controls : MonoBehaviour
if(Cursor.lockState != CursorLockMode.Locked){
Cursor.lockState = CursorLockMode.Locked;
}
GameObject.Find("txtInteract").GetComponent<Text>().text = GameObject.Find("txtInteract").GetComponent<Text>().text.Replace("[E]", "[ButtonEast]");
GameObject.Find("txtInteraction_Tutorial").GetComponent<Text>().text = GameObject.Find("txtInteraction_Tutorial").GetComponent<Text>().text.Replace("[E]", "[ButtonEast]");
GameObject.Find("txtTutorialGoal").GetComponent<Text>().text = GameObject.Find("txtTutorialGoal").GetComponent<Text>().text.Replace("[ESC]", "[Start]");
}
else{
if(uihandler.canPlayerRotate()){
@@ -48,6 +51,9 @@ public class Controls : MonoBehaviour
else{
Cursor.lockState = CursorLockMode.Confined;
}
GameObject.Find("txtInteract").GetComponent<Text>().text = GameObject.Find("txtInteract").GetComponent<Text>().text.Replace("[ButtonEast]", "[E]");
GameObject.Find("txtInteraction_Tutorial").GetComponent<Text>().text = GameObject.Find("txtInteraction_Tutorial").GetComponent<Text>().text.Replace("[E]", "[ButtonEast]");
GameObject.Find("txtTutorialGoal").GetComponent<Text>().text = GameObject.Find("txtTutorialGoal").GetComponent<Text>().text.Replace("[Start]", "[ESC]");
}
if(uihandler.state == UIState.GAME && playerInput.currentActionMap.name != "MainGame"){
playerInput.SwitchCurrentActionMap("MainGame");

6
Assets/Scripts/Handler/AudioHandler.cs
View File

@@ -20,8 +20,6 @@ public class AudioHandler : MonoBehaviour
AudioSource cameraAudio;
AudioSource playerAudio;
string filepath = "./audiosettings.txt";
// Start is called before the first frame update
public void Start()
{
@@ -118,8 +116,8 @@ public class AudioHandler : MonoBehaviour
string result = "";
float music = GameObject.Find("slideMusic").GetComponent<Slider>().value;
float effects = GameObject.Find("slideEffects").GetComponent<Slider>().value;
result = result + TextHandler.getText("music") + ": " + music + "\r\n";
result = result + TextHandler.getText("effects") + ": " + effects;
result = result + TextHandler.getText("music") + ":" + music + "\r\n";
result = result + TextHandler.getText("effects") + ":" + effects;
return result;
}
}

1
Assets/Scripts/Handler/ButtonHandler.cs
View File

@@ -82,6 +82,7 @@ namespace Assets.Scripts
string saveText = "";
audioHandler.playButtonClick();
saveText = saveText + uihandler.saveVideoSettings() + "\r\n";
saveText = saveText + uihandler.saveLanguage() + "\r\n";
saveText = saveText + audioHandler.saveAudioSettings() + "\r\n";
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value;
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().controllerSpeed = GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;

10
Assets/Scripts/Handler/FileHandler.cs
View File

@@ -8,6 +8,7 @@ using UnityEngine;
using UnityEngine.UI;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using UnityEngine.Localization.Settings;
namespace Assets.Scripts
{
@@ -54,8 +55,9 @@ namespace Assets.Scripts
sw = File.CreateText(settingsPath);
sw.WriteLine("Music:0.5");
sw.WriteLine("Effects:0.5");
sw.WriteLine("Resolution:0");
sw.WriteLine("Resolution:1");
sw.WriteLine("Mode:0");
sw.WriteLine("Language:en");
sw.WriteLine("SensitivityMouse:1");
sw.WriteLine("SensitivityController:1");
sw.Flush();
@@ -96,6 +98,9 @@ namespace Assets.Scripts
break;
}
break;
case "Language":
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale(line.Split(":")[1]);
break;
case "SensitivityMouse":
if(isIngame){
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().mouseSpeed = float.Parse(line.Split(':')[1]);
@@ -126,6 +131,9 @@ namespace Assets.Scripts
case "Mode":
GameObject.Find("dropMode").GetComponent<Dropdown>().value = int.Parse(line.Split(':')[1]);
break;
case "Language":
GameObject.Find("dropLanguage").GetComponent<Dropdown>().value = line.Split(':')[1].Equals("en") ? 1 : 0;
break;
case "SensitivityMouse":
GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value = float.Parse(line.Split(':')[1]);
break;

16
Assets/Scripts/Handler/TextHandler.cs
View File

@@ -34,8 +34,20 @@ public class TextHandler : MonoBehaviour
public static string translate(string text){
string result = "";
for(int i = 0; i < text.Split(" ").Length; i++){
result += getText(text.Split(" ")[i]) + " ";
string[] parts = text.Split(" ");
for(int i = 0; i < parts.Length; i++){
try{
int.Parse(parts[i]);
result += parts[i] + " ";
}
catch(Exception ex){
if(parts[i].Contains("/")){
result += parts[i] + " ";
}
else{
result += getText(parts[i]) + " ";
}
}
}
return result;
}

32
Assets/Scripts/Handler/UIHandler.cs
View File

@@ -4,6 +4,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.Localization.Settings;
using UnityEngine.UI;
namespace Assets.Scripts
@@ -127,7 +128,6 @@ namespace Assets.Scripts
public void openOptions()
{
options.SetActive(true);
FileHandler.loadOptionDisplay();
hideOtherElements(options);
state = UIState.PAUSEOPTIONS;
@@ -137,7 +137,6 @@ namespace Assets.Scripts
public void closeOptions()
{
options.SetActive(false);
state = UIState.PAUSE;
openPauseMenu();
}
@@ -304,6 +303,22 @@ namespace Assets.Scripts
return result;
}
public string saveLanguage(){
GameObject language = GameObject.Find("dropLanguage");
string result = "";
switch (language.GetComponent<Dropdown>().value)
{
case 0:
result = "de";
break;
case 1:
result = "en";
break;
}
result = "Language:"+result;
return result;
}
public void openPauseMenu()
{
hideOtherElements(pauseMenu);
@@ -576,5 +591,18 @@ namespace Assets.Scripts
}
}
}
public void switchLanguage(){
GameObject language = GameObject.Find("dropLanguage");
switch (language.GetComponent<Dropdown>().value)
{
case 0:
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("de");
break;
case 1:
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("en");
break;
}
}
}
}

24
Assets/Scripts/InventorySlot.cs
View File

@@ -75,7 +75,29 @@ namespace Assets.Scripts
}
}
private Item getItemForTooltip()
public void showTooltipSelect(){
GameObject current = EventSystem.current.currentSelectedGameObject;
Item item = current.GetComponent<InventorySlot>().getItemForTooltip();
if (item != null)
{
inventory.itemDisplay.transform.Find("itemImage").GetComponent<RawImage>().texture = item.image;
inventory.itemDisplay.transform.Find("itemImage").GetComponent<RawImage>().color = item.rarityColor;
inventory.itemDisplay.transform.Find("itemName").GetComponent<Text>().text = TextHandler.translate(item.getName());
inventory.itemDisplay.transform.Find("itemStats").GetComponent<Text>().text = item.getInformation();
int changeY = 0;
if (inventory.itemDisplay.transform.localScale == new Vector3(0,0,0))
{
if (Input.mousePosition.y < Screen.height / 2)
{
changeY = -150;
}
inventory.itemDisplay.transform.position = new Vector3(current.transform.position.x - 250, current.transform.position.y + changeY, 0);
}
inventory.itemDisplay.transform.localScale = new Vector3(1, 1, 1);
}
}
public Item getItemForTooltip()
{
Item item = null;
if (place == ItemPlace.BAG)

1
Assets/Scripts/Items/Equipment.cs
View File

@@ -31,7 +31,6 @@ namespace Assets.Scripts
place = (ItemPlace)rand.Next(8);
editName();
loadImage();
Debug.Log(itemName);
}
public Equipment(JToken json) : base(json)

8
Assets/Scripts/Menu/ButtonHandlerMenu.cs
View File

@@ -17,7 +17,12 @@ namespace Assets.Scripts.Menu
uihandler = GameObject.Find("UIHandler").GetComponent<UIHandlerMenu>();
audioHandler = GameObject.Find("AudioHandler").GetComponent<AudioHandler>();
sceneHandler = GameObject.Find("SceneHandlerLoaded").GetComponent<SceneHandler>();
GameObject.Find("btnLoad").SetActive(FileHandler.hasSaveFile());
if(FileHandler.hasSaveFile()){
GameObject.Find("btnLoad").GetComponent<Button>().interactable = true;
}
else{
GameObject.Find("btnLoad").GetComponent<Button>().interactable = false;
}
}
public void startGame()
@@ -64,6 +69,7 @@ namespace Assets.Scripts.Menu
string saveText = "";
audioHandler.playButtonClick();
saveText = saveText + uihandler.saveVideoSettings() + "\r\n";
saveText = saveText + uihandler.saveLanguage() + "\r\n";
saveText = saveText + audioHandler.saveAudioSettings() + "\r\n";
saveText = saveText + "SensitivityMouse:"+GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value + "\r\n";
saveText = saveText + "SensitivityController:"+GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;

56
Assets/Scripts/Menu/UIHandlerMenu.cs
View File

@@ -4,6 +4,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.Localization.Settings;
using UnityEngine.UI;
namespace Assets.Scripts.Menu
@@ -18,9 +19,9 @@ namespace Assets.Scripts.Menu
void Start()
{
FileHandler.loadOptions(false);
options.SetActive(false);
characterCreation.SetActive(false);
mainMenu.SetActive(true);
options.transform.localScale = new Vector3(0,0,0);
characterCreation.transform.localScale = new Vector3(0,0,0);
mainMenu.transform.localScale = new Vector3(1,1,1);
SteamWorksHandler.getStandardAchievement("StartAchievement");
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStart"));
}
@@ -95,22 +96,25 @@ namespace Assets.Scripts.Menu
public void openCharacterCreation()
{
characterCreation.SetActive(true);
mainMenu.SetActive(false);
options.transform.localScale = new Vector3(0,0,0);
characterCreation.transform.localScale = new Vector3(1,1,1);
mainMenu.transform.localScale = new Vector3(0,0,0);
EventSystem.current.SetSelectedGameObject(GameObject.Find("inName"));
}
public void closeCharacterCreation()
{
characterCreation.SetActive(false);
mainMenu.SetActive(true);
options.transform.localScale = new Vector3(0,0,0);
characterCreation.transform.localScale = new Vector3(0,0,0);
mainMenu.transform.localScale = new Vector3(1,1,1);
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStart"));
}
public void openOptions()
{
options.SetActive(true);
mainMenu.SetActive(false);
options.transform.localScale = new Vector3(1,1,1);
characterCreation.transform.localScale = new Vector3(0,0,0);
mainMenu.transform.localScale = new Vector3(0,0,0);
FileHandler.loadOptionDisplay();
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnAudio"));
showOptionView("audio");
@@ -118,8 +122,9 @@ namespace Assets.Scripts.Menu
public void closeOptions()
{
options.SetActive(false);
mainMenu.SetActive(true);
options.transform.localScale = new Vector3(0,0,0);
characterCreation.transform.localScale = new Vector3(0,0,0);
mainMenu.transform.localScale = new Vector3(1,1,1);
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStart"));
}
@@ -166,6 +171,22 @@ namespace Assets.Scripts.Menu
return result;
}
public string saveLanguage(){
GameObject language = GameObject.Find("dropLanguage");
string result = "";
switch (language.GetComponent<Dropdown>().value)
{
case 0:
result = "de";
break;
case 1:
result = "en";
break;
}
result = "Language:"+result;
return result;
}
public void updateCreationInformation()
{
setPlayerInformation();
@@ -202,5 +223,18 @@ namespace Assets.Scripts.Menu
}
}
}
public void switchLanguage(){
GameObject language = GameObject.Find("dropLanguage");
switch (language.GetComponent<Dropdown>().value)
{
case 0:
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("de");
break;
case 1:
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("en");
break;
}
}
}
}

24
Assets/Scripts/Quests/CollectQuest.cs
View File

@@ -11,52 +11,52 @@ namespace Assets.Scripts
{
current = 0;
goal = getRandomNumber(10) + 1;
questname = TextHandler.getText("collect") + goal + " ";
questname = "Collect " + goal + " ";
int index = getRandomNumber(11);
switch (index)
{
case 0:
questname = questname + TextHandler.getText("slimeball");
questname = questname + "slimeball";
keyword = "Slimeball";
break;
case 1:
questname = questname + TextHandler.getText("rock");
questname = questname + "rock";
keyword = "Rock";
break;
case 2:
questname = questname + TextHandler.getText("wood");
questname = questname + "wood";
keyword = "Wood";
break;
case 3:
questname = questname + TextHandler.getText("common") + " " + TextHandler.getText("item");
questname = questname + "common item";
keyword = "Common";
break;
case 4:
questname = questname + TextHandler.getText("rare") + " " + TextHandler.getText("item");
questname = questname + "rare item";
keyword = "Rare";
break;
case 5:
questname = questname + TextHandler.getText("epic") + " " + TextHandler.getText("item");
questname = questname + "epic item";
keyword = "Epic";
break;
case 6:
questname = questname + TextHandler.getText("legendary") + " " + TextHandler.getText("item");
questname = questname + "legendary item";
keyword = "Legendary";
break;
case 7:
questname = questname + TextHandler.getText("iron") + " " + TextHandler.getText("ore");
questname = questname + "Iron ore";
keyword = "Iron";
break;
case 8:
questname = questname + TextHandler.getText("gold") + " " + TextHandler.getText("ore");
questname = questname + "Gold ore";
keyword = "Gold";
break;
case 9:
questname = questname + TextHandler.getText("copper") + " " + TextHandler.getText("ore");
questname = questname + "Copper ore";
keyword = "Copper";
break;
case 10:
questname = questname + TextHandler.getText("tin") + " " + TextHandler.getText("ore");
questname = questname + "Tin ore";
keyword = "Tin";
break;
}

2
Assets/Scripts/Quests/ExploreQuest.cs
View File

@@ -13,7 +13,7 @@ namespace Assets.Scripts
float coordX = getRandomNumber(1000) - 500;
float coordZ = getRandomNumber(1000) - 500;
coordinates = new Vector3(playerPos.x + coordX, 0, playerPos.z + coordZ);
questname = TextHandler.getText("travel") + " " + Mathf.Floor(coordinates.x) + "/" + Mathf.Floor(coordinates.z) + "(X/Z)";
questname = "Travel to " + Mathf.Floor(coordinates.x) + "/" + Mathf.Floor(coordinates.z) + " (X/Z)";
}
public ExploreQuest(JToken token, GameObject display) : base(token, display) { }

14
Assets/Scripts/Quests/FindQuest.cs
View File

@@ -11,28 +11,28 @@ namespace Assets.Scripts
{
current = 0;
goal = getRandomNumber(10) + 1;
questname = TextHandler.getText("find") + " " + goal + " ";
questname = "Find " + goal + " ";
int index = getRandomNumber(5);
switch (index)
{
case 0:
questname = questname + TextHandler.getText("plane");
questname = questname + "plane";
keyword = "Plane";
break;
case 1:
questname = questname + TextHandler.getText("mountain");
questname = questname + "mountain";
keyword = "Mountain";
break;
case 2:
questname = questname + TextHandler.getText("forest");
questname = questname + "forest";
keyword = "Forest";
break;
case 3:
questname = questname + TextHandler.getText("river");
questname = questname + "river";
keyword = "River";
break;
case 4:
questname = questname + TextHandler.getText("lake");
questname = questname + "lake";
keyword = "Lake";
break;
}
@@ -42,7 +42,7 @@ namespace Assets.Scripts
public void generateCityQuest()
{
questname = TextHandler.getText("cities");
questname = "Find all cities";
keyword = "City";
current = 0;
goal = GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>().getCityAmount();

8
Assets/Scripts/Quests/KillQuest.cs
View File

@@ -11,20 +11,20 @@ namespace Assets.Scripts
{
current = 0;
goal = getRandomNumber(20) + 1;
questname = TextHandler.getText("kill")+ " " + goal + " ";
questname = "Kill " + goal + " ";
int index = getRandomNumber(3);
switch (index)
{
case 0:
questname = questname + TextHandler.getText("slime");
questname = questname + "slime";
keyword = "slime";
break;
case 1:
questname = questname + TextHandler.getText("bossSlime");
questname = questname + "boss slime";
keyword = "boss";
break;
case 2:
questname = questname + TextHandler.getText("minibossSlime");
questname = questname + "miniBoss slime";
keyword = "miniboss";
break;
}