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 committed 2023-02-26 22:26:58 +01:00
1 parent 63ed43576c
commit 94d05de754
20 files changed
+1215 -166
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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/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/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/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" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/Stars/StarController.cs" root0="FORCE_HIGHLIGHTING" />
</component> </component>
<component name="MarkdownSettingsMigration"> <component name="MarkdownSettingsMigration">
@@ -127,7 +128,7 @@
<workItem from="1675880900142" duration="5000" /> <workItem from="1675880900142" duration="5000" />
<workItem from="1676493059699" duration="795000" /> <workItem from="1676493059699" duration="795000" />
<workItem from="1676920253715" duration="2806000" /> <workItem from="1676920253715" duration="2806000" />
<workItem from="1677436455528" duration="5473000" /> <workItem from="1677436455528" duration="8395000" />
</task> </task>
<servers /> <servers />
</component> </component>
FlufflParty/Assets/MotleyForcesRegular-w1rZ3 SDF 1.asset
+79 -25
View File
@@ -146,7 +146,7 @@ Texture2D:
m_ColorSpace: 0 m_ColorSpace: 0
m_PlatformBlob: m_PlatformBlob:
image data: 1048576 image data: 1048576
_typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060a0b101314130f0a090400000000000000000000000000000000000000000000000000000000000000070b0c101417191a1b1b1a191714100d0b07000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001080c0e14191a1b19140c0b0700000000000000000000000000000000000000000000000000000000000000000000000000000207090c1013151718191919191815130f0b090500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060f171c1e23252625211c1b150d040000000000000000000000000000000000000000000000000000050910181d1e2326292b2c2d2d2c2b2926231f1d18100a06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000311191e20272b2d2d2b261f1d18100300000000000000000000000000000000000000000000000000000000000000000004090a13191b1f222527292a2b2b2c2b2a2825211d1b160e09050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000Line truncated _typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060a0b101314130f0a090400000000000000000000000000000000000000000000000000000000000000070b0c101417191a1b1b1a191714100d0b07000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001080c0e14191a1b19140c0b0700000000000000000000000000000000000000000000000000000000000000000000000000000207090c1013151718191919191815130f0b090500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004070909080704010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060f171c1e23252625211c1b150d040000000000000000000000000000000000000000000000000000050910181d1e2326292b2c2d2d2c2b2926231f1d18100a06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000311191e20272b2d2d2b261f1d18100300000000000000000000000000000000000000000000000000000000000000000004090a13191b1f222527292a2b2b2c2b2a2825211d1b160e09050000000000000000000000000000000000000000000000000000000000000000000000000000060a0c12171a1b1b1a1917140f0a09050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000Line truncated
m_StreamData: m_StreamData:
serializedVersion: 2 serializedVersion: 2
offset: 0 offset: 0
@@ -1125,6 +1125,36 @@ MonoBehaviour:
m_Scale: 1 m_Scale: 1
m_AtlasIndex: 0 m_AtlasIndex: 0
m_ClassDefinitionType: 0 m_ClassDefinitionType: 0
- m_Index: 11
m_Metrics:
m_Width: 34.828125
m_Height: 77.578125
m_HorizontalBearingX: 4.59375
m_HorizontalBearingY: 70.921875
m_HorizontalAdvance: 38.4375
m_GlyphRect:
m_X: 188
m_Y: 86
m_Width: 36
m_Height: 78
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 12
m_Metrics:
m_Width: 34.828125
m_Height: 77.578125
m_HorizontalBearingX: 0.359375
m_HorizontalBearingY: 70.5625
m_HorizontalAdvance: 38.15625
m_GlyphRect:
m_X: 237
m_Y: 7
m_Width: 36
m_Height: 79
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
m_CharacterTable: m_CharacterTable:
- m_ElementType: 1 - m_ElementType: 1
m_Unicode: 32 m_Unicode: 32
@@ -1374,6 +1404,14 @@ MonoBehaviour:
m_Unicode: 77 m_Unicode: 77
m_GlyphIndex: 48 m_GlyphIndex: 48
m_Scale: 1 m_Scale: 1
- m_ElementType: 1
m_Unicode: 40
m_GlyphIndex: 11
m_Scale: 1
- m_ElementType: 1
m_Unicode: 41
m_GlyphIndex: 12
m_Scale: 1
m_AtlasTextures: m_AtlasTextures:
- {fileID: -525267011981432032} - {fileID: -525267011981432032}
m_AtlasTextureIndex: 0 m_AtlasTextureIndex: 0
@@ -1624,6 +1662,14 @@ MonoBehaviour:
m_Y: 906 m_Y: 906
m_Width: 72 m_Width: 72
m_Height: 78 m_Height: 78
- m_X: 181
m_Y: 79
m_Width: 49
m_Height: 91
- m_X: 230
m_Y: 0
m_Width: 49
m_Height: 92
m_FreeGlyphRects: m_FreeGlyphRects:
- m_X: 32 - m_X: 32
m_Y: 78 m_Y: 78
@@ -1653,10 +1699,6 @@ MonoBehaviour:
m_Y: 0 m_Y: 0
m_Width: 2 m_Width: 2
m_Height: 77 m_Height: 77
- m_X: 157
m_Y: 79
m_Width: 866
m_Height: 76
- m_X: 60 - m_X: 60
m_Y: 899 m_Y: 899
m_Width: 2 m_Width: 2
@@ -1729,18 +1771,6 @@ MonoBehaviour:
m_Y: 739 m_Y: 739
m_Width: 59 m_Width: 59
m_Height: 8 m_Height: 8
- m_X: 181
m_Y: 79
m_Width: 842
m_Height: 154
- m_X: 217
m_Y: 0
m_Width: 806
m_Height: 233
- m_X: 238
m_Y: 0
m_Width: 785
m_Height: 310
- m_X: 124 - m_X: 124
m_Y: 896 m_Y: 896
m_Width: 55 m_Width: 55
@@ -1785,18 +1815,10 @@ MonoBehaviour:
m_Y: 387 m_Y: 387
m_Width: 23 m_Width: 23
m_Height: 2 m_Height: 2
- m_X: 243
m_Y: 0
m_Width: 780
m_Height: 387
- m_X: 241 - m_X: 241
m_Y: 999 m_Y: 999
m_Width: 782 m_Width: 782
m_Height: 24 m_Height: 24
- m_X: 270
m_Y: 0
m_Width: 753
m_Height: 466
- m_X: 207 - m_X: 207
m_Y: 466 m_Y: 466
m_Width: 38 m_Width: 38
@@ -1853,6 +1875,38 @@ MonoBehaviour:
m_Y: 0 m_Y: 0
m_Width: 645 m_Width: 645
m_Height: 1023 m_Height: 1023
- m_X: 157
m_Y: 79
m_Width: 24
m_Height: 76
- m_X: 181
m_Y: 170
m_Width: 842
m_Height: 63
- m_X: 238
m_Y: 92
m_Width: 785
m_Height: 218
- m_X: 243
m_Y: 92
m_Width: 780
m_Height: 295
- m_X: 270
m_Y: 92
m_Width: 753
m_Height: 374
- m_X: 279
m_Y: 0
m_Width: 744
m_Height: 466
- m_X: 217
m_Y: 0
m_Width: 13
m_Height: 79
- m_X: 230
m_Y: 92
m_Width: 793
m_Height: 141
m_fontInfo: m_fontInfo:
Name: Name:
PointSize: 0 PointSize: 0
FlufflParty/Assets/MotleyForcesRegular-w1rZ3 SDF 2.asset
+199 -64
View File
@@ -146,7 +146,7 @@ Texture2D:
m_ColorSpace: 0 m_ColorSpace: 0
m_PlatformBlob: m_PlatformBlob:
image data: 1048576 image data: 1048576
_typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060a0b101314130f0a090400000000000000000000000000000000000000000000000000000000000000070b0c101417191a1b1b1a191714100d0b07000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001080c0e14191a1b19140c0b0700000000000000000000000000000000000000000000000000000000000000000000000000000207090c1013151718191919191815130f0b090500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060f171c1e23252625211c1b150d040000000000000000000000000000000000000000000000000000050910181d1e2326292b2c2d2d2c2b2926231f1d18100a06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000311191e20272b2d2d2b261f1d18100300000000000000000000000000000000000000000000000000000000000000000004090a13191b1f222527292a2b2b2c2b2a2825211d1b160e09050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000Line truncated _typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060a0b101314130f0a090400000000000000000000000000000000000000000000000000000000000000070b0c101417191a1b1b1a191714100d0b07000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001080c0e14191a1b19140c0b0700000000000000000000000000000000000000000000000000000000000000000000000000000207090c1013151718191919191815130f0b090500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060f171c1e23252625211c1b150d040000000000000000000000000000000000000000000000000000050910181d1e2326292b2c2d2d2c2b2926231f1d18100a06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000311191e20272b2d2d2b261f1d18100300000000000000000000000000000000000000000000000000000000000000000004090a13191b1f222527292a2b2b2c2b2a2825211d1b160e09050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000Line truncated
m_StreamData: m_StreamData:
serializedVersion: 2 serializedVersion: 2
offset: 0 offset: 0
@@ -450,6 +450,21 @@ MonoBehaviour:
m_Scale: 1 m_Scale: 1
m_AtlasIndex: 0 m_AtlasIndex: 0
m_ClassDefinitionType: 0 m_ClassDefinitionType: 0
- m_Index: 34
m_Metrics:
m_Width: 42.296875
m_Height: 66.046875
m_HorizontalBearingX: 1.265625
m_HorizontalBearingY: 64.34375
m_HorizontalAdvance: 44.640625
m_GlyphRect:
m_X: 319
m_Y: 745
m_Width: 43
m_Height: 67
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 36 - m_Index: 36
m_Metrics: m_Metrics:
m_Width: 48.421875 m_Width: 48.421875
@@ -495,6 +510,21 @@ MonoBehaviour:
m_Scale: 1 m_Scale: 1
m_AtlasIndex: 0 m_AtlasIndex: 0
m_ClassDefinitionType: 0 m_ClassDefinitionType: 0
- m_Index: 39
m_Metrics:
m_Width: 46.25
m_Height: 64.625
m_HorizontalBearingX: 2.4375
m_HorizontalBearingY: 64.625
m_HorizontalAdvance: 50.84375
m_GlyphRect:
m_X: 252
m_Y: 473
m_Width: 47
m_Height: 65
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 40 - m_Index: 40
m_Metrics: m_Metrics:
m_Width: 41.140625 m_Width: 41.140625
@@ -510,6 +540,21 @@ MonoBehaviour:
m_Scale: 1 m_Scale: 1
m_AtlasIndex: 0 m_AtlasIndex: 0
m_ClassDefinitionType: 0 m_ClassDefinitionType: 0
- m_Index: 44
m_Metrics:
m_Width: 31.765625
m_Height: 63.90625
m_HorizontalBearingX: 1.078125
m_HorizontalBearingY: 63.90625
m_HorizontalAdvance: 34.203125
m_GlyphRect:
m_X: 285
m_Y: 551
m_Width: 32
m_Height: 64
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 45 - m_Index: 45
m_Metrics: m_Metrics:
m_Width: 40.5 m_Width: 40.5
@@ -1050,48 +1095,78 @@ MonoBehaviour:
m_Scale: 1 m_Scale: 1
m_AtlasIndex: 0 m_AtlasIndex: 0
m_ClassDefinitionType: 0 m_ClassDefinitionType: 0
- m_Index: 39 - m_Index: 56
m_Metrics: m_Metrics:
m_Width: 46.25 m_Width: 47.96875
m_Height: 64.625 m_Height: 64.359375
m_HorizontalBearingX: 2.4375 m_HorizontalBearingX: 2.25
m_HorizontalBearingY: 64.625 m_HorizontalBearingY: 63.90625
m_HorizontalAdvance: 50.84375 m_HorizontalAdvance: 52.46875
m_GlyphRect: m_GlyphRect:
m_X: 252 m_X: 248
m_Y: 473 m_Y: 913
m_Width: 47 m_Width: 49
m_Height: 65 m_Height: 65
m_Scale: 1 m_Scale: 1
m_AtlasIndex: 0 m_AtlasIndex: 0
m_ClassDefinitionType: 0 m_ClassDefinitionType: 0
- m_Index: 44 - m_Index: 187
m_Metrics: m_Metrics:
m_Width: 31.765625 m_Width: 48.234375
m_Height: 63.90625 m_Height: 80.640625
m_HorizontalBearingX: 1.078125 m_HorizontalBearingX: 2.34375
m_HorizontalBearingY: 63.90625 m_HorizontalBearingY: 78.390625
m_HorizontalAdvance: 34.203125 m_HorizontalAdvance: 53.09375
m_GlyphRect: m_GlyphRect:
m_X: 285 m_X: 310
m_Y: 551 m_Y: 913
m_Width: 32 m_Width: 49
m_Height: 64 m_Height: 82
m_Scale: 1 m_Scale: 1
m_AtlasIndex: 0 m_AtlasIndex: 0
m_ClassDefinitionType: 0 m_ClassDefinitionType: 0
- m_Index: 34 - m_Index: 93
m_Metrics: m_Metrics:
m_Width: 42.296875 m_Width: 51.125
m_Height: 66.046875 m_Height: 63.8125
m_HorizontalBearingX: 1.265625 m_HorizontalBearingX: 1.34375
m_HorizontalBearingY: 64.34375 m_HorizontalBearingY: 63.359375
m_HorizontalAdvance: 44.640625 m_HorizontalAdvance: 53.8125
m_GlyphRect: m_GlyphRect:
m_X: 319 m_X: 327
m_Y: 745 m_Y: 825
m_Width: 43 m_Width: 52
m_Height: 67 m_Height: 65
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 11
m_Metrics:
m_Width: 34.828125
m_Height: 77.578125
m_HorizontalBearingX: 4.59375
m_HorizontalBearingY: 70.921875
m_HorizontalAdvance: 38.4375
m_GlyphRect:
m_X: 372
m_Y: 903
m_Width: 36
m_Height: 78
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 12
m_Metrics:
m_Width: 34.828125
m_Height: 77.578125
m_HorizontalBearingX: 0.359375
m_HorizontalBearingY: 70.5625
m_HorizontalAdvance: 38.15625
m_GlyphRect:
m_X: 188
m_Y: 86
m_Width: 36
m_Height: 79
m_Scale: 1 m_Scale: 1
m_AtlasIndex: 0 m_AtlasIndex: 0
m_ClassDefinitionType: 0 m_ClassDefinitionType: 0
@@ -1164,6 +1239,10 @@ MonoBehaviour:
m_Unicode: 62 m_Unicode: 62
m_GlyphIndex: 33 m_GlyphIndex: 33
m_Scale: 1 m_Scale: 1
- m_ElementType: 1
m_Unicode: 63
m_GlyphIndex: 34
m_Scale: 1
- m_ElementType: 1 - m_ElementType: 1
m_Unicode: 65 m_Unicode: 65
m_GlyphIndex: 36 m_GlyphIndex: 36
@@ -1176,10 +1255,18 @@ MonoBehaviour:
m_Unicode: 67 m_Unicode: 67
m_GlyphIndex: 38 m_GlyphIndex: 38
m_Scale: 1 m_Scale: 1
- m_ElementType: 1
m_Unicode: 68
m_GlyphIndex: 39
m_Scale: 1
- m_ElementType: 1 - m_ElementType: 1
m_Unicode: 69 m_Unicode: 69
m_GlyphIndex: 40 m_GlyphIndex: 40
m_Scale: 1 m_Scale: 1
- m_ElementType: 1
m_Unicode: 73
m_GlyphIndex: 44
m_Scale: 1
- m_ElementType: 1 - m_ElementType: 1
m_Unicode: 74 m_Unicode: 74
m_GlyphIndex: 45 m_GlyphIndex: 45
@@ -1325,16 +1412,24 @@ MonoBehaviour:
m_GlyphIndex: 224 m_GlyphIndex: 224
m_Scale: 1 m_Scale: 1
- m_ElementType: 1 - m_ElementType: 1
m_Unicode: 68 m_Unicode: 85
m_GlyphIndex: 39 m_GlyphIndex: 56
m_Scale: 1 m_Scale: 1
- m_ElementType: 1 - m_ElementType: 1
m_Unicode: 73 m_Unicode: 252
m_GlyphIndex: 44 m_GlyphIndex: 187
m_Scale: 1 m_Scale: 1
- m_ElementType: 1 - m_ElementType: 1
m_Unicode: 63 m_Unicode: 122
m_GlyphIndex: 34 m_GlyphIndex: 93
m_Scale: 1
- m_ElementType: 1
m_Unicode: 40
m_GlyphIndex: 11
m_Scale: 1
- m_ElementType: 1
m_Unicode: 41
m_GlyphIndex: 12
m_Scale: 1 m_Scale: 1
m_AtlasTextures: m_AtlasTextures:
- {fileID: -525267011981432032} - {fileID: -525267011981432032}
@@ -1578,6 +1673,26 @@ MonoBehaviour:
m_Y: 738 m_Y: 738
m_Width: 56 m_Width: 56
m_Height: 80 m_Height: 80
- m_X: 241
m_Y: 906
m_Width: 62
m_Height: 78
- m_X: 303
m_Y: 906
m_Width: 62
m_Height: 95
- m_X: 320
m_Y: 818
m_Width: 65
m_Height: 78
- m_X: 365
m_Y: 896
m_Width: 49
m_Height: 91
- m_X: 181
m_Y: 79
m_Width: 49
m_Height: 92
m_FreeGlyphRects: m_FreeGlyphRects:
- m_X: 32 - m_X: 32
m_Y: 78 m_Y: 78
@@ -1607,10 +1722,6 @@ MonoBehaviour:
m_Y: 0 m_Y: 0
m_Width: 2 m_Width: 2
m_Height: 77 m_Height: 77
- m_X: 157
m_Y: 79
m_Width: 866
m_Height: 76
- m_X: 60 - m_X: 60
m_Y: 899 m_Y: 899
m_Width: 2 m_Width: 2
@@ -1679,22 +1790,10 @@ MonoBehaviour:
m_Y: 827 m_Y: 827
m_Width: 58 m_Width: 58
m_Height: 16 m_Height: 16
- m_X: 241
m_Y: 906
m_Width: 782
m_Height: 117
- m_X: 186 - m_X: 186
m_Y: 739 m_Y: 739
m_Width: 59 m_Width: 59
m_Height: 8 m_Height: 8
- m_X: 181
m_Y: 79
m_Width: 842
m_Height: 154
- m_X: 217
m_Y: 0
m_Width: 806
m_Height: 233
- m_X: 238 - m_X: 238
m_Y: 0 m_Y: 0
m_Width: 785 m_Width: 785
@@ -1775,30 +1874,66 @@ MonoBehaviour:
m_Y: 544 m_Y: 544
m_Width: 33 m_Width: 33
m_Height: 3 m_Height: 3
- m_X: 245
m_Y: 818
m_Width: 778
m_Height: 9
- m_X: 245 - m_X: 245
m_Y: 817 m_Y: 817
m_Width: 67 m_Width: 67
m_Height: 10 m_Height: 10
- m_X: 320
m_Y: 818
m_Width: 703
m_Height: 205
- m_X: 331 - m_X: 331
m_Y: 0 m_Y: 0
m_Width: 692 m_Width: 692
m_Height: 738 m_Height: 738
- m_X: 368
m_Y: 0
m_Width: 655
m_Height: 1023
- m_X: 270 - m_X: 270
m_Y: 738 m_Y: 738
m_Width: 42 m_Width: 42
m_Height: 1 m_Height: 1
- m_X: 241
m_Y: 1001
m_Width: 782
m_Height: 22
- m_X: 241
m_Y: 984
m_Width: 62
m_Height: 39
- m_X: 245
m_Y: 818
m_Width: 75
m_Height: 9
- m_X: 368
m_Y: 0
m_Width: 655
m_Height: 818
- m_X: 385
m_Y: 0
m_Width: 638
m_Height: 896
- m_X: 414
m_Y: 0
m_Width: 609
m_Height: 1023
- m_X: 320
m_Y: 896
m_Width: 45
m_Height: 10
- m_X: 365
m_Y: 987
m_Width: 658
m_Height: 36
- m_X: 157
m_Y: 79
m_Width: 24
m_Height: 76
- m_X: 181
m_Y: 171
m_Width: 842
m_Height: 62
- m_X: 217
m_Y: 0
m_Width: 806
m_Height: 79
- m_X: 230
m_Y: 0
m_Width: 793
m_Height: 233
m_fontInfo: m_fontInfo:
Name: Name:
PointSize: 0 PointSize: 0
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]].name = Encoding.ASCII.GetString(name).Replace(" ", "");
players[job.data[1]].index = job.data[1]; players[job.data[1]].index = job.data[1];
players[job.data[1]].textCoinsInfo = playerInfoElements[job.data[1]].textCoinInfo; 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]].uiHandler = uiHandler;
players[job.data[1]].Init(); players[job.data[1]].Init();
@@ -133,6 +132,9 @@ public class Client : MonoBehaviour
case 7: case 7:
(players[job.data[1]]).EventStopFinished(); (players[job.data[1]]).EventStopFinished();
break; break;
case 8:
((NoPlayablePlayer)players[job.data[1]]).BuyStar();
break;
case 126: case 126:
stream.Write(new byte[]{126, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 10); stream.Write(new byte[]{126, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 10);
break; break;
@@ -204,8 +206,13 @@ public class Client : MonoBehaviour
stream.Write(new byte[]{6, (byte)action, 0, 0, 0, 0, 0, 0, 0, 0}); 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}); 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 Layout2;
[SerializeField] private GameObject LayoutItemShop; [SerializeField] private GameObject LayoutItemShop;
[SerializeField] private Client client; [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>(); diceScript = dice.GetComponent<Dice>();
} }
public void BuyStar()
{
GameObject.Find("StarPositions").GetComponent<StarController>().SwitchStar();
AddCoins(-20);
}
public void CoinFieldAction(int action) public void CoinFieldAction(int action)
{ {
if (action == 0) 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 Star currentStar = null;
private void OnTriggerEnter(Collider collider) private void OnTriggerEnter(Collider collider)
{ {
base.OnTriggerEnter(collider);
if (collider.name.Equals("ItemShopTrigger")) if (collider.name.Equals("ItemShopTrigger"))
{ {
Layout2.SetActive(true); base.OnTriggerEnter(collider);
uiHandler.ActivateLayout2(this);
} }
else if (collider.name.Equals("StarTrigger")) else if (collider.name.Equals("StarTrigger"))
{ {
currentStar = collider.GetComponent<Star>(); currentStar = collider.GetComponent<Star>();
uiHandler.ActivateLayoutBuyStar(this); if(currentStar.IsActive)
{
base.OnTriggerEnter(collider);
uiHandler.ActivateLayoutBuyStar(this);
}
} }
} }
public void BuyStar(bool buy) public void BuyStar(bool buy)
{ {
client.SendEventStopFinished();
if (buy) if (buy)
{ {
currentStar.Buy(this); currentStar.Buy(this);
client.SendBuyStar();
} }
else else
{ {
currentStar = null; 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 abstract class Player : MonoBehaviour
{ {
public GameObject Layout2;
public string name = ""; public string name = "";
public bool activated = false; public bool activated = false;
protected bool wurfelt = false; protected bool wurfelt = false;
@@ -55,7 +53,7 @@ public abstract class Player : MonoBehaviour
Coin Coin
} }
protected void AddCoins(int amount) public void AddCoins(int amount)
{ {
coins += amount; coins += amount;
if (coins < 0) 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) public void Buy(Player player)
{ {
player.coins -= cost; player.AddCoins(-cost);
starController.SwitchStar(); starController.SwitchStar();
} }
} }
FlufflParty/Assets/Scripts/UIHandler.cs
+54
View File
@@ -1,11 +1,13 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using TMPro;
using UnityEngine; using UnityEngine;
public class UIHandler : MonoBehaviour public class UIHandler : MonoBehaviour
{ {
[SerializeField] private GameObject layout0; [SerializeField] private GameObject layout0;
[SerializeField] private GameObject layout1; [SerializeField] private GameObject layout1;
[SerializeField] private GameObject layout2;
[SerializeField] private GameObject layoutMiniMap; [SerializeField] private GameObject layoutMiniMap;
[SerializeField] private GameObject layoutBuyStar; [SerializeField] private GameObject layoutBuyStar;
@@ -17,6 +19,8 @@ public class UIHandler : MonoBehaviour
layout0.SetActive(true); layout0.SetActive(true);
layoutMiniMap.SetActive(false); layoutMiniMap.SetActive(false);
layoutBuyStar.SetActive(false); layoutBuyStar.SetActive(false);
layout2.SetActive(false);
} }
public void ActivateLayout1() public void ActivateLayout1()
@@ -25,6 +29,7 @@ public class UIHandler : MonoBehaviour
layout1.SetActive(true); layout1.SetActive(true);
layoutMiniMap.SetActive(false); layoutMiniMap.SetActive(false);
layoutBuyStar.SetActive(false); layoutBuyStar.SetActive(false);
layout2.SetActive(false);
} }
public void ActivateLayoutMiniMap() public void ActivateLayoutMiniMap()
@@ -33,6 +38,7 @@ public class UIHandler : MonoBehaviour
layout1.SetActive(false); layout1.SetActive(false);
layoutMiniMap.SetActive(true); layoutMiniMap.SetActive(true);
layoutBuyStar.SetActive(false); layoutBuyStar.SetActive(false);
layout2.SetActive(false);
} }
public void ActivateLayoutBuyStar(Player player) public void ActivateLayoutBuyStar(Player player)
@@ -42,5 +48,53 @@ public class UIHandler : MonoBehaviour
layout1.SetActive(false); layout1.SetActive(false);
layoutMiniMap.SetActive(false); layoutMiniMap.SetActive(false);
layoutBuyStar.SetActive(true); 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 16:9: 1
Others: 1 Others: 1
bundleVersion: 0.1 bundleVersion: 0.1
preloadedAssets: [] preloadedAssets:
- {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2}
- {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2}
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1 m_HolographicPauseOnTrackingLoss: 1
FlufflParty/UserSettings/EditorUserSettings.asset
+2 -2
View File
@@ -12,10 +12,10 @@ EditorUserSettings:
value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069 value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069
flags: 0 flags: 0
RecentlyUsedSceneGuid-2: RecentlyUsedSceneGuid-2:
value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0 flags: 0
RecentlyUsedSceneGuid-3: RecentlyUsedSceneGuid-3:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
flags: 0 flags: 0
UnityRemoteDevice: UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512 value: 225f4d46245b0d4902070862342649191512
Server/.idea/workspace.xml
Generated
+16 -15
View File
@@ -33,22 +33,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"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"RunOnceActivity.OpenProjectViewOnStart": "true", &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"WebServerToolWindowFactoryState": "false", &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
"last_opened_file_path": "C:/flufflparty/Server", &quot;last_opened_file_path&quot;: &quot;C:/flufflparty/Server&quot;,
"node.js.detected.package.eslint": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.detected.package.tslint": "true", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"project.structure.last.edited": "Artifacts", &quot;project.structure.last.edited&quot;: &quot;Artifacts&quot;,
"project.structure.proportion": "0.0", &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
"project.structure.side.proportion": "0.2", &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
"vue.rearranger.settings.migration": "true" &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
} }
}]]></component> }</component>
<component name="RunManager"> <component name="RunManager">
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Main" /> <option name="MAIN_CLASS_NAME" value="Main" />
@@ -86,6 +86,7 @@
<workItem from="1675628256814" duration="1286000" /> <workItem from="1675628256814" duration="1286000" />
<workItem from="1675795807134" duration="411000" /> <workItem from="1675795807134" duration="411000" />
<workItem from="1676926021732" duration="612000" /> <workItem from="1676926021732" duration="612000" />
<workItem from="1677445028345" duration="816000" />
</task> </task>
<servers /> <servers />
</component> </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}); players[i].output.write(new byte[]{7, (byte)player, 0, 0, 0, 0, 0, 0, 0, 0});
} }
break; 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: case 126:
players[player].lastTimeSendTimeOutCheck = System.currentTimeMillis(); players[player].lastTimeSendTimeOutCheck = System.currentTimeMillis();
break; break;