Blocker Fix (Hopefully)

FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <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/Start.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Start.unity" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
-    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -37,22 +33,22 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
+  <component name="PropertiesComponent"><![CDATA[{
-  &quot;keyToString&quot;: {
+  "keyToString": {
-    &quot;Discover.Launch.Via.Unity&quot;: &quot;true&quot;,
+    "Discover.Launch.Via.Unity": "true",
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    "RunOnceActivity.ShowReadmeOnStart": "true",
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    "WebServerToolWindowFactoryState": "false",
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+    "vue.rearranger.settings.migration": "true"
   },
-  &quot;keyToStringList&quot;: {
+  "keyToStringList": {
-    &quot;rider.external.source.directories&quot;: [
+    "rider.external.source.directories": [
-      &quot;C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache&quot;,
+      "C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache",
-      &quot;C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache&quot;,
+      "C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache",
-      &quot;C:\\Users\\braus\\AppData\\Local\\Symbols\\src&quot;
+      "C:\\Users\\braus\\AppData\\Local\\Symbols\\src"
     ]
   }
-}</component>
+}]]></component>
   <component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
     <configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
       <option name="EXE_PATH" value="$USER_HOME$/OneDrive/Desktop/FlufflPartyBuild\FlufflParty.exe" />
@@ -140,7 +136,7 @@
       <workItem from="1678046412549" duration="3738000" />
       <workItem from="1679426348887" duration="3549000" />
       <workItem from="1679597961773" duration="4070000" />
-      <workItem from="1680022248953" duration="2534000" />
+      <workItem from="1680022248953" duration="3842000" />
     </task>
     <servers />
   </component>

FlufflParty/Assets/Scenes/WesternMap.unity

@@ -5075,7 +5075,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &584878063
 RectTransform:
   m_ObjectHideFlags: 0
@@ -10937,7 +10937,7 @@ MonoBehaviour:
       m_Calls:
       - m_Target: {fileID: 47812149}
         m_TargetAssemblyTypeName: UIHandler, Assembly-CSharp
-        m_MethodName: ButtonBack
+        m_MethodName: ActivateLayout1
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -12318,8 +12318,8 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1129.2301, y: 599.6246, z: 1}
+  m_Size: {x: 1874.4869, y: 1411.1487, z: 340.12936}
-  m_Center: {x: -3.4103851, y: -0.5167255, z: 0}
+  m_Center: {x: 53.393764, y: 64.56608, z: 169.56474}
 --- !u!1 &1397027313
 GameObject:
   m_ObjectHideFlags: 0

FlufflParty/Assets/Scripts/UIHandler.cs

@@ -164,7 +164,7 @@ public class UIHandler : MonoBehaviour
         ActivateLayout1();
         ((PlayablePlayer)currentPlayer).SkipShop();
     }
-
+    
     public void ButtonSelectItem(int index)
     {
         ((PlayablePlayer)currentPlayer).ActivateItem(index);

Server/.idea/workspace.xml

@@ -90,7 +90,7 @@
       <workItem from="1677520608630" duration="13000" />
       <workItem from="1677789901008" duration="661000" />
       <workItem from="1677881295823" duration="3489000" />
-      <workItem from="1680022478274" duration="1591000" />
+      <workItem from="1680022478274" duration="2185000" />
     </task>
     <servers />
   </component>