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

StarSystem

Browse Source 
Stars With switching positions
(Bought stars are not saved or shown)
This commit is contained in:
brausjonas
2023-02-26 22:26:58 +01:00
parent 63ed43576c
commit 94d05de754
20 changed files with 1215 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
+2 -1
View File
@@ -22,6 +22,7 @@
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Players/PlayerInfoElements.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Stars/LayoutBuyStarController.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Stars/StarController.cs" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="MarkdownSettingsMigration">
@@ -127,7 +128,7 @@
<workItem from="1675880900142" duration="5000" />
<workItem from="1676493059699" duration="795000" />
<workItem from="1676920253715" duration="2806000" />
<workItem from="1677436455528" duration="5473000" />
<workItem from="1677436455528" duration="8395000" />
</task>
<servers />
</component>
FlufflParty/Assets/MotleyForcesRegular-w1rZ3 SDF 1.asset
+79 -25
View File
File diff suppressed because one or more lines are too long
FlufflParty/Assets/MotleyForcesRegular-w1rZ3 SDF 2.asset
+199 -64
View File
File diff suppressed because one or more lines are too long
FlufflParty/Assets/Scenes/WesternMap.unity
+778 -37
View File
File diff suppressed because it is too large Load Diff
FlufflParty/Assets/Scripts/Client.cs
+9 -2
View File
@@ -115,7 +115,6 @@ 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]].uiHandler = uiHandler;
players[job.data[1]].Init();
@@ -133,6 +132,9 @@ public class Client : MonoBehaviour
case 7:
(players[job.data[1]]).EventStopFinished();
break;
case 8:
((NoPlayablePlayer)players[job.data[1]]).BuyStar();
break;
case 126:
stream.Write(new byte[]{126, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 10);
break;
@@ -204,8 +206,13 @@ public class Client : MonoBehaviour
stream.Write(new byte[]{6, (byte)action, 0, 0, 0, 0, 0, 0, 0, 0});
}
public void EventStopFinished()
public void SendEventStopFinished()
{
stream.Write(new byte[]{7, 0, 0, 0, 0, 0, 0, 0, 0, 0});
}
public void SendBuyStar()
{
stream.Write(new byte[]{8, 0, 0, 0, 0, 0, 0, 0, 0, 0});
}
}
FlufflParty/Assets/Scripts/ItemShop.cs
+1 -11
View File
@@ -7,15 +7,5 @@ public class ItemShop : MonoBehaviour
[SerializeField] private GameObject Layout2;
[SerializeField] private GameObject LayoutItemShop;
[SerializeField] private Client client;
public void buttonMoveOn()
{
Layout2.SetActive(false);
client.EventStopFinished();
}
public void buttonEnter()
{
Layout2.SetActive(false);
LayoutItemShop.SetActive(true);
}
}
FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
+25
View File
@@ -33,6 +33,12 @@ public class NoPlayablePlayer : Player
diceScript = dice.GetComponent<Dice>();
}
public void BuyStar()
{
GameObject.Find("StarPositions").GetComponent<StarController>().SwitchStar();
AddCoins(-20);
}
public void CoinFieldAction(int action)
{
if (action == 0)
@@ -153,4 +159,23 @@ public class NoPlayablePlayer : Player
}
}
private Star currentStar;
private void OnTriggerEnter(Collider collider)
{
if (collider.name.Equals("ItemShopTrigger"))
{
base.OnTriggerEnter(collider);
}
else if (collider.name.Equals("StarTrigger"))
{
currentStar = collider.GetComponent<Star>();
if(currentStar.IsActive)
{
base.OnTriggerEnter(collider);
}
}
}
}
FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+15 -4
View File
@@ -208,29 +208,40 @@ public class PlayablePlayer : Player
private Star currentStar = null;
private void OnTriggerEnter(Collider collider)
{
base.OnTriggerEnter(collider);
if (collider.name.Equals("ItemShopTrigger"))
{
Layout2.SetActive(true);
base.OnTriggerEnter(collider);
uiHandler.ActivateLayout2(this);
}
else if (collider.name.Equals("StarTrigger"))
{
currentStar = collider.GetComponent<Star>();
uiHandler.ActivateLayoutBuyStar(this);
if(currentStar.IsActive)
{
base.OnTriggerEnter(collider);
uiHandler.ActivateLayoutBuyStar(this);
}
}
}
public void BuyStar(bool buy)
{
client.SendEventStopFinished();
if (buy)
{
currentStar.Buy(this);
client.SendBuyStar();
}
else
{
currentStar = null;
}
}
public void SkipShop()
{
client.SendEventStopFinished();
}
}
FlufflParty/Assets/Scripts/Players/Player.cs
+1 -3
View File
@@ -6,8 +6,6 @@ using UnityEngine;
public abstract class Player : MonoBehaviour
{
public GameObject Layout2;
public string name = "";
public bool activated = false;
protected bool wurfelt = false;
@@ -55,7 +53,7 @@ public abstract class Player : MonoBehaviour
Coin
}
protected void AddCoins(int amount)
public void AddCoins(int amount)
{
coins += amount;
if (coins < 0)
FlufflParty/Assets/Scripts/Stars/LayoutBuyStarController.cs
+10
View File
@@ -0,0 +1,10 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
public class LayoutBuyStarController : MonoBehaviour
{
public TMP_Text infoText;
public GameObject buttonBuy, buttonNo;
}
FlufflParty/Assets/Scripts/Stars/LayoutBuyStarController.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: f33e28d2770e17c49ba9886d0a37602c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
FlufflParty/Assets/Scripts/Stars/Star.cs
+1 -1
View File
@@ -39,7 +39,7 @@ public class Star : MonoBehaviour
public void Buy(Player player)
{
player.coins -= cost;
player.AddCoins(-cost);
starController.SwitchStar();
}
}
FlufflParty/Assets/Scripts/UIHandler.cs
+54
View File
@@ -1,11 +1,13 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
public class UIHandler : MonoBehaviour
{
[SerializeField] private GameObject layout0;
[SerializeField] private GameObject layout1;
[SerializeField] private GameObject layout2;
[SerializeField] private GameObject layoutMiniMap;
[SerializeField] private GameObject layoutBuyStar;
@@ -17,6 +19,8 @@ public class UIHandler : MonoBehaviour
layout0.SetActive(true);
layoutMiniMap.SetActive(false);
layoutBuyStar.SetActive(false);
layout2.SetActive(false);
}
public void ActivateLayout1()
@@ -25,6 +29,7 @@ public class UIHandler : MonoBehaviour
layout1.SetActive(true);
layoutMiniMap.SetActive(false);
layoutBuyStar.SetActive(false);
layout2.SetActive(false);
}
public void ActivateLayoutMiniMap()
@@ -33,6 +38,7 @@ public class UIHandler : MonoBehaviour
layout1.SetActive(false);
layoutMiniMap.SetActive(true);
layoutBuyStar.SetActive(false);
layout2.SetActive(false);
}
public void ActivateLayoutBuyStar(Player player)
@@ -42,5 +48,53 @@ public class UIHandler : MonoBehaviour
layout1.SetActive(false);
layoutMiniMap.SetActive(false);
layoutBuyStar.SetActive(true);
layout2.SetActive(false);
LayoutBuyStarController controller = layoutBuyStar.GetComponent<LayoutBuyStarController>();
if (player.coins < 20)
{
controller.infoText.text = "oh... sorry... but you do not have enough coins (20)";
controller.buttonBuy.SetActive(false);
}
else
{
controller.infoText.text = "do you want to buy a star? (20 coins)";
controller.buttonBuy.SetActive(true);
}
}
public void ActivateLayout2(Player player)
{
currentPlayer = player;
layout0.SetActive(false);
layout1.SetActive(false);
layoutMiniMap.SetActive(false);
layoutBuyStar.SetActive(false);
layout2.SetActive(true);
}
public void ButtonBuyStar()
{
((PlayablePlayer)currentPlayer).BuyStar(true);
ActivateLayout1();
}
public void ButtonDontBuyStar()
{
((PlayablePlayer)currentPlayer).BuyStar(false);
ActivateLayout1();
}
public void ButtonMoveOn()
{
ActivateLayout1();
((PlayablePlayer)currentPlayer).SkipShop();
}
public void ButtonEnter()
{
}
}
FlufflParty/ProjectSettings/ProjectSettings.asset
+3 -1
View File
@@ -137,7 +137,9 @@ PlayerSettings:
16:9: 1
Others: 1
bundleVersion: 0.1
preloadedAssets: []
preloadedAssets:
- {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2}
- {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
FlufflParty/UserSettings/EditorUserSettings.asset
+2 -2
View File
@@ -12,10 +12,10 @@ EditorUserSettings:
value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069
flags: 0
RecentlyUsedSceneGuid-2:
value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
RecentlyUsedSceneGuid-3:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
flags: 0
UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512
Server/.idea/workspace.xml
Generated
+16 -15
View File
@@ -33,22 +33,22 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"last_opened_file_path": "C:/flufflparty/Server",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"project.structure.last.edited": "Artifacts",
"project.structure.proportion": "0.0",
"project.structure.side.proportion": "0.2",
"vue.rearranger.settings.migration": "true"
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/flufflparty/Server&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;project.structure.last.edited&quot;: &quot;Artifacts&quot;,
&quot;project.structure.proportion&quot;: &quot;0.0&quot;,
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}]]></component>
}</component>
<component name="RunManager">
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Main" />
@@ -86,6 +86,7 @@
<workItem from="1675628256814" duration="1286000" />
<workItem from="1675795807134" duration="411000" />
<workItem from="1676926021732" duration="612000" />
<workItem from="1677445028345" duration="816000" />
</task>
<servers />
</component>
Server/out/artifacts/Server_jar/Server.jar
BIN
View File
Binary file not shown.
Server/out/production/Server/Room$2.class
BIN
View File
Binary file not shown.
Server/out/production/Server/Room.class
BIN
View File
Binary file not shown.
Server/src/Room.java
+9
View File
@@ -174,6 +174,15 @@ public class Room
players[i].output.write(new byte[]{7, (byte)player, 0, 0, 0, 0, 0, 0, 0, 0});
}
break;
case 8:
for (int i = 0; i < players.length; i++)
{
if (i != player)
{
players[i].output.write(new byte[]{8, (byte)player, 0, 0, 0, 0, 0, 0, 0, 0});
}
}
break;
case 126:
players[player].lastTimeSendTimeOutCheck = System.currentTimeMillis();
break;