Show current Item

2023-03-31 20:58:20 +02:00
parent 0b1be485d5
commit 5cbb59e60c
9 changed files with 1522 additions and 175 deletions
@@ -140,6 +140,7 @@
      <workItem from="1680022248953" duration="9377000" />
      <workItem from="1680214809728" duration="8352000" />
      <workItem from="1680264155233" duration="923000" />
+      <workItem from="1680286363612" duration="1990000" />
    </task>
    <servers />
  </component>
@@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: 5307f3fc4b4d60c4aabb937ffab2a546
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -28,13 +28,16 @@ public class Client : MonoBehaviour
    [SerializeField] private GameObject[] playerInfo;
    private PlayerInfoElements[] playerInfoElements = new PlayerInfoElements[4];
    [SerializeField] private GameObject layout2;
-    [SerializeField] private Item[] items;
+    [SerializeField] public Item[] items;
    [SerializeField] private Button[] itemButtons;

    [SerializeField] private TMP_Text fpsText;

    private int playerAmount = 0;

+    [SerializeField] private Image imageCurrentItem;
+    [SerializeField] private Image[] playerItemInfoImages;
+
    private static Client thisClient;

    public static Client GetCurrentInstance()
@@ -153,6 +156,22 @@ public class Client : MonoBehaviour
                        script.nextField = nextField;
                        script.dice = dice;
                        script.camera = cam;
+                        script.imageCurrentItem = imageCurrentItem;
+                        
+                        //ITEM INFO IMAGES
+                        Image[] temp = new Image[3];
+                        
+                        int itemInfoImagesStartIndex = job.data[5] * 3;
+                        int idx = 0;
+                        for (int i = itemInfoImagesStartIndex; i < itemInfoImagesStartIndex + 3; i++)
+                        {
+                            temp[idx] = playerItemInfoImages[i];
+                            temp[idx].color = new Color(0, 0, 0, 0);
+                            idx++;
+                        }
+
+                        script.itemInfoImages = temp;
+                        //END

                        itemButtons[job.data[5]].interactable = true;
                    }
@@ -168,7 +187,23 @@ public class Client : MonoBehaviour
                        script.nextField = nextField;
                        script.dice = dice;
                        script.camera = cam;
+                        script.imageCurrentItem = imageCurrentItem;

+                        //ITEM INFO IMAGES
+                        Image[] temp = new Image[3];
+                        
+                        int itemInfoImagesStartIndex = job.data[5] * 3;
+                        int idx = 0;
+                        for (int i = itemInfoImagesStartIndex; i < itemInfoImagesStartIndex + 3; i++)
+                        {
+                            temp[idx] = playerItemInfoImages[i];
+                            temp[idx].color = new Color(0, 0, 0, 0);
+                            idx++;
+                        }
+
+                        script.itemInfoImages = temp;
+                        //END
+                        
                        itemButtons[job.data[5]].interactable = false;
                    }

@@ -289,6 +289,7 @@ public class PlayablePlayer : Player

    private void Finish()
    {
+        imageCurrentItem.color = new Color(0, 0, 0, 0);
        client.SendFinished();
    }

@@ -352,7 +353,10 @@ public class PlayablePlayer : Player
    public void ActivateItem(int index)
    {
        activeItem = items[index].type;
+        imageCurrentItem.sprite = items[index].sprite;
+        imageCurrentItem.color = new Color(1, 1, 1, 1);
        items[index] = null;
+        itemInfoImages[index].color = new Color(0, 0, 0, 0);
        client.SendActiveItem((byte)index);
    }
 }
@@ -24,6 +24,8 @@ public abstract class Player : MonoBehaviour
    public Item[] items = new Item[3];
    public Item.Type activeItem = Item.Type.None;
    protected float rotationDamping = 10;
+    public Image imageCurrentItem;
+    public Image[] itemInfoImages;

    protected Animator animator;
    
@@ -39,6 +41,7 @@ public abstract class Player : MonoBehaviour
    //Aktiviert den Player
    public void Activate()
    {
+        imageCurrentItem.color = new Color(0, 0, 0, 0);
        activated = true;
        wurfelt = false;
    }
@@ -87,6 +90,8 @@ public abstract class Player : MonoBehaviour
            if (items[i] == null)
            {
                items[i] = item;
+                itemInfoImages[i].sprite = item.sprite;
+                itemInfoImages[i].color = new Color(1, 1, 1, 1);
                break;
            }
        }
@@ -97,7 +102,11 @@ public abstract class Player : MonoBehaviour
    public void ActivateItem(int index)
    {
        activeItem = items[index].type;
+        imageCurrentItem.sprite = items[index].sprite;
+        imageCurrentItem.color = new Color(1, 1, 1, 1);
+        itemInfoImages[index].color = new Color(0, 0, 0, 0);
        items[index] = null;
+        
    }

    public void OnTriggerEnter(Collider c)
@@ -138,7 +138,7 @@ PlayerSettings:
    Others: 1
  bundleVersion: 0.14
  preloadedAssets:
-  - {fileID: -6390619424234631034, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2}
+  - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2}
  - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2}
  metroInputSource: 0
  wsaTransparentSwapchain: 0
@@ -19,7 +19,7 @@ MonoBehaviour:
    width: 1920
    height: 1117
  m_ShowMode: 4
-  m_Title: Game
+  m_Title: Hierarchy
  m_RootView: {fileID: 2}
  m_MinSize: {x: 875, y: 300}
  m_MaxSize: {x: 10000, y: 10000}
@@ -118,7 +118,7 @@ MonoBehaviour:
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 1
-  controlID: 32
+  controlID: 103
 --- !u!114 &6
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -143,7 +143,7 @@ MonoBehaviour:
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: 33
+  controlID: 104
 --- !u!114 &7
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -163,12 +163,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1405
+    width: 1551
    height: 1067
  m_MinSize: {x: 200, y: 200}
  m_MaxSize: {x: 16192, y: 16192}
  vertical: 1
-  controlID: 20
+  controlID: 105
 --- !u!114 &8
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -188,12 +188,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1405
-    height: 754
+    width: 1551
+    height: 755
  m_MinSize: {x: 200, y: 100}
  m_MaxSize: {x: 16192, y: 8096}
  vertical: 0
-  controlID: 21
+  controlID: 106
 --- !u!114 &9
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -211,8 +211,8 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 285
-    height: 754
+    width: 313
+    height: 755
  m_MinSize: {x: 201, y: 221}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 14}
@@ -235,17 +235,17 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 285
+    x: 313
    y: 0
-    width: 1120
-    height: 754
+    width: 1238
+    height: 755
  m_MinSize: {x: 102, y: 121}
  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 20}
  m_Panes:
-  - {fileID: 17}
-  - {fileID: 15}
  - {fileID: 16}
+  - {fileID: 15}
+  - {fileID: 20}
  m_Selected: 2
  m_LastSelected: 0
 --- !u!114 &11
@@ -264,15 +264,15 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 754
-    width: 1405
-    height: 313
+    y: 755
+    width: 1551
+    height: 312
  m_MinSize: {x: 231, y: 271}
  m_MaxSize: {x: 10001, y: 10021}
  m_ActualView: {fileID: 13}
  m_Panes:
  - {fileID: 13}
-  - {fileID: 18}
+  - {fileID: 17}
  m_Selected: 0
  m_LastSelected: 1
 --- !u!114 &12
@@ -290,16 +290,16 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1405
+    x: 1551
    y: 0
-    width: 515
+    width: 369
    height: 1067
  m_MinSize: {x: 276, y: 71}
  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 19}
+  m_ActualView: {fileID: 18}
  m_Panes:
+  - {fileID: 18}
  - {fileID: 19}
-  - {fileID: 20}
  m_Selected: 0
  m_LastSelected: 1
 --- !u!114 &13
@@ -323,9 +323,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 827
-    width: 1404
-    height: 292
+    y: 828
+    width: 1550
+    height: 291
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -343,22 +343,22 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/Prefabs
+    - Assets/BlenderFiles/Textures/CharacterFaces
    m_Globs: []
    m_OriginalText: 
  m_ViewMode: 1
  m_StartGridSize: 64
  m_LastFolders:
-  - Assets/Prefabs
+  - Assets/BlenderFiles/Textures/CharacterFaces
  m_LastFoldersGridSize: -1
  m_LastProjectPath: D:\Unity\flufflparty\FlufflParty
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
-    scrollPos: {x: 0, y: 48}
-    m_SelectedIDs: 6ea30000
-    m_LastClickedID: 41838
-    m_ExpandedIDs: 0000000064a3000068a3000072a3000074a3000078ad000000ca9a3b
+    scrollPos: {x: 0, y: 60}
+    m_SelectedIDs: 5aa50500
+    m_LastClickedID: 370010
+    m_ExpandedIDs: 00000000f8670000fa670000fc670000fe670000006800005c68000000ca9a3b
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -386,7 +386,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 
+    m_ExpandedIDs: 00000000f8670000fa670000fc670000fe67000000680000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -414,7 +414,7 @@ MonoBehaviour:
    m_SelectedInstanceIDs: 
    m_LastClickedInstanceID: 0
    m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c6230000906400007e6d0000485d00002c610000fa0b0200
+    m_ExpandedInstanceIDs: c6230000906400007e6d0000485d00002c610000fa0b020046650000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -464,8 +464,8 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 73
-    width: 284
-    height: 733
+    width: 312
+    height: 734
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -475,7 +475,7 @@ MonoBehaviour:
      scrollPos: {x: 0, y: 0}
      m_SelectedIDs: 
      m_LastClickedID: 0
-      m_ExpandedIDs: aea8fbfffea8fbffb0acfbffbaaefbff86b8fbffd6b8fbff88bcfbff92befbff14cdfbff70cdfbff22d1fbff2cd3fbff36dbfbff12e3fbff6ce3fbff30e7fbff30e9fbff46f3fbffa2f3fbff66f7fbff66f9fbfff008fcff3e09fcff020dfcff020ffcff522cfcffb463fcff32b8fcff22ccfcff32d0fcff82d0fcff22d4fcff22d6fcff6ad5fdffb8d5fdff58d9fdff58dbfdff7eeffdffa671fefffc97feff5a98feffe89bfefff29dfeff80a8feff50b5feffa4b5feffd8b9feffe2bbfefffce6feff72e7feff84ebfeff8eedfeff2a8cffff36b1ffff76b4ffff86b5ffff7ea80000ea0201002a920100b8f4030082f70300a8f703009c3a04002a7f040058ac0400
+      m_ExpandedIDs: f2dbfcff32dcfcffe2dffcffeee1fcffa8e5fcffe4e5fcffb6e9fcffe4ebfcffaef3fcffdef4fcfffcf5fcff8efbfcff80fefcff6210fdff7213fdffda15fdff6418fdffb218fdff4e1cfdff5a1efdff1427fdff6227fdfffe2afdff0a2dfdff4e35fdff043dfdff543dfdff1641fdff1643fdff9648fdffb44dfdfffa4dfdffaa51fdffb653fdff3272fdffa48bfdff6e47feffc047feff824bfeff884dfeff7067feffc667feff886bfeff8e6dfeffd476feff1884feff6a84feff3088feff348afeff6c8ffeffc28ffeff8893feff8c95feff289bfeff829bfeff449ffeff48a1feffba23ffff1a6dffff5a6dffffb06fffffb271ffffd699ffff149affffd89dffffd89fffffe4aaffff24abffffe8aeffffe8b0fffff2e0ffff32e4ffff94e4ffff46e8ffff50eaffff04fbffff8e590100fa5a010084a1020096a1020010a302004ebe0200d2bf0200f2d4020056ff0200c4000300da0003007c0103002402030090020300ae020300d0020300bad50300d0d5030038d6030082d60300c8d603006afc03006efc03001efd030022fd0300bafe030006ff030038ff0300b200040066a604005ea70400ccd10400ced3040018d40400184905001a4c0500924c0500344d050000590500225a05001a5b0500d65f050032600500cc60050090610500a6610500dc6105001262050036620500a0620500be620500c66205007c630500e063050030640500
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@@ -599,14 +599,14 @@ MonoBehaviour:
      e31: 0
      e32: 0
      e33: 1
-    - e00: 0.94549483
+    - e00: 0.7855881
      e01: 0
      e02: 0
-      e03: 24.649284
+      e03: -78.434975
      e10: 0
-      e11: 0.94549483
+      e11: 0.7855881
      e12: 0
-      e13: 102.7879
+      e13: 122.738205
      e20: 0
      e21: 0
      e22: 1
@@ -632,98 +632,6 @@ MonoBehaviour:
  m_LayerEditor:
    m_SelectedLayerIndex: 0
 --- !u!114 &16
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Game
-    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 285
-    y: 73
-    width: 1118
-    height: 733
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-  m_SerializedViewNames: []
-  m_SerializedViewValues: []
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 1118, y: 712}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 0
-  m_UseMipMap: 0
-  m_VSyncEnabled: 0
-  m_Gizmos: 0
-  m_Stats: 0
-  m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -559
-    m_HBaseRangeMax: 559
-    m_VBaseRangeMin: -356
-    m_VBaseRangeMax: 356
-    m_HAllowExceedBaseRangeMin: 1
-    m_HAllowExceedBaseRangeMax: 1
-    m_VAllowExceedBaseRangeMin: 1
-    m_VAllowExceedBaseRangeMax: 1
-    m_ScaleWithWindow: 0
-    m_HSlider: 0
-    m_VSlider: 0
-    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
-    m_EnableSliderZoomHorizontal: 0
-    m_EnableSliderZoomVertical: 0
-    m_UniformScale: 1
-    m_UpDirection: 1
-    m_DrawArea:
-      serializedVersion: 2
-      x: 0
-      y: 21
-      width: 1118
-      height: 712
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 559, y: 356}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -559
-      y: -356
-      width: 1118
-      height: 712
-    m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1118, y: 733}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}
--- !u!114 &17
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -743,10 +651,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 285
+    x: 313
    y: 73
-    width: 1118
-    height: 733
+    width: 1236
+    height: 734
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -976,14 +884,14 @@ MonoBehaviour:
  m_OverrideSceneCullingMask: 6917529027641081856
  m_SceneIsLit: 1
  m_SceneLighting: 1
-  m_2DMode: 0
+  m_2DMode: 1
  m_isRotationLocked: 0
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 92.27141, y: 15.105467, z: 140.35686}
+    m_Target: {x: 478.13205, y: 360.35187, z: 1.8405368}
    speed: 2
-    m_Value: {x: 92.27141, y: 15.105467, z: 140.35686}
+    m_Value: {x: 478.13205, y: 360.35187, z: 1.8405368}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@@ -1030,17 +938,17 @@ MonoBehaviour:
    m_GridAxis: 1
    m_gridOpacity: 0.5
  m_Rotation:
-    m_Target: {x: -0.012345448, y: -0.9739339, z: 0.21983707, w: -0.054695472}
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
    speed: 2
-    m_Value: {x: -0.012345327, y: -0.97392434, z: 0.21983492, w: -0.054694936}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 1.1898067
+    m_Target: 533.3653
    speed: 2
-    m_Value: 1.1898067
+    m_Value: 533.3653
  m_Ortho:
-    m_Target: 0
+    m_Target: 1
    speed: 2
-    m_Value: 0
+    m_Value: 1
  m_CameraSettings:
    m_Speed: 1.005
    m_SpeedNormalized: 0.5
@@ -1054,14 +962,14 @@ MonoBehaviour:
    m_FarClip: 10000
    m_DynamicClip: 1
    m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: -0.0078941835, y: -0.9656885, z: 0.25792852, w: -0.029559806}
+  m_LastSceneViewRotation: {x: -0.012345448, y: -0.9739339, z: 0.21983707, w: -0.054695472}
  m_LastSceneViewOrtho: 0
  m_ReplacementShader: {fileID: 0}
  m_ReplacementString: 
  m_SceneVisActive: 1
  m_LastLockedObject: {fileID: 0}
  m_ViewIsLockedToObject: 0
--- !u!114 &18
+--- !u!114 &17
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -1089,7 +997,7 @@ MonoBehaviour:
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
    m_SaveData: []
--- !u!114 &19
+--- !u!114 &18
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -1109,9 +1017,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1405
+    x: 1551
    y: 73
-    width: 514
+    width: 368
    height: 1046
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@@ -1130,7 +1038,7 @@ MonoBehaviour:
  m_LockTracker:
    m_IsLocked: 0
  m_PreviewWindow: {fileID: 0}
--- !u!114 &20
+--- !u!114 &19
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -1158,3 +1066,97 @@ MonoBehaviour:
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
    m_SaveData: []
+--- !u!114 &20
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 313
+    y: 73
+    width: 1236
+    height: 734
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+  m_SerializedViewNames:
+  - UnityEditor.DeviceSimulation.SimulatorWindow
+  m_SerializedViewValues:
+  - D:\Unity\flufflparty\FlufflParty\Library\PlayModeViewStates\c38c437210af1f748a747ce0d84419b9
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 1236, y: 713}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 0
+  m_UseMipMap: 0
+  m_VSyncEnabled: 0
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    m_HBaseRangeMin: -618
+    m_HBaseRangeMax: 618
+    m_VBaseRangeMin: -356.5
+    m_VBaseRangeMax: 356.5
+    m_HAllowExceedBaseRangeMin: 1
+    m_HAllowExceedBaseRangeMax: 1
+    m_VAllowExceedBaseRangeMin: 1
+    m_VAllowExceedBaseRangeMax: 1
+    m_ScaleWithWindow: 0
+    m_HSlider: 0
+    m_VSlider: 0
+    m_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 1
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 1236
+      height: 713
+    m_Scale: {x: 1, y: 1}
+    m_Translation: {x: 618, y: 356.5}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -618
+      y: -356.5
+      width: 1236
+      height: 713
+    m_MinimalGUI: 1
+  m_defaultScale: 1
+  m_LastWindowPixelSize: {x: 1236, y: 734}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000000000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 0}