bidde sehr
This commit is contained in:
+24
-16
@@ -1,7 +1,14 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="f0abe486-ee58-49bd-ad63-04a8b3fc78ec" name="Changes" comment="" />
|
<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/Scripts/Client.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Client.cs" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" 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$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/UserSettings/EditorUserSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/UserSettings/EditorUserSettings.asset" afterDir="false" />
|
||||||
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
@@ -33,22 +40,22 @@
|
|||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
<option name="showLibraryContents" value="true" />
|
<option name="showLibraryContents" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">{
|
<component name="PropertiesComponent"><![CDATA[{
|
||||||
"keyToString": {
|
"keyToString": {
|
||||||
"Discover.Launch.Via.Unity": "true",
|
"Discover.Launch.Via.Unity": "true",
|
||||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
"WebServerToolWindowFactoryState": "false",
|
"WebServerToolWindowFactoryState": "false",
|
||||||
"vue.rearranger.settings.migration": "true"
|
"vue.rearranger.settings.migration": "true"
|
||||||
},
|
},
|
||||||
"keyToStringList": {
|
"keyToStringList": {
|
||||||
"rider.external.source.directories": [
|
"rider.external.source.directories": [
|
||||||
"C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache",
|
"C:\\Users\\afist\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache",
|
||||||
"C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache",
|
"C:\\Users\\afist\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache",
|
||||||
"C:\\Users\\braus\\AppData\\Local\\Symbols\\src"
|
"C:\\Users\\afist\\AppData\\Local\\Symbols\\src"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}</component>
|
}]]></component>
|
||||||
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
|
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
|
||||||
<configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
|
<configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
|
||||||
<option name="EXE_PATH" value="$USER_HOME$/OneDrive/Desktop/FlufflPartyBuild/FlufflParty.exe" />
|
<option name="EXE_PATH" value="$USER_HOME$/OneDrive/Desktop/FlufflPartyBuild/FlufflParty.exe" />
|
||||||
@@ -59,7 +66,7 @@
|
|||||||
<method v="2" />
|
<method v="2" />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration name="Start Unity" type="RunUnityExe" factoryName="Unity Executable">
|
<configuration name="Start Unity" type="RunUnityExe" factoryName="Unity Executable">
|
||||||
<option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2021.3.16f1\Editor\Unity.exe" />
|
<option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2021.3.17f1\Editor\Unity.exe" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="-projectPath F:\Projects\Unity\flufflparty\FlufflParty -debugCodeOptimization" />
|
<option name="PROGRAM_PARAMETERS" value="-projectPath F:\Projects\Unity\flufflparty\FlufflParty -debugCodeOptimization" />
|
||||||
<option name="WORKING_DIRECTORY" value="F:\Projects\Unity\flufflparty\FlufflParty" />
|
<option name="WORKING_DIRECTORY" value="F:\Projects\Unity\flufflparty\FlufflParty" />
|
||||||
<option name="PASS_PARENT_ENVS" value="1" />
|
<option name="PASS_PARENT_ENVS" value="1" />
|
||||||
@@ -67,7 +74,7 @@
|
|||||||
<method v="2" />
|
<method v="2" />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration name="UnitTests (batch mode)" type="RunUnityExe" factoryName="Unity Executable">
|
<configuration name="UnitTests (batch mode)" type="RunUnityExe" factoryName="Unity Executable">
|
||||||
<option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2021.3.16f1\Editor\Unity.exe" />
|
<option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2021.3.17f1\Editor\Unity.exe" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath F:\Projects\Unity\flufflparty\FlufflParty -testResults Logs/results.xml -testPlatform EditMode -debugCodeOptimization" />
|
<option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath F:\Projects\Unity\flufflparty\FlufflParty -testResults Logs/results.xml -testPlatform EditMode -debugCodeOptimization" />
|
||||||
<option name="WORKING_DIRECTORY" value="F:\Projects\Unity\flufflparty\FlufflParty" />
|
<option name="WORKING_DIRECTORY" value="F:\Projects\Unity\flufflparty\FlufflParty" />
|
||||||
<option name="PASS_PARENT_ENVS" value="1" />
|
<option name="PASS_PARENT_ENVS" value="1" />
|
||||||
@@ -130,6 +137,7 @@
|
|||||||
<workItem from="1676920253715" duration="2806000" />
|
<workItem from="1676920253715" duration="2806000" />
|
||||||
<workItem from="1677436455528" duration="8395000" />
|
<workItem from="1677436455528" duration="8395000" />
|
||||||
<workItem from="1677516389539" duration="4730000" />
|
<workItem from="1677516389539" duration="4730000" />
|
||||||
|
<workItem from="1677521614865" duration="735000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ using UnityEngine.SceneManagement;
|
|||||||
|
|
||||||
public class Client : MonoBehaviour
|
public class Client : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
[SerializeField] private TMP_Text textLeftMoves;
|
||||||
private TcpClient client;
|
private TcpClient client;
|
||||||
private Stream stream;
|
private Stream stream;
|
||||||
[SerializeField] private GameObject playerPrefab;
|
[SerializeField] private GameObject playerPrefab;
|
||||||
@@ -191,6 +192,7 @@ public class Client : MonoBehaviour
|
|||||||
players[job.data[1]].textCoinsInfo = playerInfoElements[job.data[1]].textCoinInfo;
|
players[job.data[1]].textCoinsInfo = playerInfoElements[job.data[1]].textCoinInfo;
|
||||||
players[job.data[1]].textStarsInfo = playerInfoElements[job.data[1]].textStarsInfo;
|
players[job.data[1]].textStarsInfo = playerInfoElements[job.data[1]].textStarsInfo;
|
||||||
players[job.data[1]].uiHandler = uiHandler;
|
players[job.data[1]].uiHandler = uiHandler;
|
||||||
|
players[job.data[1]].textLeftMoves = textLeftMoves;
|
||||||
players[job.data[1]].Init();
|
players[job.data[1]].Init();
|
||||||
|
|
||||||
playerNameTexts[job.data[1]].text = Encoding.ASCII.GetString(name).Replace(" ", "");
|
playerNameTexts[job.data[1]].text = Encoding.ASCII.GetString(name).Replace(" ", "");
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ public class PlayablePlayer : Player
|
|||||||
{
|
{
|
||||||
wurfelt = true;
|
wurfelt = true;
|
||||||
wurfelZahl = Random.Range(1, 7);
|
wurfelZahl = Random.Range(1, 7);
|
||||||
|
textLeftMoves.text = wurfelZahl + "";
|
||||||
|
|
||||||
client.SendWurfeln(wurfelZahl);
|
client.SendWurfeln(wurfelZahl);
|
||||||
|
|
||||||
@@ -91,6 +92,7 @@ public class PlayablePlayer : Player
|
|||||||
else if (wurfelZahl > 0)
|
else if (wurfelZahl > 0)
|
||||||
{
|
{
|
||||||
wurfelZahl--;
|
wurfelZahl--;
|
||||||
|
textLeftMoves.text = wurfelZahl + "";
|
||||||
|
|
||||||
//the next field is the current field XD
|
//the next field is the current field XD
|
||||||
currentField = nextField;
|
currentField = nextField;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ public abstract class Player : MonoBehaviour
|
|||||||
public int index;
|
public int index;
|
||||||
public int coins = 0;
|
public int coins = 0;
|
||||||
public int stars = 0;
|
public int stars = 0;
|
||||||
public TMP_Text textCoinsInfo, textStarsInfo;
|
public TMP_Text textCoinsInfo, textStarsInfo, textLeftMoves;
|
||||||
protected bool eventstop = false;
|
protected bool eventstop = false;
|
||||||
public UIHandler uiHandler;
|
public UIHandler uiHandler;
|
||||||
|
|
||||||
|
|||||||
@@ -47,8 +47,8 @@
|
|||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.ide.visualstudio": "2.0.16",
|
"com.unity.ide.visualstudio": "2.0.17",
|
||||||
"com.unity.ide.rider": "3.0.16",
|
"com.unity.ide.rider": "3.0.18",
|
||||||
"com.unity.ide.vscode": "1.2.5",
|
"com.unity.ide.vscode": "1.2.5",
|
||||||
"com.unity.editorcoroutines": "1.0.0",
|
"com.unity.editorcoroutines": "1.0.0",
|
||||||
"com.unity.performance.profile-analyzer": "1.1.1",
|
"com.unity.performance.profile-analyzer": "1.1.1",
|
||||||
@@ -112,7 +112,7 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.services.core": {
|
"com.unity.services.core": {
|
||||||
"version": "1.6.0",
|
"version": "1.7.0",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ EditorUserSettings:
|
|||||||
value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069
|
value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedSceneGuid-2:
|
RecentlyUsedSceneGuid-2:
|
||||||
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
|
value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedSceneGuid-3:
|
RecentlyUsedSceneGuid-3:
|
||||||
value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
|
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
|
||||||
flags: 0
|
flags: 0
|
||||||
UnityRemoteDevice:
|
UnityRemoteDevice:
|
||||||
value: 225f4d46245b0d4902070862342649191512
|
value: 225f4d46245b0d4902070862342649191512
|
||||||
|
|||||||
Reference in New Issue
Block a user