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

Skrr

Browse Source 
Skrr
This commit is contained in:
AliIbnAbiTalib
2023-03-23 21:09:02 +01:00
parent 1a0559addb
commit 09c1c29a09
11 changed files with 178 additions and 1090 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
+20 -9
View File
@@ -1,7 +1,19 @@
<?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/Scenes/WesternMap.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/WesternMap.unity" 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/NoPlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.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$/ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" 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>
<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" />
@@ -17,9 +29,6 @@
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Fields/LuckField.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/Fields/LuckField.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Fields/UnluckyField.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/Fields/UnluckyField.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Fields/VSField.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/Fields/VSField.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Items/Item.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Items/ItemSelector.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Items/UIItem.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Players/AnimationHandler.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/Players/AnimationHandler.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.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/PlayablePlayer.cs" root0="FORCE_HIGHLIGHTING" />
@@ -46,9 +55,9 @@
}, },
&quot;keyToStringList&quot;: { &quot;keyToStringList&quot;: {
&quot;rider.external.source.directories&quot;: [ &quot;rider.external.source.directories&quot;: [
&quot;C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache&quot;, &quot;C:\\Users\\afist\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache&quot;,
&quot;C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache&quot;, &quot;C:\\Users\\afist\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache&quot;,
&quot;C:\\Users\\braus\\AppData\\Local\\Symbols\\src&quot; &quot;C:\\Users\\afist\\AppData\\Local\\Symbols\\src&quot;
] ]
} }
}</component> }</component>
@@ -62,7 +71,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" />
@@ -70,7 +79,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" />
@@ -137,6 +146,8 @@
<workItem from="1677789832911" duration="4364000" /> <workItem from="1677789832911" duration="4364000" />
<workItem from="1677881158579" duration="8577000" /> <workItem from="1677881158579" duration="8577000" />
<workItem from="1678046412549" duration="3738000" /> <workItem from="1678046412549" duration="3738000" />
<workItem from="1679426348887" duration="3549000" />
<workItem from="1679597961773" duration="4070000" />
</task> </task>
<servers /> <servers />
</component> </component>
FlufflParty/Assets/Scenes/WesternMap.unity
-937
View File
File diff suppressed because it is too large Load Diff
FlufflParty/Assets/Scripts/Client.cs
-16
View File
@@ -28,7 +28,6 @@ public class Client : MonoBehaviour
[SerializeField] private GameObject[] playerInfo; [SerializeField] private GameObject[] playerInfo;
private PlayerInfoElements[] playerInfoElements = new PlayerInfoElements[4]; private PlayerInfoElements[] playerInfoElements = new PlayerInfoElements[4];
[SerializeField] private GameObject layout2; [SerializeField] private GameObject layout2;
[SerializeField] private Image[] uiItems;
[SerializeField] private Item[] items; [SerializeField] private Item[] items;
[SerializeField] private Button[] itemButtons; [SerializeField] private Button[] itemButtons;
@@ -54,11 +53,6 @@ public class Client : MonoBehaviour
thisClient = this; thisClient = this;
foreach(Image img in uiItems)
{
img.gameObject.SetActive(false);
}
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
playerInfo[i].SetActive(false); playerInfo[i].SetActive(false);
@@ -207,16 +201,6 @@ public class Client : MonoBehaviour
players[job.data[1]].textLeftMoves = textLeftMoves; players[job.data[1]].textLeftMoves = textLeftMoves;
players[job.data[1]].AddCoins(3); players[job.data[1]].AddCoins(3);
Image[] tempUIItems = new Image[3];
int f = 0;
for (int i = job.data[1] * 3; i < job.data[1] * 3 + 3; i++)
{
tempUIItems[f] = uiItems[i];
}
players[job.data[1]].uiItems = tempUIItems;
players[job.data[1]].Init(); players[job.data[1]].Init();
FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
+11 -5
View File
@@ -96,7 +96,6 @@ public class NoPlayablePlayer : Player
if (activated && !name.Equals("")) if (activated && !name.Equals(""))
{ {
camera.transform.position = Vector3.SmoothDamp(camera.transform.position, transform.position + cameraOffset, ref velocity, 0.2f); camera.transform.position = Vector3.SmoothDamp(camera.transform.position, transform.position + cameraOffset, ref velocity, 0.2f);
if (!wait) if (!wait)
{ {
//Laufe zum nöchsten Feld, falls noch Züge übrig sind //Laufe zum nöchsten Feld, falls noch Züge übrig sind
@@ -125,10 +124,10 @@ public class NoPlayablePlayer : Player
{ {
if (!wurfelt) if (!wurfelt)
{ {
//start the dice StartDice();
dice.transform.position = Vector3.SmoothDamp(dice.transform.position, }else if (activated)
transform.position + Vector3.up * 2, ref useLess, 0.2f); {
diceScript.StartRandom(); StartDice();
} }
} }
} }
@@ -191,4 +190,11 @@ public class NoPlayablePlayer : Player
} }
} }
public void StartDice()
{
//start the dice
dice.transform.position = Vector3.SmoothDamp(dice.transform.position,
transform.position + Vector3.up * 2, ref useLess, 0.2f);
diceScript.StartRandom();
}
} }
FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+30 -4
View File
@@ -17,6 +17,7 @@ public class PlayablePlayer : Player
private float speed = 5; private float speed = 5;
private float interPol = 0; private float interPol = 0;
private int wurfelZahl = 0; private int wurfelZahl = 0;
private bool checkDoubleDice = true;
private bool wait = false; private bool wait = false;
@@ -65,14 +66,26 @@ public class PlayablePlayer : Player
{ {
if (!Physics.Raycast(new Vector3(Input.mousePosition.x, Input.mousePosition.y, -200), Vector3.forward)) if (!Physics.Raycast(new Vector3(Input.mousePosition.x, Input.mousePosition.y, -200), Vector3.forward))
{ {
wurfelt = true; wurfelt = true;
wurfelZahl = Random.Range(1, 7); wurfelZahl = Random.Range(1, 7);
switch (activeItem)
{
case Item.Type.Mushroom: wurfelZahl += 3; activeItem = Item.Type.None; break;
case Item.Type.DoubleDice: checkDoubleDice = true; break;
}
/*
if (activeItem == Item.Type.Mushroom) if (activeItem == Item.Type.Mushroom)
{ {
wurfelZahl += 3; wurfelZahl += 3;
activeItem = Item.Type.None; activeItem = Item.Type.None;
}else if (activeItem == Item.Type.DoubleDice)
{
checkDoubleDice = true;
} }
*/
textLeftMoves.text = wurfelZahl + ""; textLeftMoves.text = wurfelZahl + "";
@@ -144,15 +157,20 @@ public class PlayablePlayer : Player
break; break;
} }
if (!checkDoubleDice)
{
Invoke("Finish", 2); Invoke("Finish", 2);
activated = false; activated = false;
} }
else else
{ {
//start the dice checkDoubleDice = false;
dice.transform.position = Vector3.SmoothDamp(dice.transform.position, wurfelt = false;
transform.position + Vector3.up * 2, ref useLess, 0.2f); }
diceScript.StartRandom(); }
else
{
StartDice();
} }
} }
} }
@@ -274,4 +292,12 @@ public class PlayablePlayer : Player
base.AddItem(item); base.AddItem(item);
client.SendBuyItem(item); client.SendBuyItem(item);
} }
public void StartDice()
{
//start the dice
dice.transform.position = Vector3.SmoothDamp(dice.transform.position,
transform.position + Vector3.up * 2, ref useLess, 0.2f);
diceScript.StartRandom();
}
} }
FlufflParty/Assets/Scripts/Players/Player.cs
-4
View File
@@ -22,7 +22,6 @@ public abstract class Player : MonoBehaviour
protected bool eventstop = false; protected bool eventstop = false;
public UIHandler uiHandler; public UIHandler uiHandler;
public Item[] items = new Item[3]; public Item[] items = new Item[3];
public Image[] uiItems;
public Item.Type activeItem = Item.Type.None; public Item.Type activeItem = Item.Type.None;
//for coin animation //for coin animation
@@ -84,8 +83,6 @@ public abstract class Player : MonoBehaviour
if (items[i] == null) if (items[i] == null)
{ {
items[i] = item; items[i] = item;
uiItems[i].sprite = item.sprite;
uiItems[i].gameObject.SetActive(true);
break; break;
} }
} }
@@ -94,7 +91,6 @@ public abstract class Player : MonoBehaviour
public void ActivateItem(int index) public void ActivateItem(int index)
{ {
activeItem = items[index].type; activeItem = items[index].type;
uiItems[index].gameObject.SetActive(false);
items[index] = null; items[index] = null;
} }
FlufflParty/Packages/packages-lock.json
+3 -3
View File
@@ -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": {
FlufflParty/ProjectSettings/ProjectSettings.asset
+4 -2
View File
@@ -18,7 +18,7 @@ PlayerSettings:
cursorHotspot: {x: 0, y: 0} cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1} m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
m_ShowUnitySplashScreen: 1 m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 0 m_ShowUnitySplashLogo: 1
m_SplashScreenOverlayOpacity: 1 m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 1 m_SplashScreenAnimation: 1
m_SplashScreenLogoStyle: 1 m_SplashScreenLogoStyle: 1
@@ -137,7 +137,9 @@ PlayerSettings:
16:9: 1 16:9: 1
Others: 1 Others: 1
bundleVersion: 0.12 bundleVersion: 0.12
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/ProjectSettings/ProjectVersion.txt
+2 -2
View File
@@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.16f1 m_EditorVersion: 2021.3.17f1
m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f) m_EditorVersionWithRevision: 2021.3.17f1 (3e8111cac19d)
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
FlufflParty/UserSettings/Layouts/default-2021.dwlt
+102 -102
View File
@@ -15,11 +15,11 @@ MonoBehaviour:
m_PixelRect: m_PixelRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 43 y: 43.2
width: 1920 width: 1536
height: 1117 height: 772.8
m_ShowMode: 4 m_ShowMode: 4
m_Title: Scene m_Title: Inspector
m_RootView: {fileID: 7} m_RootView: {fileID: 7}
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
@@ -42,12 +42,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 30 y: 30
width: 1920 width: 1536
height: 1067 height: 722.8
m_MinSize: {x: 300, y: 200} m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 1 vertical: 1
controlID: 24 controlID: 114
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -67,12 +67,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1920 width: 1536
height: 1067 height: 722.8
m_MinSize: {x: 300, y: 200} m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 0 vertical: 0
controlID: 25 controlID: 115
--- !u!114 &4 --- !u!114 &4
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -88,10 +88,10 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1374 x: 1099.2
y: 0 y: 0
width: 546 width: 436.80005
height: 1067 height: 722.8
m_MinSize: {x: 276, y: 71} m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 18} m_ActualView: {fileID: 18}
@@ -117,10 +117,10 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 281 width: 225.6
height: 701 height: 471.2
m_MinSize: {x: 201, y: 221} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 19} m_ActualView: {fileID: 19}
m_Panes: m_Panes:
- {fileID: 19} - {fileID: 19}
@@ -142,9 +142,9 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 701 y: 471.2
width: 1374 width: 1099.2
height: 366 height: 251.59998
m_MinSize: {x: 231, y: 271} m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021} m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 17} m_ActualView: {fileID: 17}
@@ -173,8 +173,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1920 width: 1536
height: 1117 height: 772.8
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1 m_UseTopView: 1
@@ -198,7 +198,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1920 width: 1536
height: 30 height: 30
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
@@ -219,8 +219,8 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 1097 y: 752.8
width: 1920 width: 1536
height: 20 height: 20
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
@@ -243,12 +243,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1374 width: 1099.2
height: 1067 height: 722.8
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192} m_MaxSize: {x: 16192, y: 16192}
vertical: 1 vertical: 1
controlID: 26 controlID: 53
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -268,12 +268,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1374 width: 1099.2
height: 701 height: 471.2
m_MinSize: {x: 200, y: 100} m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096} m_MaxSize: {x: 16192, y: 8096}
vertical: 0 vertical: 0
controlID: 112 controlID: 54
--- !u!114 &12 --- !u!114 &12
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -289,10 +289,10 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 281 x: 225.6
y: 0 y: 0
width: 1093 width: 873.6
height: 701 height: 471.2
m_MinSize: {x: 102, y: 121} m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021} m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
@@ -318,14 +318,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Game m_Text: Game
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 281 x: 225.6
y: 73 y: 73.6
width: 1091 width: 871.6
height: 680 height: 450.2
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -336,7 +336,7 @@ MonoBehaviour:
m_ShowGizmos: 0 m_ShowGizmos: 0
m_TargetDisplay: 0 m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0} m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 1091, y: 659} m_TargetSize: {x: 871.6, y: 429.2}
m_TextureFilterMode: 0 m_TextureFilterMode: 0
m_TextureHideFlags: 61 m_TextureHideFlags: 61
m_RenderIMGUI: 1 m_RenderIMGUI: 1
@@ -351,10 +351,10 @@ MonoBehaviour:
m_VRangeLocked: 0 m_VRangeLocked: 0
hZoomLockedByDefault: 0 hZoomLockedByDefault: 0
vZoomLockedByDefault: 0 vZoomLockedByDefault: 0
m_HBaseRangeMin: -545.5 m_HBaseRangeMin: -348.63998
m_HBaseRangeMax: 545.5 m_HBaseRangeMax: 348.63998
m_VBaseRangeMin: -329.5 m_VBaseRangeMin: -171.68001
m_VBaseRangeMax: 329.5 m_VBaseRangeMax: 171.68001
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1 m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMin: 1
@@ -363,7 +363,7 @@ MonoBehaviour:
m_HSlider: 0 m_HSlider: 0
m_VSlider: 0 m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0 m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1 m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0 m_EnableSliderZoomVertical: 0
m_UniformScale: 1 m_UniformScale: 1
@@ -372,23 +372,23 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 21 y: 21
width: 1091 width: 871.6
height: 659 height: 429.2
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Translation: {x: 545.5, y: 329.5} m_Translation: {x: 435.8, y: 214.6}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
m_MarginBottom: 0 m_MarginBottom: 0
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -545.5 x: -435.8
y: -329.5 y: -214.6
width: 1091 width: 871.6
height: 659 height: 429.2
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 1 m_defaultScale: 1
m_LastWindowPixelSize: {x: 1091, y: 680} m_LastWindowPixelSize: {x: 1089.5, y: 562.75}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
@@ -410,14 +410,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Scene m_Text: Scene
m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 281 x: 225.6
y: 73 y: 73.6
width: 1091 width: 871.6
height: 680 height: 450.2
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -427,8 +427,8 @@ MonoBehaviour:
floating: 0 floating: 0
collapsed: 0 collapsed: 0
displayed: 1 displayed: 1
snapOffset: {x: 0, y: 0} snapOffset: {x: -100, y: -26}
snapOffsetDelta: {x: -101, y: -26} snapOffsetDelta: {x: 0, y: 0}
snapCorner: 3 snapCorner: 3
id: Tool Settings id: Tool Settings
index: 0 index: 0
@@ -438,9 +438,9 @@ MonoBehaviour:
floating: 0 floating: 0
collapsed: 0 collapsed: 0
displayed: 1 displayed: 1
snapOffset: {x: -141, y: 149} snapOffset: {x: -141, y: -218.33331}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0}
snapCorner: 1 snapCorner: 3
id: unity-grid-and-snap-toolbar id: unity-grid-and-snap-toolbar
index: 1 index: 1
layout: 1 layout: 1
@@ -647,14 +647,14 @@ MonoBehaviour:
m_OverrideSceneCullingMask: 6917529027641081856 m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1 m_SceneIsLit: 1
m_SceneLighting: 1 m_SceneLighting: 1
m_2DMode: 0 m_2DMode: 1
m_isRotationLocked: 0 m_isRotationLocked: 0
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 94.7357, y: 7.567647, z: 124.6432} m_Target: {x: 544.62994, y: 178.72395, z: -44.418095}
speed: 2 speed: 2
m_Value: {x: 94.7357, y: 7.567647, z: 124.6432} m_Value: {x: 544.62994, y: 178.72395, z: -44.418095}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
@@ -701,17 +701,17 @@ MonoBehaviour:
m_GridAxis: 1 m_GridAxis: 1
m_gridOpacity: 0.5 m_gridOpacity: 0.5
m_Rotation: m_Rotation:
m_Target: {x: -0.017479911, y: 0.9293452, z: -0.3661485, w: -0.044362627} m_Target: {x: 0, y: 0, z: 0, w: 1}
speed: 2 speed: 2
m_Value: {x: -0.017413171, y: 0.9298837, z: -0.3647503, w: -0.044388335} m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size: m_Size:
m_Target: 1.1898067 m_Target: 268.54462
speed: 2 speed: 2
m_Value: 1.1898067 m_Value: 268.54462
m_Ortho: m_Ortho:
m_Target: 0 m_Target: 1
speed: 2 speed: 2
m_Value: 0 m_Value: 1
m_CameraSettings: m_CameraSettings:
m_Speed: 1.005 m_Speed: 1.005
m_SpeedNormalized: 0.5 m_SpeedNormalized: 0.5
@@ -725,7 +725,7 @@ MonoBehaviour:
m_FarClip: 10000 m_FarClip: 10000
m_DynamicClip: 1 m_DynamicClip: 1
m_OcclusionCulling: 0 m_OcclusionCulling: 0
m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewRotation: {x: -0.017479911, y: 0.9293452, z: -0.3661485, w: -0.044362627}
m_LastSceneViewOrtho: 0 m_LastSceneViewOrtho: 0
m_ReplacementShader: {fileID: 0} m_ReplacementShader: {fileID: 0}
m_ReplacementString: m_ReplacementString:
@@ -748,7 +748,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Lighting m_Text: Lighting
m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
@@ -776,7 +776,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Animator m_Text: Animator
m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
@@ -891,14 +891,14 @@ MonoBehaviour:
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_TitleContent: m_TitleContent:
m_Text: Project m_Text: Project
m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 774 y: 544.8
width: 1373 width: 1098.2
height: 345 height: 230.59998
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -916,22 +916,22 @@ MonoBehaviour:
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Scripts - Assets/Scenes
m_Globs: [] m_Globs: []
m_OriginalText: m_OriginalText:
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Scripts - Assets/Scenes
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: D:\Unity\flufflparty\FlufflParty m_LastProjectPath: C:\flufflparty\FlufflParty
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 107} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 3c660000 m_SelectedIDs: 7a670000
m_LastClickedID: 26172 m_LastClickedID: 26490
m_ExpandedIDs: 0000000036660000386600003a6600003c6600003e660000406600004266000044660000466600004866000000ca9a3b m_ExpandedIDs: 0000000076670000786700007a67000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@@ -959,7 +959,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 0000000036660000386600003a6600003c6600003e6600004066000042660000446600004666000048660000 m_ExpandedIDs: 0000000076670000786700007a670000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@@ -1031,14 +1031,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Inspector m_Text: Inspector
m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1374 x: 1099.2001
y: 73 y: 73.6
width: 545 width: 435.80005
height: 1046 height: 701.8
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -1072,14 +1072,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Hierarchy m_Text: Hierarchy
m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 73 y: 73.6
width: 280 width: 224.6
height: 680 height: 450.2
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -1087,23 +1087,23 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 000f0000 m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 06fbffff m_ExpandedIDs: 36bbffffeacfffff4cd8ffff02dbffff94e4ffff6af1fffffef9ffff6c8600008c86000090860000fc8600004087000044870000808800008e8900007a8a0000168b000020a200004ca200006ca2000070a2000090a20000dca2000020a3000024a3000070a300008aa300000ca400001aa400002aa4000040a400003ea5000094a500001aa60000aea60000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name: Canvas
m_OriginalName: m_OriginalName: Canvas
m_EditFieldRect: m_EditFieldRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 0 width: 0
height: 0 height: 0
m_UserData: 0 m_UserData: 41584
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 0
m_IsRenamingFilename: 0 m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 5} m_ClientGUIView: {fileID: 5}
m_SearchString: m_SearchString:
@@ -1129,7 +1129,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Console m_Text: Console
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2