aboutsummaryrefslogtreecommitdiff
path: root/Assets
diff options
context:
space:
mode:
authorAndrew Lee <alee14498@gmail.com>2019-10-11 18:16:34 -0400
committerAndrew Lee <alee14498@gmail.com>2019-10-11 18:16:34 -0400
commit93b5f588e3cb644f61e002932d61f2c6cdab87ab (patch)
tree83025a2c02383512fe58792283482d6da184d36d /Assets
parent65b90c5cd18702d0d6ca167fd264c3b495b2ee33 (diff)
downloadUnicity-93b5f588e3cb644f61e002932d61f2c6cdab87ab.tar.gz
Unicity-93b5f588e3cb644f61e002932d61f2c6cdab87ab.tar.bz2
Unicity-93b5f588e3cb644f61e002932d61f2c6cdab87ab.zip
We finally got rid of GPL
Diffstat (limited to 'Assets')
-rw-r--r--Assets/Packages/Lean/Localization/TextMeshPro.unitypackage.meta (renamed from Assets/Scripts/Localisation.meta)3
-rw-r--r--Assets/Scenes/Main Menu/MainMenu.unity77
-rw-r--r--Assets/Scripts/Localisation/CSVLoader.cs68
-rw-r--r--Assets/Scripts/Localisation/CSVLoader.cs.meta11
-rw-r--r--Assets/Scripts/Localisation/LocalisationSystem.cs54
-rw-r--r--Assets/Scripts/Localisation/LocalisationSystem.cs.meta11
-rw-r--r--Assets/Scripts/Localisation/TextLocaliserUI.cs21
-rw-r--r--Assets/Scripts/Localisation/TextLocaliserUI.cs.meta11
-rw-r--r--Assets/Scripts/Player/PlayerMovement.cs18
-rw-r--r--Assets/Scripts/Player/PlayerStats.cs18
-rw-r--r--Assets/Scripts/UI/ExitApplication.cs18
-rw-r--r--Assets/Scripts/UI/LoadScene.cs18
12 files changed, 58 insertions, 270 deletions
diff --git a/Assets/Scripts/Localisation.meta b/Assets/Packages/Lean/Localization/TextMeshPro.unitypackage.meta
index 1ed2220..7a9d7bd 100644
--- a/Assets/Scripts/Localisation.meta
+++ b/Assets/Packages/Lean/Localization/TextMeshPro.unitypackage.meta
@@ -1,6 +1,5 @@
fileFormatVersion: 2
-guid: 92d477af9741ec149b21177b60c5a8e0
-folderAsset: yes
+guid: 97adf6fd425a0944ba1d078ec8de247c
DefaultImporter:
externalObjects: {}
userData:
diff --git a/Assets/Scenes/Main Menu/MainMenu.unity b/Assets/Scenes/Main Menu/MainMenu.unity
index e8c98a4..3508ece 100644
--- a/Assets/Scenes/Main Menu/MainMenu.unity
+++ b/Assets/Scenes/Main Menu/MainMenu.unity
@@ -1488,7 +1488,7 @@ RectTransform:
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: 497, y: 78}
+ m_AnchoredPosition: {x: 523, y: 76}
m_SizeDelta: {x: 974.2, y: 471.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1198375718
@@ -1509,16 +1509,14 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: " Unicity (Project SimLife): A Sims clone written in Unity C#\r\n
- Copyright (C) 2019 AleeCorp & Software Elevated\r\n\r\n This program is free
- software: you can redistribute it and/or modify\r\n it under the terms of
- the GNU General Public License as published by\r\n the Free Software Foundation,
- either version 3 of the License, or\r\n (at your option) any later version.\r\n\r\n
- This program is distributed in the hope that it will be useful,\r\n but WITHOUT
- ANY WARRANTY; without even the implied warranty of\r\n MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the\r\n GNU General Public License
- for more details.\r\n\r\n You should have received a copy of the GNU General
- Public License\r\n along with this program. If not, see <https://www.gnu.org/licenses/>."
+ m_text: 'Unicity (Project SimLife): A Sims clone written in Unity C#
+
+ Copyright
+ (C) 2019 Unicity Development Team
+
+
+ This software is protected by the copyright
+ and licensing rights held by the Unicity Development Team. (2019)'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: fa623acb39bd0fa47807173407e82458, type: 2}
m_sharedMaterial: {fileID: 3933269349784766730, guid: fa623acb39bd0fa47807173407e82458,
@@ -1564,7 +1562,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
- m_firstOverflowCharacterIndex: 709
+ m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
@@ -1588,12 +1586,12 @@ MonoBehaviour:
m_margin: {x: -19.513023, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 1198375718}
- characterCount: 783
+ characterCount: 214
spriteCount: 0
- spaceCount: 168
- wordCount: 121
+ spaceCount: 33
+ wordCount: 33
linkCount: 0
- lineCount: 15
+ lineCount: 5
pageCount: 1
materialCount: 1
m_isUsingLegacyAnimationComponent: 0
@@ -1755,7 +1753,9 @@ MonoBehaviour:
Idea: Andrew Lee (Alee Productions)
UI Design: Andrew Lee (Alee Productions)
- and cylex (Atlacomm)'
+ and cylex (Atlacomm)
+
+ Code: Adrian Ulbrich (Atlacomm)'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: fa623acb39bd0fa47807173407e82458, type: 2}
m_sharedMaterial: {fileID: 3933269349784766730, guid: fa623acb39bd0fa47807173407e82458,
@@ -1825,12 +1825,12 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 1328274757}
- characterCount: 174
+ characterCount: 206
spriteCount: 0
- spaceCount: 26
- wordCount: 25
+ spaceCount: 30
+ wordCount: 29
linkCount: 0
- lineCount: 6
+ lineCount: 7
pageCount: 1
materialCount: 1
m_isUsingLegacyAnimationComponent: 0
@@ -2150,6 +2150,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1430528654}
m_Modifications:
+ - target: {fileID: 6185627664185496795, guid: 54640e6cdbc2f4d78988772c93376f87,
+ type: 3}
+ propertyPath: m_Name
+ value: Version
+ objectReference: {fileID: 0}
- target: {fileID: 6185627664185496794, guid: 54640e6cdbc2f4d78988772c93376f87,
type: 3}
propertyPath: m_LocalPosition.x
@@ -2255,11 +2260,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 6185627664185496795, guid: 54640e6cdbc2f4d78988772c93376f87,
- type: 3}
- propertyPath: m_Name
- value: Version
- objectReference: {fileID: 0}
- target: {fileID: 6185627664185496798, guid: 54640e6cdbc2f4d78988772c93376f87,
type: 3}
propertyPath: m_FontData.m_FontSize
@@ -2499,6 +2499,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1430528654}
m_Modifications:
+ - target: {fileID: 6185627664185496795, guid: 54640e6cdbc2f4d78988772c93376f87,
+ type: 3}
+ propertyPath: m_Name
+ value: Text
+ objectReference: {fileID: 0}
- target: {fileID: 6185627664185496794, guid: 54640e6cdbc2f4d78988772c93376f87,
type: 3}
propertyPath: m_LocalPosition.x
@@ -2604,11 +2609,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 6185627664185496795, guid: 54640e6cdbc2f4d78988772c93376f87,
- type: 3}
- propertyPath: m_Name
- value: Text
- objectReference: {fileID: 0}
- target: {fileID: 6185627664185496798, guid: 54640e6cdbc2f4d78988772c93376f87,
type: 3}
propertyPath: m_FontData.m_FontSize
@@ -2626,6 +2626,11 @@ PrefabInstance:
propertyPath: translationName
value: game_copyright
objectReference: {fileID: 0}
+ - target: {fileID: 6185627664185496793, guid: 54640e6cdbc2f4d78988772c93376f87,
+ type: 3}
+ propertyPath: FallbackText
+ value: Copyright 2019 Alee Productions & Atlacomm
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 54640e6cdbc2f4d78988772c93376f87, type: 3}
--- !u!224 &1880163626 stripped
@@ -2864,6 +2869,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1430528654}
m_Modifications:
+ - target: {fileID: 6185627664185496795, guid: 54640e6cdbc2f4d78988772c93376f87,
+ type: 3}
+ propertyPath: m_Name
+ value: Title
+ objectReference: {fileID: 0}
- target: {fileID: 6185627664185496794, guid: 54640e6cdbc2f4d78988772c93376f87,
type: 3}
propertyPath: m_LocalPosition.x
@@ -2969,11 +2979,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 6185627664185496795, guid: 54640e6cdbc2f4d78988772c93376f87,
- type: 3}
- propertyPath: m_Name
- value: Title
- objectReference: {fileID: 0}
- target: {fileID: 6185627664185496793, guid: 54640e6cdbc2f4d78988772c93376f87,
type: 3}
propertyPath: translationName
diff --git a/Assets/Scripts/Localisation/CSVLoader.cs b/Assets/Scripts/Localisation/CSVLoader.cs
deleted file mode 100644
index 6805761..0000000
--- a/Assets/Scripts/Localisation/CSVLoader.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using UnityEngine;
-
-public class CSVLoader
-{
- //Reference file;
- private TextAsset csvFile;
- private char lineSeperator = '\n';
- private char surrond = '"';
- private string[] fieldSeperator = { "\", \"" };
-
- public void LoadCSV()
- {
- csvFile = Resources.Load<TextAsset>("localisation");
- }
-
- public Dictionary<string, string> GetDictionaryValues(string attributeID)
- {
- Dictionary<string, string> dictionary = new Dictionary<string, string>();
-
- string[] lines = csvFile.text.Split(lineSeperator);
-
- int attributeIndex = -1;
-
- string[] headers = lines[0].Split(fieldSeperator, StringSplitOptions.None);
-
- for(int i=0; i<headers.Length; i++)
- {
- if(headers[i].Contains(attributeID))
- {
- attributeIndex = i;
- break;
- }
- }
-
- Regex CSVParser = new Regex(",(?=(?:[^\"]*\"[^\"]*\")*(?![^\"]*\"))");
-
- for(int i=1; i<lines.Length; i++)
- {
- string line = lines[i];
-
- string[] fields = CSVParser.Split(line);
-
- for(int f=0; f<fields.Length; f++)
- {
- fields[f] = fields[f].TrimStart(' ', surrond);
- fields[f] = fields[f].TrimEnd(surrond);
- }
-
- if(fields.Length > attributeIndex)
- {
- var key = fields[0];
-
- if (dictionary.ContainsKey(key)) { continue; }
-
- var value = fields[attributeIndex];
-
- dictionary.Add(key, value);
- }
- }
-
- return dictionary;
- }
-
-}
diff --git a/Assets/Scripts/Localisation/CSVLoader.cs.meta b/Assets/Scripts/Localisation/CSVLoader.cs.meta
deleted file mode 100644
index f8da045..0000000
--- a/Assets/Scripts/Localisation/CSVLoader.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 61806182744136d43ac66686d8fd4a8c
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/Localisation/LocalisationSystem.cs b/Assets/Scripts/Localisation/LocalisationSystem.cs
deleted file mode 100644
index 3d48244..0000000
--- a/Assets/Scripts/Localisation/LocalisationSystem.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class LocalisationSystem
-{
- public enum Language
- {
- English,
- French
- }
-
- public static Language language = Language.English;
-
- private static Dictionary<string, string> localisedEN;
- private static Dictionary<string, string> localisedFR;
-
- public static bool isInit;
-
- public static void Init()
- {
- Debug.Log("Initalizing the localisation system...");
- CSVLoader csvLoader = new CSVLoader();
- csvLoader.LoadCSV();
-
- localisedEN = csvLoader.GetDictionaryValues("en");
- localisedFR = csvLoader.GetDictionaryValues("fr");
-
- isInit = true;
- Debug.Log("Loaded the values for the localisation system.");
- }
-
- public static string GetLocalisedValue(string key)
- {
- if (!isInit) { Init(); }
-
- string value = key;
-
- switch (language)
- {
- case Language.English:
- localisedEN.TryGetValue(key, out value);
- break;
- case Language.French:
- localisedFR.TryGetValue(key, out value);
- break;
-
- }
-
- return value;
- }
-
-}
diff --git a/Assets/Scripts/Localisation/LocalisationSystem.cs.meta b/Assets/Scripts/Localisation/LocalisationSystem.cs.meta
deleted file mode 100644
index 59e4525..0000000
--- a/Assets/Scripts/Localisation/LocalisationSystem.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a3891ee2e9bce604eb56fc66b0ee96ac
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/Localisation/TextLocaliserUI.cs b/Assets/Scripts/Localisation/TextLocaliserUI.cs
deleted file mode 100644
index a56afb0..0000000
--- a/Assets/Scripts/Localisation/TextLocaliserUI.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using TMPro;
-using UnityEngine;
-
-[RequireComponent(typeof(TextMeshProUGUI))]
-public class TextLocaliserUI : MonoBehaviour
-{
- TextMeshProUGUI textField;
-
- public string key;
-
- // Start is called before the first frame update
- void Start()
- {
- textField = GetComponent<TextMeshProUGUI>();
- string value = LocalisationSystem.GetLocalisedValue(key);
- textField.text = value;
- }
-
-}
diff --git a/Assets/Scripts/Localisation/TextLocaliserUI.cs.meta b/Assets/Scripts/Localisation/TextLocaliserUI.cs.meta
deleted file mode 100644
index 93e3094..0000000
--- a/Assets/Scripts/Localisation/TextLocaliserUI.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7c6a2fc696577634c999293f25c45550
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs
index aa6dd13..8f02b5b 100644
--- a/Assets/Scripts/Player/PlayerMovement.cs
+++ b/Assets/Scripts/Player/PlayerMovement.cs
@@ -1,20 +1,10 @@
/*******************************************************************************
*
-* Project SimLife: A Sims clone written in Unity C#
-* Copyright (C) 2019 AleeCorp + Software Elevated
+* Unicity (Project SimLife): A Sims clone written in Unity C#
+* Copyright (C) 2019 Unicity Development Team
*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <https://www.gnu.org/licenses/>.
+* This software is protected by the copyright and licensing rights held
+* by the Unicity Development Team. (2019)
*
*********************************************************************************/
using UnityEngine;
diff --git a/Assets/Scripts/Player/PlayerStats.cs b/Assets/Scripts/Player/PlayerStats.cs
index a6020b8..21e0e40 100644
--- a/Assets/Scripts/Player/PlayerStats.cs
+++ b/Assets/Scripts/Player/PlayerStats.cs
@@ -1,20 +1,10 @@
/*******************************************************************************
*
-* Project SimLife: A Sims clone written in Unity C#
-* Copyright (C) 2019 AleeCorp + Software Elevated
+* Unicity (Project SimLife): A Sims clone written in Unity C#
+* Copyright (C) 2019 Unicity Development Team
*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <https://www.gnu.org/licenses/>.
+* This software is protected by the copyright and licensing rights held
+* by the Unicity Development Team. (2019)
*
*********************************************************************************/
using System.Collections;
diff --git a/Assets/Scripts/UI/ExitApplication.cs b/Assets/Scripts/UI/ExitApplication.cs
index 475aae7..b1579a1 100644
--- a/Assets/Scripts/UI/ExitApplication.cs
+++ b/Assets/Scripts/UI/ExitApplication.cs
@@ -1,20 +1,10 @@
/*******************************************************************************
*
-* Project SimLife: A Sims clone written in Unity C#
-* Copyright (C) 2019 AleeCorp + Software Elevated
+* Unicity (Project SimLife): A Sims clone written in Unity C#
+* Copyright (C) 2019 Unicity Development Team
*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <https://www.gnu.org/licenses/>.
+* This software is protected by the copyright and licensing rights held
+* by the Unicity Development Team. (2019)
*
*********************************************************************************/
using System.Collections;
diff --git a/Assets/Scripts/UI/LoadScene.cs b/Assets/Scripts/UI/LoadScene.cs
index 95b7278..3fbb91e 100644
--- a/Assets/Scripts/UI/LoadScene.cs
+++ b/Assets/Scripts/UI/LoadScene.cs
@@ -1,20 +1,10 @@
/*******************************************************************************
*
-* Project SimLife: A Sims clone written in Unity C#
-* Copyright (C) 2019 AleeCorp + Software Elevated
+* Unicity (Project SimLife): A Sims clone written in Unity C#
+* Copyright (C) 2019 Unicity Development Team
*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <https://www.gnu.org/licenses/>.
+* This software is protected by the copyright and licensing rights held
+* by the Unicity Development Team. (2019)
*
*********************************************************************************/
using System.Collections;