jonas/flufflparty-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Layout2 Fix

Browse Source
This commit is contained in:
brausjonas
2023-02-20 21:11:11 +01:00
parent 02e344c4a1
commit 12c8843fed
5 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
+1 -15
View File
@@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f0abe486-ee58-49bd-ad63-04a8b3fc78ec" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/MotleyForcesRegular-w1rZ3 SDF 1.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/MotleyForcesRegular-w1rZ3 SDF 1.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/MotleyForcesRegular-w1rZ3 SDF 2.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/MotleyForcesRegular-w1rZ3 SDF 2.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/ItemShop.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/ItemShop.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Start.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Start.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Start/StartHandler.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Start/StartHandler.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Packages/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/manifest.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectVersion.txt" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectVersion.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/UserSettings/EditorUserSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/UserSettings/EditorUserSettings.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/UserSettings/Layouts/default-2021.dwlt" beforeDir="false" afterPath="$PROJECT_DIR$/UserSettings/Layouts/default-2021.dwlt" afterDir="false" />
</list>
<list default="true" id="f0abe486-ee58-49bd-ad63-04a8b3fc78ec" name="Changes" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
FlufflParty/Assets/Scenes/WesternMap.unity
+1
View File
@@ -431,6 +431,7 @@ MonoBehaviour:
- {fileID: 783643749}
- {fileID: 1624290087}
- {fileID: 1068960911}
layout2: {fileID: 1115580907}
--- !u!114 &47812149
MonoBehaviour:
m_ObjectHideFlags: 0
FlufflParty/Assets/Scripts/Client.cs
+2
View File
@@ -25,6 +25,7 @@ public class Client : MonoBehaviour
[SerializeField] private TMP_Text[] playerNameTexts;
[SerializeField] private GameObject[] playerInfo;
private PlayerInfoElements[] playerInfoElements = new PlayerInfoElements[4];
[SerializeField] private GameObject layout2;
private void Start()
{
@@ -114,6 +115,7 @@ public class Client : MonoBehaviour
players[job.data[1]].name = Encoding.ASCII.GetString(name).Replace(" ", "");
players[job.data[1]].index = job.data[1];
players[job.data[1]].textCoinsInfo = playerInfoElements[job.data[1]].textCoinInfo;
players[job.data[1]].Layout2 = layout2;
players[job.data[1]].Init();
playerNameTexts[job.data[1]].text = Encoding.ASCII.GetString(name).Replace(" ", "");
FlufflParty/Assets/Scripts/Players/Player.cs
+1 -2
View File
@@ -6,7 +6,7 @@ using UnityEngine;
public abstract class Player : MonoBehaviour
{
private GameObject Layout2;
public GameObject Layout2;
public string name = "";
public bool activated = false;
@@ -27,7 +27,6 @@ public abstract class Player : MonoBehaviour
private void Start()
{
animationHandler = GetComponentInChildren<AnimationHandler>();
Layout2 = GameObject.Find("Layout2");
}
//Aktiviert den Player
FlufflParty/Packages/packages-lock.json
+3 -3
View File
@@ -47,8 +47,8 @@
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.ide.visualstudio": "2.0.17",
"com.unity.ide.rider": "3.0.18",
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.rider": "3.0.16",
"com.unity.ide.vscode": "1.2.5",
"com.unity.editorcoroutines": "1.0.0",
"com.unity.performance.profile-analyzer": "1.1.1",
@@ -112,7 +112,7 @@
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.7.0",
"version": "1.6.0",
"depth": 1,
"source": "registry",
"dependencies": {