From 4127dbaaac3ca0c615695b7c51e4cab245d4410a Mon Sep 17 00:00:00 2001 From: brausjonas Date: Tue, 24 Jan 2023 22:27:56 +0100 Subject: [PATCH] a --- .../.idea.FlufflParty/.idea/workspace.xml | 1 + FlufflParty/Assets/New Terrain.asset | Bin 685428 -> 685608 bytes FlufflParty/Assets/Scenes/WesternMap.unity | 182 +++--------------- FlufflParty/Assets/Scripts/Actions/Dice.cs | 3 +- .../UserSettings/Layouts/default-2021.dwlt | 46 ++--- 5 files changed, 53 insertions(+), 179 deletions(-) diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index 967dce6..06ce725 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -100,6 +100,7 @@ + diff --git a/FlufflParty/Assets/New Terrain.asset b/FlufflParty/Assets/New Terrain.asset index 58bf3ae19205e4ef97b3d6e294d5ce16cee15c88..f1e9a11873b4a2c19e15a0b0fd0af94c3d5fced3 100644 GIT binary patch delta 788 zcmYk4&ubG=5XUoZe*b8jWHpIfn@tqVrr3rc){B~4gd7See>SF?Jf1iH?`t% ze%Fb|dOg$~bzbFVNb)$$X=^X$w;2 z`2L=YlGBjdnJbZ!hA6HDh1p&v*_}n11Ps$jHw@wGrm3OOFmNu=&9}~j6FX&v0~yO( zG8WQC$|gXjLICVoe>(VJ83Lqa!681oxGus-!gvG=EgQ}Lf<0J|hI!c_XU3QmwpaYr zoB#`Z% zt2{aytDDms)O-Z{h4l!<+`w(WGt!^eV8B;1V#5xx!&=z+uRRlfiTi~0L5%&@_X7ZZ zItL-_#E)`yn2GaxAE|o`YwgjV=#=H!@x#2X%vfmX3Fz0ecj1mWHi=KkLOw%ZkjBk0 zKvyQ9TVY{Oe|IHH-hh3WJR9fgEF%tD@P^Gq>|?~Aj@7(wmMR-smnW;h^fCR6o-r^+ z#>AM{C##kNpKsa39b;^2?}`cS)aU_?wrg}jqpxZ7)Tv#cGa8-L=+v&Z=uYnhe*t|f B?_~f0 delta 536 zcmXw0O-LJ25O&(wBoZ}gB5Mt9VwA?DTGvIa9)dAm6f9_=B1G%bLr?WkXb(aU9s~<| z2pMn$@dpY;FJj4Ik$PA}6fc_IdJ&c$rKLG|x8L(;;oCR!eKX&i_ulrO)YWCGpoM-^ zsjueK$D6fEt9);dXtfK|HMcqbULMiD@tK(_4L82{%w;pjj`<9TaJ(4c?Znn@8C5XjUnXCQV38?u5GI4vlFjW2B-sc3mX|- zu{x4uarHfXJ|G-bUM)QTH->%`!e5O;!Ja`tC~RPvNWeJkVyl;^;>>We8Q z%42g8cFK=og7~oMM&YfpuXMV0mE`%%DC({I;h&bAqqj$Jdk3}^$cT}lAtDLosh#7w zUT|r}<+zf*KvK{D(w%CRnO)Lvhq1VhXXm1lT_=xSSf(Yy_?W`%$BceO`(d?FvSz0U zj0NQh2Um3LJAgRF*>j(4`Y0eyp1SUO)jf^adtsWP;^1$z>GtL^O%muY_lFAN9=k!f dibyQFLcjyyA>aY3fk%KB@Y$~ToePh8@&7eJ&0hcj diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 463219a..2415ac3 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -763,7 +763,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 59 + value: 58 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.y @@ -918,7 +918,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 65 + value: 64 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -1046,7 +1046,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 61 + value: 60 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -1258,7 +1258,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 54 + value: 53 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -3276,7 +3276,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 41 + value: 40 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -4140,7 +4140,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 53 + value: 52 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.y @@ -4206,7 +4206,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 52 + value: 51 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -5054,7 +5054,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 58 + value: 57 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -5116,7 +5116,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 68 + value: 67 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -5919,7 +5919,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 43 + value: 42 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -6055,7 +6055,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 63 + value: 62 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -6381,7 +6381,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 67 + value: 66 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -6707,7 +6707,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 49 + value: 48 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -6777,7 +6777,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 51 + value: 50 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -6948,7 +6948,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 45 + value: 44 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -7161,7 +7161,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 66 + value: 65 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -7276,68 +7276,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} m_PrefabInstance: {fileID: 956543520} m_PrefabAsset: {fileID: 0} ---- !u!1001 &968225480 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1584314260} - m_Modifications: - - target: {fileID: 1194979430535263213, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_Name - value: Field (1) - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_RootOrder - value: 38 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalPosition.x - value: 92.68906 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalPosition.y - value: 1.0345988 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalPosition.z - value: 86.50336 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071067 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} ---- !u!4 &968225481 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - m_PrefabInstance: {fileID: 968225480} - m_PrefabAsset: {fileID: 0} --- !u!1001 &972322816 PrefabInstance: m_ObjectHideFlags: 0 @@ -7885,68 +7823,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} m_PrefabInstance: {fileID: 1075899112} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1100685221 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1584314260} - m_Modifications: - - target: {fileID: 1194979430535263213, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_Name - value: Field - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_RootOrder - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalPosition.x - value: 111.8 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalPosition.y - value: 1.0346045 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalPosition.z - value: 115.14 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalRotation.w - value: 0.66552967 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalRotation.x - value: -0.66552967 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalRotation.y - value: 0.23889388 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalRotation.z - value: 0.23889388 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 39.492 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} ---- !u!4 &1100685222 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} - m_PrefabInstance: {fileID: 1100685221} - m_PrefabAsset: {fileID: 0} --- !u!1 &1107924850 GameObject: m_ObjectHideFlags: 0 @@ -9136,7 +9012,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 55 + value: 54 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -10475,7 +10351,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} propertyPath: m_RootOrder - value: 42 + value: 41 objectReference: {fileID: 0} - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} propertyPath: m_LocalPosition.x @@ -11018,7 +10894,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 56 + value: 55 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.z @@ -11270,7 +11146,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 57 + value: 56 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -11336,7 +11212,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 50 + value: 49 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -11513,9 +11389,7 @@ Transform: - {fileID: 292259956} - {fileID: 1122446307} - {fileID: 7452479} - - {fileID: 968225481} - {fileID: 203184820} - - {fileID: 1100685222} - {fileID: 407149967} - {fileID: 1436962421} - {fileID: 770566236} @@ -11730,7 +11604,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 62 + value: 61 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -12520,7 +12394,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 47 + value: 46 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -12679,7 +12553,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 46 + value: 45 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -13400,7 +13274,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 60 + value: 59 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -14575,7 +14449,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 48 + value: 47 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -15087,7 +14961,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 44 + value: 43 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -15371,7 +15245,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 64 + value: 63 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.y diff --git a/FlufflParty/Assets/Scripts/Actions/Dice.cs b/FlufflParty/Assets/Scripts/Actions/Dice.cs index 7b5ea47..ae2271b 100644 --- a/FlufflParty/Assets/Scripts/Actions/Dice.cs +++ b/FlufflParty/Assets/Scripts/Actions/Dice.cs @@ -35,7 +35,6 @@ public class Dice : MonoBehaviour CancelInvoke("RandomNumbers"); rb.useGravity = true; - rb.angularVelocity = new Vector3(Random.Range(5, 10), Random.Range(5, 10), Random.Range(5, 10)); foreach (TMP_Text t in numbers) { @@ -47,7 +46,7 @@ public class Dice : MonoBehaviour { int random = Random.Range(1, 7); - rb.angularVelocity = new Vector3(Random.Range(5, 10), Random.Range(5, 10), Random.Range(5, 10)); + rb.angularVelocity = new Vector3(5, 5, 5); foreach (TMP_Text t in numbers) { t.text = random.ToString(); diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index 47cd0e2..cb83f42 100644 --- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt +++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 15 + controlID: 104 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -223,7 +223,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 16 + controlID: 105 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -248,7 +248,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 17 + controlID: 106 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -259,7 +259,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: SimulatorWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -268,15 +268,15 @@ MonoBehaviour: y: 0 width: 1062 height: 686 - m_MinSize: {x: 102, y: 121} + m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 18} m_Panes: - {fileID: 13} - {fileID: 12} - {fileID: 18} - m_Selected: 0 - m_LastSelected: 2 + m_Selected: 2 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -583,9 +583,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 91.370705, y: 4.79952, z: 124.723564} + m_Target: {x: 93.51797, y: 7.8785253, z: 114.22435} speed: 2 - m_Value: {x: 91.370705, y: 4.79952, z: 124.723564} + m_Value: {x: 93.51797, y: 7.8785253, z: 114.22435} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -632,13 +632,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.20359619, y: 0.766319, z: -0.29662725, w: 0.53333217} + m_Target: {x: 0.36609727, y: 0.2688171, z: -0.114193745, w: 0.88427716} speed: 2 - m_Value: {x: 0.20348155, y: 0.7658875, z: -0.29646024, w: 0.5330319} + m_Value: {x: 0.36405128, y: 0.26234403, z: -0.11058539, w: 0.88679934} m_Size: - m_Target: 0.77198786 + m_Target: 0.8660254 speed: 2 - m_Value: 0.77198786 + m_Value: 0.8660254 m_Ortho: m_Target: 0 speed: 2 @@ -716,10 +716,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 144} - m_SelectedIDs: c4640000 - m_LastClickedID: 25796 - m_ExpandedIDs: 0000000086600000886000008a600000c264000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: ba630000 + m_LastClickedID: 25530 + m_ExpandedIDs: 0000000076630000786300007a63000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -747,7 +747,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000086600000886000008a600000 + m_ExpandedIDs: 0000000076630000786300007a630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -774,7 +774,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000906400007e6d0000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -877,7 +877,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: bc12ffff1c13ffff5419ffff5466ffff1a6affff74a6ffff34fbffff045b0000 + m_ExpandedIDs: 4ae9ffffa8e9ffff58f0ffff8cfaffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -973,7 +973,7 @@ MonoBehaviour: m_UseMipMap: 0 m_SimulatorState: controlPanelVisible: 0 - controlPanelWidth: NaN + controlPanelWidth: 0 controlPanelFoldoutKeys: - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin controlPanelFoldoutValues: 00 @@ -981,7 +981,7 @@ MonoBehaviour: - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin pluginStates: - '{}' - scale: 10 + scale: 40 fitToScreenEnabled: 1 rotationDegree: 270 highlightSafeAreaEnabled: 0