updated unity to 2020.1.14f

This commit is contained in:
Anthony Berg 2020-11-23 23:27:23 +00:00
parent 6793b33533
commit 3dc4f9d48d
8 changed files with 992 additions and 27 deletions

View File

@ -2060,7 +2060,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0} m_FirstSelected: {fileID: 1444966873}
m_sendNavigationEvents: 1 m_sendNavigationEvents: 1
m_DragThreshold: 10 m_DragThreshold: 10
--- !u!4 &765233206 --- !u!4 &765233206
@ -3878,9 +3878,9 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Navigation: m_Navigation:
m_Mode: 3 m_Mode: -1
m_SelectOnUp: {fileID: 0} m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0} m_SelectOnDown: {fileID: 1616246420}
m_SelectOnLeft: {fileID: 0} m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0} m_SelectOnRight: {fileID: 0}
m_Transition: 1 m_Transition: 1
@ -5933,11 +5933,11 @@ RectTransform:
m_Father: {fileID: 1922023088} m_Father: {fileID: 1922023088}
m_RootOrder: 7 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 227, y: 161.7} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -454, y: 66.54178} m_SizeDelta: {x: 0, y: 66.54178}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1922298509 --- !u!114 &1922298509
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5992,7 +5992,7 @@ MonoBehaviour:
m_fontSizeMin: 18 m_fontSizeMin: 18
m_fontSizeMax: 72 m_fontSizeMax: 72
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 1 m_HorizontalAlignment: 2
m_VerticalAlignment: 256 m_VerticalAlignment: 256
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 0 m_characterSpacing: 0

File diff suppressed because it is too large Load Diff

View File

@ -31,11 +31,15 @@ public class LeaderboardHandler : MonoBehaviour
private void ParseLeaderboardInformation() private void ParseLeaderboardInformation()
{ {
Debug.Log("running");
string parsedString = ""; string parsedString = "";
for (int i = 0; i < players.Count; i++) for (int i = 0; i < players.Count; i++)
{ {
if (players[i].user_plays == 1) //This removes the plural in how many times the player has played the game.
{
parsedString += $"{i+1}. {players[i].user_username} played {players[i].user_plays} time\n";
break;
}
parsedString += $"{i+1}. {players[i].user_username} played {players[i].user_plays} times\n"; parsedString += $"{i+1}. {players[i].user_username} played {players[i].user_plays} times\n";
} }

View File

@ -56,7 +56,7 @@ Material:
- _WeightNormal: 0 - _WeightNormal: 0
m_Colors: m_Colors:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _FaceColor: {r: 0, g: 0, b: 0, a: 1}
- _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -12,6 +12,14 @@ CREATE TABLE properties (
property_hotel int(4) #How much it costs with a hotel property_hotel int(4) #How much it costs with a hotel
); );
CREATE TABLE cards (
card_id int(11) AUTO_INCREMENT PRIMARY KEY NOT NULL,
card_group int(1) NOT NULL,
card_text TEXT,
card_function int(11) NOT NULL,
extra int(11)
);
CREATE TABLE users ( CREATE TABLE users (
user_id int(11) AUTO_INCREMENT PRIMARY KEY NOT NULL, #This is a uniquie ID for the user user_id int(11) AUTO_INCREMENT PRIMARY KEY NOT NULL, #This is a uniquie ID for the user
user_uid TINYTEXT NOT NULL, #This is the username for the user user_uid TINYTEXT NOT NULL, #This is the username for the user
@ -20,15 +28,14 @@ CREATE TABLE users (
); );
CREATE TABLE password ( CREATE TABLE password (
pwd_id int(11) PRIMARY KEY AUTO_INCREMENT NOT NULL, #This is a unique identifier user_id int(11) PRIMARY KEY NOT NULL, #The unique identifier and email used to change the password
user_id int(11) NOT NULL, #The email used to change the password for
pwd_selector TEXT NOT NULL, #Where the selector is stored in plaintext pwd_selector TEXT NOT NULL, #Where the selector is stored in plaintext
pwd_token LONGTEXT NOT NULL, #Where the hashed token is stored pwd_token LONGTEXT NOT NULL, #Where the hashed token is stored
pwd_expires TEXT NOT NULL #When the token expires pwd_expires INT NOT NULL, #When the token expires
FOREIGN KEY (user_id) REFERENCES users(user_id) #This links the user_id to the users table FOREIGN KEY (user_id) REFERENCES users(user_id) #This links the user_id to the users table
); );
CREATE TABLE plays( CREATE TABLE plays (
user_id int(11) PRIMARY KEY NOT NULL, #This is the unique player user_id int(11) PRIMARY KEY NOT NULL, #This is the unique player
user_plays int(11) NOT NULL, #This is how many times the player has played the game user_plays int(11) NOT NULL, #This is how many times the player has played the game
FOREIGN KEY (user_id) REFERENCES users(user_id) #This links the user_id to the users table FOREIGN KEY (user_id) REFERENCES users(user_id) #This links the user_id to the users table

View File

@ -2,9 +2,9 @@
"dependencies": { "dependencies": {
"com.unity.collab-proxy": "1.3.9", "com.unity.collab-proxy": "1.3.9",
"com.unity.ide.rider": "1.2.1", "com.unity.ide.rider": "1.2.1",
"com.unity.ide.visualstudio": "2.0.2", "com.unity.ide.visualstudio": "2.0.3",
"com.unity.ide.vscode": "1.2.1", "com.unity.ide.vscode": "1.2.3",
"com.unity.test-framework": "1.1.16", "com.unity.test-framework": "1.1.18",
"com.unity.textmeshpro": "3.0.1", "com.unity.textmeshpro": "3.0.1",
"com.unity.timeline": "1.3.4", "com.unity.timeline": "1.3.4",
"com.unity.ugui": "1.0.0", "com.unity.ugui": "1.0.0",

View File

@ -24,21 +24,21 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.ide.visualstudio": { "com.unity.ide.visualstudio": {
"version": "2.0.2", "version": "2.0.3",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.ide.vscode": { "com.unity.ide.vscode": {
"version": "1.2.1", "version": "1.2.3",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.test-framework": { "com.unity.test-framework": {
"version": "1.1.16", "version": "1.1.18",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {

View File

@ -1,2 +1,2 @@
m_EditorVersion: 2020.1.6f1 m_EditorVersion: 2020.1.14f1
m_EditorVersionWithRevision: 2020.1.6f1 (fc477ca6df10) m_EditorVersionWithRevision: 2020.1.14f1 (d81f64f5201d)