From 18dfaf7602a489d572acb556f49833549a9a9222 Mon Sep 17 00:00:00 2001 From: TAASONI3 Date: Tue, 11 Jul 2023 18:36:46 +0200 Subject: [PATCH] fixed unity inventory and texts --- .../Linux/addressables_content_state.bin | Bin 2845 -> 2845 bytes Assets/AddressableAssetsData/Windows.meta | 8 + .../Windows/addressables_content_state.bin | Bin 0 -> 2857 bytes .../addressables_content_state.bin.meta | 7 + Assets/Scripts/Handler/TextHandler.cs | 24 +- Assets/Scripts/Inventory.cs | 61 ++- Assets/Scripts/Items/Equipment.cs | 6 +- Assets/Scripts/UI.meta | 8 + UserSettings/EditorUserSettings.asset | 4 +- UserSettings/Layouts/default-2021.dwlt | 403 ++++++++++-------- save.json | 113 ++--- settings.txt | 6 +- 12 files changed, 367 insertions(+), 273 deletions(-) create mode 100644 Assets/AddressableAssetsData/Windows.meta create mode 100644 Assets/AddressableAssetsData/Windows/addressables_content_state.bin create mode 100644 Assets/AddressableAssetsData/Windows/addressables_content_state.bin.meta create mode 100644 Assets/Scripts/UI.meta diff --git a/Assets/AddressableAssetsData/Linux/addressables_content_state.bin b/Assets/AddressableAssetsData/Linux/addressables_content_state.bin index c3fc0a165c59bb071e8a2fdffd723624e6468525..b576da6d96a4065a46a1a96c34daaa98aedf804a 100644 GIT binary patch delta 189 zcmW-ZI|{-;6h$+Q|3VNgL_yHXBD}nL^DC5eTG_aQ`8Y1c!p_tImms(YI|WN|4Y~${ z2kzlkryP`n%aPS(3M$Ra^~9$28KL%QG6$r5bYKk_C!OISJtrH&`>|aVuSU*p*I~2I zW|2o}Getf|3{gvEtl%D;1hf(r}B?%i=uUoA)uQbtS=ZQEF1_bR$ c?1WGhtRxf&q|f{Nrg*mU&S(5DBvqpQ1BwnU=>Px# delta 189 zcmW-aJqp4=6oj*l@vjiX6rvy)Ei5E&-~Kj|6WCZ;?k0I>5z-kfa{~(@wKuS_wDuw{ z4$LskeA6av@~BxX_6U0+x+`19sp7^IrYN;GpaCsa(vb2%s({KHar@S<=F`vFv6~NO zEOlryEGuwQaRt)bj67lnmI#rgzMq?Ia~kG{%_91XMG>2aHVN+SLaeM8mMd-vxpcbZ c#uj0jX+_||txx*XXY(HBHtoZlwxELBUU&wVyrneKQ`9-E(@q z-rv~hOKouRm&6~D@(*?9m zrSen5^)|^f{T6IpF0Vszx@hx!mdw9mtxoN9ZJ(`cXlnOdo8_kaf4x!`4HV6#Ml~>t z29|E*Y744u21{TWZI2eT(qk~IMOxN}E0~lGtf)ri<>p$c%(`mEOVbtS+QOhejx*!T z$el1+v4$;4%jCWHDMaDURi}s@UDEGAgyIlq+;>^%vcUDE%OcnJ`!hJPfD@kUyPT)q zfL!nQQS=6LDCTI~yR%<2V&_Ee`9KWj$e6W5wr7H!+vzw&h6eK_1|%LPu|Q&x#1e|d z{V3L~ad!jivaK{+P=(rrT_+Ra?Vj#pVl&`;mcy!>EwQQ0#i!^Sk zt(6jwG!CW!Z>tI5N()K1$c56t-N{SYEjT(EU8w=F&X?8nnwToqN9@Fvs~b46Mnz!z z|KrFc2UT5c#;~oieSg(g$50Rmm}zNu=pN`Dn0Myq&+INrcPLW<9ypFe-~Ll5hLMc@ zC}NN*&iq(Q!4r_$H>sZrrMz_itADKFy6MY+zWrk;hCwVjQ>g+L8?9rLFrG3Kh)_rX zX~Nmx@geaa$&&MPH&x!kXw;i0%GAE3>WB?z9V$?iJN;)+3Ir*a+D8s5^!m?|S|U^uNlzOSCCpC)V<1XBriE64&xLk=Ls!ThQu%?r z$42N>g)I7W*cs|1l!|Fj2@t|)7Dz55-vml0z@tPgeRrlM&3ow2TeT>TgTP~+7kb=) zkLYn2%0T%N`FM%*YX|+Wj_*`!Ec$UW6LF)slE$QhYo+3tNhOjn^o7CgmFdOrUwaqV zbO z=rl_dK3xo#;@H>DH@L2Yev;IDrU8;9jg8bv;6+J*kyD|G7#C4$Jm=>Q`WKzZQ_-;K zFOiuj1}%io1UH;vqyq?o5Dj522b_uM+fRP{3fFbeU!JNNj5+vT1WYp>dlL5`Fd7mQ T3(lGIQwRO_)7C-{_kH0Xh_-Qj literal 0 HcmV?d00001 diff --git a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin.meta b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin.meta new file mode 100644 index 0000000..f23e8c7 --- /dev/null +++ b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c4f1d14f990899e0ca92419d63603d79 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Handler/TextHandler.cs b/Assets/Scripts/Handler/TextHandler.cs index 2a75acf..df3e303 100644 --- a/Assets/Scripts/Handler/TextHandler.cs +++ b/Assets/Scripts/Handler/TextHandler.cs @@ -19,16 +19,28 @@ public class TextHandler : MonoBehaviour } public static string getText(string key){ - key = key.Replace("(","").Replace(")",""); + bool hasLeftBracket = false; + bool hasRightBracket = false; + if(key.Contains("(")){ + hasLeftBracket = true; + key = key.Replace("(",""); + } + if(key.Contains(")")){ + hasRightBracket = true; + key = key.Replace(")",""); + } + if(key[0].Equals(Char.ToUpperInvariant(key[0]))){ key = Char.ToLowerInvariant(key[0]) + key.Substring(1); } - - if(key.Contains("\r\n")){ - return key; - } - + string text = LocalizationSettings.StringDatabase.GetLocalizedString("MyTexts",key); + if(hasLeftBracket){ + text = "(" + text; + } + if(hasRightBracket){ + text = text + ")"; + } return text; } diff --git a/Assets/Scripts/Inventory.cs b/Assets/Scripts/Inventory.cs index 29a335c..134d8b0 100644 --- a/Assets/Scripts/Inventory.cs +++ b/Assets/Scripts/Inventory.cs @@ -30,7 +30,6 @@ namespace Assets.Scripts TooltipHandler tooltip; public GameObject currentSlot; - // Start is called before the first frame update void Start() @@ -50,18 +49,19 @@ namespace Assets.Scripts private void createStatBoost() { - if (statBoost == null) - { - statBoost = new Dictionary(); - statBoost.Add("HP", 0); - statBoost.Add("MP", 0); - statBoost.Add("HPR", 0); - statBoost.Add("MPR", 0); - statBoost.Add("STR", 0); - statBoost.Add("DEX", 0); - statBoost.Add("INT", 0); - statBoost.Add("LCK", 0); - } + statBoost = new Dictionary(); + statBoost.Add("HP", 0); + statBoost.Add("MP", 0); + statBoost.Add("HPR", 0); + statBoost.Add("MPR", 0); + statBoost.Add("STR", 0); + statBoost.Add("DEX", 0); + statBoost.Add("INT", 0); + statBoost.Add("LCK", 0); + } + + void OnDisable(){ + statBoost = new Dictionary(); } public void addItem(Item item) @@ -195,6 +195,41 @@ namespace Assets.Scripts public Dictionary getEquipmentBonus() { createStatBoost(); + GameObject equip = head; + for (int i = 0; i < 8; i++) + { + switch (i) + { + case 0: + equip = head; + break; + case 1: + equip = rightHand; + break; + case 2: + equip = leftHand; + break; + case 3: + equip = amulet; + break; + case 4: + equip = feet; + break; + case 5: + equip = shoulders; + break; + case 6: + equip = chest; + break; + case 7: + equip = ring; + break; + } + if (equip.GetComponent().getEquip() != null) + { + calculateStatBoost(equip.GetComponent().getEquip().getAttributes(), true); + } + } return statBoost; } diff --git a/Assets/Scripts/Items/Equipment.cs b/Assets/Scripts/Items/Equipment.cs index d35b00e..3482ce2 100644 --- a/Assets/Scripts/Items/Equipment.cs +++ b/Assets/Scripts/Items/Equipment.cs @@ -118,7 +118,7 @@ namespace Assets.Scripts } else { - itemName = place.ToString() + " of " + itemName + " attribute \r\n (" + rarity.ToString() + ")"; + itemName = place.ToString() + " of " + itemName + " attribute (" + rarity.ToString() + ")"; } } @@ -126,11 +126,11 @@ namespace Assets.Scripts { if (replacement.Length > 0) { - itemName = replacement + " \r\n" + rarity.ToString(); + itemName = replacement + " " + rarity.ToString(); } else { - itemName = place.ToString() + " \r\n" + rarity.ToString(); + itemName = place.ToString() + " " + rarity.ToString(); } } itemName = itemName.ToLower(); diff --git a/Assets/Scripts/UI.meta b/Assets/Scripts/UI.meta new file mode 100644 index 0000000..28ea402 --- /dev/null +++ b/Assets/Scripts/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b28188d6b76b96d38e71a4b554ef98f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 9b40673..d2184d0 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,10 +6,10 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a flags: 0 RecentlyUsedSceneGuid-1: - value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index c6f1227..26ede6d 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,9 +19,9 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Localization Tables + m_Title: Hierarchy m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 371} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 --- !u!114 &2 @@ -46,7 +46,7 @@ MonoBehaviour: y: 0 width: 1920 height: 989 - m_MinSize: {x: 875, y: 371} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 21 + controlID: 84 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1524 + width: 1518 height: 939 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 22 + controlID: 85 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1524 + width: 1518 height: 658 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 23 + controlID: 86 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -206,27 +206,26 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: LocalizationTablesWindow + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 306 y: 0 - width: 1218 + width: 1212 height: 658 - m_MinSize: {x: 902, y: 621} + m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} - {fileID: 17} - {fileID: 18} - {fileID: 19} - - {fileID: 13} - - {fileID: 12} - m_Selected: 5 - m_LastSelected: 0 + - {fileID: 20} + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -244,17 +243,68 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 658 - width: 1524 + width: 1518 height: 281 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} - - {fileID: 20} + - {fileID: 21} m_Selected: 0 m_LastSelected: 1 --- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 12} + - {fileID: 13} + m_Position: + serializedVersion: 2 + x: 1518 + y: 0 + width: 402 + height: 939 + m_MinSize: {x: 100, y: 200} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 44 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneControlsWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 402 + height: 132 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 22} + m_Panes: + - {fileID: 22} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -269,102 +319,17 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1524 - y: 0 - width: 396 - height: 939 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 21} + x: 0 + y: 132 + width: 402 + height: 807 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 23} m_Panes: - - {fileID: 21} + - {fileID: 23} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03b8c364c5fbffe4c949a4ceb342fb8a, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 900, y: 600} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Localization Tables - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 306 - y: 121 - width: 1216 - height: 637 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 13854, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 310, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Project Settings - m_Image: {fileID: -5712115415447495865, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 306 - y: 121 - width: 1216 - height: 637 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_PosLeft: {x: 0, y: 0} - m_PosRight: {x: 0, y: 0} - m_Scope: 1 - m_SplitterFlex: 0.2 - m_SearchText: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 794a7f2e - m_LastClickedID: 780094073 - m_ExpandedIDs: a01a5fa600000000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -387,7 +352,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 779 - width: 1523 + width: 1517 height: 260 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -407,22 +372,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Scripts/UI m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scenes + - Assets/Scripts/UI m_LastFoldersGridSize: -1 m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 44} - m_SelectedIDs: 1a5d0000 - m_LastClickedID: 23834 - m_ExpandedIDs: 000000007c5c00007e5c000072e3020000ca9a3b + scrollPos: {x: 0, y: 192} + m_SelectedIDs: 28690000 + m_LastClickedID: 26920 + m_ExpandedIDs: 000000002a6800002c6800000a69000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -450,7 +415,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000007c5c00007e5c0000 + m_ExpandedIDs: 000000002a6800002c680000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -494,7 +459,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -538,9 +503,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 16150300 - m_LastClickedID: 202006 - m_ExpandedIDs: 5ee6fdff64d3ffff34fbffff5e4e00007c4e00007a5000004451000072540000c65400005e550000a8550000405600003058000038580000384c0100ac520100e4520100705401009a11030002120300a2140300c61403002e1503006e160300f4160300 + m_SelectedIDs: 94620000 + m_LastClickedID: 25236 + m_ExpandedIDs: 34fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -586,7 +551,7 @@ MonoBehaviour: serializedVersion: 2 x: 306 y: 121 - width: 1216 + width: 1210 height: 637 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -823,9 +788,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 845.7728, y: 684.1243, z: -362.099} + m_Target: {x: 960, y: 481.5, z: 0} speed: 2 - m_Value: {x: 845.7728, y: 684.1243, z: -362.099} + m_Value: {x: 960, y: 481.5, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -872,13 +837,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.11000887, y: -0.013542242, z: 0.0016564258, w: -0.9937737} + m_Target: {x: 0.019645238, y: 0.019715546, z: -0.00078249566, w: 0.9995659} speed: 2 - m_Value: {x: -0.110015795, y: -0.013543094, z: 0.00165653, w: -0.99383616} + m_Value: {x: 0.01964615, y: 0.01971646, z: -0.0007825319, w: 0.9996123} m_Size: - m_Target: 349.7174 + m_Target: 404.61365 speed: 2 - m_Value: 334.6578 + m_Value: 404.61365 m_Ortho: m_Target: 0 speed: 2 @@ -923,10 +888,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 306 - y: 121 - width: 1216 - height: 637 + x: 2226 + y: 94 + width: 1211 + height: 656 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -935,7 +900,7 @@ MonoBehaviour: m_SerializedViewNames: [] m_SerializedViewValues: [] m_PlayModeViewName: GameView - m_ShowGizmos: 0 + m_ShowGizmos: 1 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} m_TargetSize: {x: 1920, y: 1080} @@ -945,7 +910,7 @@ MonoBehaviour: m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 - m_Gizmos: 0 + m_Gizmos: 1 m_Stats: 0 m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: @@ -974,23 +939,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1216 - height: 616 - m_Scale: {x: 0.5703704, y: 0.5703704} - m_Translation: {x: 608, y: 308} + width: 1211 + height: 635 + m_Scale: {x: 0.587963, y: 0.587963} + m_Translation: {x: 605.5, y: 317.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1065.974 + x: -1029.8268 y: -540 - width: 2131.948 + width: 2059.6536 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.5703704 - m_LastWindowPixelSize: {x: 1216, y: 637} + m_defaultScale: 0.587963 + m_LastWindowPixelSize: {x: 1211, y: 656} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -1018,7 +983,7 @@ MonoBehaviour: serializedVersion: 2 x: 2226 y: 94 - width: 1216 + width: 1211 height: 656 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1049,9 +1014,9 @@ MonoBehaviour: m_SearchString: m_ActionsTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 51594c39 - m_LastClickedID: 961304913 - m_ExpandedIDs: 3ecfad9feb02e1a0dd8938a4190353a9403893bd240ffec3e74fd8d41bb032d560c274d6e6ecf4db0161a3e00c4d1de9698c8af5b26490f5ae166efddc82a21116a40c237c371f247f681926c7ab262c5602c737de49913b102bd243b044d04d4cf28955a712cc5d125f496396ab02714c14b372 + m_SelectedIDs: 7f681926 + m_LastClickedID: 639199359 + m_ExpandedIDs: 71f36b8d3ecfad9feb02e1a0dd8938a4190353a9bb00a4a9403893bd402ec6c0a3bbefc3240ffec3f8e146d4e74fd8d41bb032d560c274d6e6ecf4db0161a3e00c4d1de9698c8af5b26490f5ae166efdf46bf20cdc82a21116a40c237c371f247f681926c7ab262c5602c737de49913b102bd243b044d04d0df6274e4cf289554fd69156a712cc5d125f496396ab02714c14b37240bb7e7bab03247c m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1076,7 +1041,7 @@ MonoBehaviour: selectedIndex: 0 scroll: {x: 0, y: 0} - itemId: 656259478 - selectedIndex: 2 + selectedIndex: 0 scroll: {x: 0, y: 0} - itemId: 378383742 selectedIndex: -1 @@ -1146,19 +1111,19 @@ MonoBehaviour: \"expectedControlType\": \"Button\",\n \"processors\": \"\",\n \"interactions\": \"\",\n \"initialStateCheck\": false\n },\n {\n \"name\": \"Charsheet\",\n - \"type\": \"Button\",\n \"id\": \"772a3f30-c5b5-4782-9d08-9fcfb6e45902\",\n + \"type\": \"Button\",\n \"id\": \"d3e2f9b4-83df-4229-bdab-166ea722b672\",\n \"expectedControlType\": \"Button\",\n \"processors\": \"\",\n \"interactions\": \"\",\n \"initialStateCheck\": false\n },\n {\n \"name\": \"Inventory\",\n - \"type\": \"Button\",\n \"id\": \"6f41ca97-ac56-4d15-831b-5d1ee56fc561\",\n + \"type\": \"Button\",\n \"id\": \"2a815faf-7f83-4f8e-b0c0-fb3c27e050f0\",\n \"expectedControlType\": \"Button\",\n \"processors\": \"\",\n \"interactions\": \"\",\n \"initialStateCheck\": false\n },\n {\n \"name\": \"Questlog\",\n - \"type\": \"Button\",\n \"id\": \"89f16da1-10b9-4d1c-9437-70dd3c0e4d54\",\n + \"type\": \"Button\",\n \"id\": \"56496e33-3b2a-4950-8e12-0c66d769d3b9\",\n \"expectedControlType\": \"Button\",\n \"processors\": \"\",\n \"interactions\": \"\",\n \"initialStateCheck\": false\n },\n {\n \"name\": \"Pause\",\n - \"type\": \"Button\",\n \"id\": \"24eaf9a7-426f-48ca-a870-20b209478a2b\",\n + \"type\": \"Button\",\n \"id\": \"42da73ec-1cff-4563-a69e-b79d164ae159\",\n \"expectedControlType\": \"Button\",\n \"processors\": \"\",\n \"interactions\": \"\",\n \"initialStateCheck\": false\n }\n ],\n \"bindings\": [\n {\n @@ -1260,25 +1225,67 @@ MonoBehaviour: \"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n \"action\": \"SkillSix\",\n \"isComposite\": false,\n \"isPartOfComposite\": false\n },\n {\n - \"name\": \"\",\n \"id\": \"44c2c619-f0b6-42c4-9f6e-d5be7cc9bd2a\",\n + \"name\": \"\",\n \"id\": \"c3215b19-e6e2-4b38-be31-cb78772547c0\",\n \"path\": \"/c\",\n \"interactions\": \"\",\n \"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n \"action\": \"Charsheet\",\n \"isComposite\": false,\n \"isPartOfComposite\": false\n },\n {\n - \"name\": \"\",\n \"id\": \"2d20ea2e-d6fb-4c55-9f20-da09821adcfa\",\n + \"name\": \"\",\n \"id\": \"198d5b2b-78fa-479f-8a06-ca71e1e8c914\",\n + \"path\": \"/buttonNorth\",\n \"interactions\": + \"\",\n \"processors\": \"\",\n \"groups\": + \"KeyboardMouse\",\n \"action\": \"Charsheet\",\n + \"isComposite\": false,\n \"isPartOfComposite\": false\n + },\n {\n \"name\": \"\",\n + \"id\": \"99797d2f-fccb-4165-b1ee-3032683a3e21\",\n \"path\": + \"/buttonNorth\",\n \"interactions\": \"\",\n + \"processors\": \"\",\n \"groups\": \"Controller\",\n + \"action\": \"Charsheet\",\n \"isComposite\": false,\n + \"isPartOfComposite\": false\n },\n {\n + \"name\": \"\",\n \"id\": \"41d6126e-54e9-4ac3-9fd7-20ecf4db4eaa\",\n \"path\": \"/i\",\n \"interactions\": \"\",\n \"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n \"action\": \"Inventory\",\n \"isComposite\": false,\n \"isPartOfComposite\": false\n },\n {\n - \"name\": \"\",\n \"id\": \"0866f5f0-431c-4019-b23d-d829500d5dce\",\n + \"name\": \"\",\n \"id\": \"c3be3c24-9ccb-4919-a516-48ea4f5f6a1e\",\n + \"path\": \"/buttonWest\",\n \"interactions\": + \"\",\n \"processors\": \"\",\n \"groups\": + \"KeyboardMouse\",\n \"action\": \"Inventory\",\n + \"isComposite\": false,\n \"isPartOfComposite\": false\n + },\n {\n \"name\": \"\",\n + \"id\": \"9ab4f699-2279-472d-a0c5-cd45c4e2fbce\",\n \"path\": + \"/buttonWest\",\n \"interactions\": \"\",\n + \"processors\": \"\",\n \"groups\": \"Controller\",\n + \"action\": \"Inventory\",\n \"isComposite\": false,\n + \"isPartOfComposite\": false\n },\n {\n + \"name\": \"\",\n \"id\": \"5ecbd7b6-c10e-41d7-8338-064fac48d268\",\n \"path\": \"/q\",\n \"interactions\": \"\",\n \"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n \"action\": \"Questlog\",\n \"isComposite\": false,\n \"isPartOfComposite\": false\n },\n {\n - \"name\": \"\",\n \"id\": \"d548504c-b1de-4505-a23b-2503dcf6f23e\",\n + \"name\": \"\",\n \"id\": \"2dfaf5e4-6477-4304-9ffd-e0ac589c279f\",\n + \"path\": \"/select\",\n \"interactions\": \"\",\n + \"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n + \"action\": \"Questlog\",\n \"isComposite\": false,\n + \"isPartOfComposite\": false\n },\n {\n + \"name\": \"\",\n \"id\": \"783ace97-9d13-44ed-a722-6b446a33ac08\",\n + \"path\": \"/select\",\n \"interactions\": \"\",\n + \"processors\": \"\",\n \"groups\": \"Controller\",\n + \"action\": \"Questlog\",\n \"isComposite\": false,\n + \"isPartOfComposite\": false\n },\n {\n + \"name\": \"\",\n \"id\": \"6288ecc6-0303-4eb2-a008-3e572a3b9437\",\n \"path\": \"/escape\",\n \"interactions\": \"\",\n \"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n \"action\": \"Pause\",\n \"isComposite\": false,\n + \"isPartOfComposite\": false\n },\n {\n + \"name\": \"\",\n \"id\": \"8e61b6fe-ed27-435d-b841-64d36d25fc47\",\n + \"path\": \"/start\",\n \"interactions\": \"\",\n + \"processors\": \"\",\n \"groups\": \"KeyboardMouse\",\n + \"action\": \"Pause\",\n \"isComposite\": false,\n + \"isPartOfComposite\": false\n },\n {\n + \"name\": \"\",\n \"id\": \"3810d8e5-0249-48dd-a379-3efd589b1996\",\n + \"path\": \"/start\",\n \"interactions\": \"\",\n + \"processors\": \"\",\n \"groups\": \"Controller\",\n + \"action\": \"Pause\",\n \"isComposite\": false,\n \"isPartOfComposite\": false\n }\n ]\n },\n {\n \"name\": \"MainGame\",\n \"id\": \"712b45f3-3199-497f-85da-3436b9aca739\",\n \"actions\": [\n {\n \"name\": \"Movement\",\n @@ -1497,7 +1504,7 @@ MonoBehaviour: m_IsDirty: 0 m_Toolbar: m_IsDirty: 0 - m_SelectedControlSchemeIndex: 0 + m_SelectedControlSchemeIndex: 1 m_SelectedDeviceRequirementIndex: -1 m_ControlSchemes: - m_Name: KeyboardMouse @@ -1543,8 +1550,8 @@ MonoBehaviour: serializedVersion: 2 x: 2226 y: 94 - width: 1222 - height: 682 + width: 1211 + height: 656 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1573,6 +1580,35 @@ MonoBehaviour: m_ClientGUIView: {fileID: 0} m_SearchString: --- !u!114 &20 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03b8c364c5fbffe4c949a4ceb342fb8a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 900, y: 600} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Localization Tables + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2226 + y: 94 + width: 1211 + height: 656 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1592,16 +1628,45 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 779 - width: 1523 - height: 260 + x: 1920 + y: 771 + width: 1517 + height: 268 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &21 +--- !u!114 &22 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d0eea65a4b934e48b2b8115dcfbac57, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Localization Scene Controls + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1518 + y: 121 + width: 401 + height: 111 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1621,10 +1686,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1524 - y: 121 - width: 395 - height: 918 + x: 1518 + y: 253 + width: 401 + height: 786 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default diff --git a/save.json b/save.json index e3695aa..87b3896 100644 --- a/save.json +++ b/save.json @@ -1,58 +1,66 @@ { "player": { -"playername": "", -"maxHealth": 110, -"maxSecondary": 10, -"secondary": 10, -"health": 110, -"strength": 7, +"playername": "Nicola", +"maxHealth": 120, +"maxSecondary": 30, +"secondary": 38, +"health": 130, +"strength": 10, "dexterity": 5, "intelligence": 3, -"level": 0, -"experience": 0, -"maxExperience": 10, +"level": 3, +"experience": 56, +"maxExperience": 80, "race": "Human", "role": "Warrior", "points": 0, "healthRegen": 30, "secondaryRegen": 5, "isDodging": "False", -"killcount": 0, -"luck": 20, +"killcount": 5, +"luck": 26, "difficulty": 0 }, "world": { -"cityAmount": 3, +"cityAmount": 5, "maxCityAmount": 5, -"currentTile": "-2/0/5", +"currentTile": "0/0/1", "map": { -"tile0": "./save/tile0.json", -"tile1": "./save/tile1.json", -"tile2": "./save/tile2.json", -"tile3": "./save/tile3.json", -"tile4": "./save/tile4.json", -"tile5": "./save/tile5.json", -"tile6": "./save/tile6.json" +"tile0": "./save/tile0.json" } }, "inventory": { "equipment": { "head": "empty", "rightHand": "empty", -"leftHand": "empty", +"leftHand": { +"rarity": "LEGENDARY", +"place": "LEFTHAND", +"itemName": "Greatshield (legendary)", +"MPR": 3, +"HPR": 3, +"MP": 3, +"HP": 3, +"STR": 3, +"DEX": 3, +"INT": 3, +"LCK": 3 +}, "amulet": "empty", "feet": "empty", "shoulders": "empty", -"chest": "empty", +"chest": { +"rarity": "RARE", +"place": "ARMOR", +"itemName": "Armor of health attribute (rare)", +"HP": 10, +"MP": 8 +}, "ring": "empty" }, "bags": { "slot0": { -"bag1": { -"rarity": "COMMON", -"itemName": "Iron ore", - -}, +"bag1": "empty", "bag2": "empty", "bag3": "empty" }, @@ -148,60 +156,11 @@ "quest0": { "questname": "Find all cities", "keyword": "City", -"current": 2, +"current": 0, "goal": 5, "isFinished": "False", "coordinates": "0/0" -} -}, -"explore": { -"quest0": { -"questname": "Travel to 386/-209 (X/Z)", -"keyword": "", -"current": 0, -"goal": 0, -"isFinished": "False", -"coordinates": "386.2796/-208.8457" - -}, -"quest1": { -"questname": "Travel to -92/-245 (X/Z)", -"keyword": "", -"current": 0, -"goal": 0, -"isFinished": "False", -"coordinates": "-91.73314/-244.6622" - -}, -"quest2": { -"questname": "Travel to 427/61 (X/Z)", -"keyword": "", -"current": 0, -"goal": 0, -"isFinished": "False", -"coordinates": "427.9097/61.34143" - -}, -"quest3": { -"questname": "Travel to -335/214 (X/Z)", -"keyword": "", -"current": 0, -"goal": 0, -"isFinished": "False", -"coordinates": "-334.0099/214.4944" - -} -}, -"collect": { -"quest0": { -"questname": "Collect 6 rock", -"keyword": "Rock", -"current": 0, -"goal": 6, -"isFinished": "False", -"coordinates": "0/0" - } } } diff --git a/settings.txt b/settings.txt index 3db1aed..a0a3449 100644 --- a/settings.txt +++ b/settings.txt @@ -1,7 +1,7 @@ Resolution:1 Mode:0 -Language:en -Music:0.2077685 -Effects:0.9040101 +Language:de +Musik:0.1054875 +Effekte:0.5 SensitivityMouse:1 SensitivityController:2 \ No newline at end of file