diff --git a/namedropper/Assets/CardDataDrawer.cs b/namedropper/Assets/CardDataDrawer.cs index 8697ee5..c7ff233 100644 --- a/namedropper/Assets/CardDataDrawer.cs +++ b/namedropper/Assets/CardDataDrawer.cs @@ -17,12 +17,22 @@ public class CardDataDrawer : MonoBehaviour public void Randomize() { _cardData = new CardData(); - _cardData.Randomize(); + _cardData.Randomize(_shapeSprites.Length); + Redraw(); + + } + + public void Redraw() + { for (int i = 0; i < _shapeSprites.Length; i++) { - _shapeSprites[i].GetComponent().sprite = _cardData.GetSprite(); - _shapeSprites[i].SetActive(i < _cardData._number); + _shapeSprites[i].GetComponent().sprite = _cardData.GetSprite(i); + + if (_cardData._shapes[i] == CardData.Shape.NONE) + _shapeSprites[i].SetActive(false); + else + _shapeSprites[i].SetActive(true); } } diff --git a/namedropper/Assets/Prefabs/Category Prefab.prefab b/namedropper/Assets/Prefabs/Category Prefab.prefab index e672fcc..af64acc 100644 --- a/namedropper/Assets/Prefabs/Category Prefab.prefab +++ b/namedropper/Assets/Prefabs/Category Prefab.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3032088937872018548 RectTransform: m_ObjectHideFlags: 0 @@ -31,11 +31,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757095760799} - m_RootOrder: 8 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -98, y: -339} + m_AnchoredPosition: {x: -64.9, y: -339} m_SizeDelta: {x: 63, y: 63} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5316076015124516944 @@ -59,14 +59,90 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0.832973, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a54494efde92b524a8d4a94cfaa7f841, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1053649851916384909 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5811169795948496614} + - component: {fileID: 869680664073298153} + - component: {fileID: 3540614346134156105} + m_Layer: 0 + m_Name: ShapeBottomCenter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5811169795948496614 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1053649851916384909} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1499098757095760799} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -124.4, y: -401} + m_SizeDelta: {x: 63, y: 63} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &869680664073298153 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1053649851916384909} + m_CullTransparentMesh: 1 +--- !u!114 &3540614346134156105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1053649851916384909} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 47151d0a76caf674fbc2ec27fc4a0f94, type: 3} + m_Sprite: {fileID: 21300000, guid: a54494efde92b524a8d4a94cfaa7f841, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -115,6 +191,8 @@ Transform: - {fileID: 770537853553476569} - {fileID: 2507324631706630911} - {fileID: 6747320240088940386} + - {fileID: 6983062348909698928} + - {fileID: 5811169795948496614} - {fileID: 3032088937872018548} - {fileID: 2462013288784083471} - {fileID: 6768890663314167569} @@ -190,8 +268,7 @@ MonoBehaviour: _shapeSprites: - {fileID: 4698135363407727744} - {fileID: 1925658209779528050} - - {fileID: 607394616812083077} - - {fileID: 3870330076223021860} + - {fileID: 7294958316878599169} --- !u!1 &1499098757547953155 GameObject: m_ObjectHideFlags: 0 @@ -266,7 +343,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: b0cdae1d543fd1340a987bc8707f68f1, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3773585, g: 0.3773585, b: 0.3773585, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -647,7 +724,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -163, y: -401} + m_AnchoredPosition: {x: -198.40002, y: -401} m_SizeDelta: {x: 63, y: 63} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8950946151688576739 @@ -671,14 +748,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0.832973, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 550707a65a319694390f44236e7fb115, type: 3} + m_Sprite: {fileID: 21300000, guid: a54494efde92b524a8d4a94cfaa7f841, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -705,7 +782,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2462013288784083471 RectTransform: m_ObjectHideFlags: 0 @@ -719,11 +796,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757095760799} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -98, y: -401} + m_AnchoredPosition: {x: -64.900024, y: -401} m_SizeDelta: {x: 63, y: 63} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7347438502378141645 @@ -747,14 +824,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0.832973, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 47151d0a76caf674fbc2ec27fc4a0f94, type: 3} + m_Sprite: {fileID: 21300000, guid: a54494efde92b524a8d4a94cfaa7f841, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -795,7 +872,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757095760799} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -971,7 +1048,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -163, y: -339} + m_AnchoredPosition: {x: -198.4, y: -339} m_SizeDelta: {x: 63, y: 63} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4036161232695281854 @@ -995,14 +1072,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0.832973, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 47151d0a76caf674fbc2ec27fc4a0f94, type: 3} + m_Sprite: {fileID: 21300000, guid: a54494efde92b524a8d4a94cfaa7f841, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1096,6 +1173,82 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &7294958316878599169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6983062348909698928} + - component: {fileID: 6718141392749805882} + - component: {fileID: 570926100917831825} + m_Layer: 0 + m_Name: ShapeTopCenter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6983062348909698928 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7294958316878599169} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1499098757095760799} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -124.399994, y: -339} + m_SizeDelta: {x: 63, y: 63} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6718141392749805882 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7294958316878599169} + m_CullTransparentMesh: 1 +--- !u!114 &570926100917831825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7294958316878599169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a54494efde92b524a8d4a94cfaa7f841, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7985489786620569223 GameObject: m_ObjectHideFlags: 0 diff --git a/namedropper/Assets/Prefabs/Player Prefab.prefab b/namedropper/Assets/Prefabs/Player Prefab.prefab index f702b1f..f62b607 100644 --- a/namedropper/Assets/Prefabs/Player Prefab.prefab +++ b/namedropper/Assets/Prefabs/Player Prefab.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &482762097022507376 RectTransform: m_ObjectHideFlags: 0 @@ -36,7 +36,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -35.1, y: 29.9} - m_SizeDelta: {x: 63, y: 63} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4904156822027773180 CanvasRenderer: @@ -112,7 +112,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 29.900024, y: -32.099976} - m_SizeDelta: {x: 63, y: 63} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1335345286637122339 CanvasRenderer: @@ -627,8 +627,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 29.900024, y: 29.900024} - m_SizeDelta: {x: 63, y: 63} + m_AnchoredPosition: {x: -6.4, y: 29.900024} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7158204951566801307 CanvasRenderer: @@ -704,7 +704,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -35.099976, y: -32.099976} - m_SizeDelta: {x: 63, y: 63} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7224489468790740980 CanvasRenderer: @@ -899,7 +899,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _shapeSprites: - - {fileID: 482245573507682842} - - {fileID: 9032701300591666026} - {fileID: 8283750470600269748} + - {fileID: 9032701300591666026} - {fileID: 1933936841026696079} diff --git a/namedropper/Assets/Resources/shapes/circle-none.png b/namedropper/Assets/Resources/shapes/circle-none.png deleted file mode 100644 index fcdca1c..0000000 Binary files a/namedropper/Assets/Resources/shapes/circle-none.png and /dev/null differ diff --git a/namedropper/Assets/Resources/shapes/circle-none.png.meta b/namedropper/Assets/Resources/shapes/circle-none.png.meta deleted file mode 100644 index 20a87f7..0000000 --- a/namedropper/Assets/Resources/shapes/circle-none.png.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 028fe2231befff94bb5354e0d89e0a89 -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: 1 - wrapV: 1 - wrapW: 1 - 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: 1 - 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: 2048 - 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 - 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: diff --git a/namedropper/Assets/Resources/shapes/circle-solid.png b/namedropper/Assets/Resources/shapes/circle-solid.png deleted file mode 100644 index 7eaf9e6..0000000 Binary files a/namedropper/Assets/Resources/shapes/circle-solid.png and /dev/null differ diff --git a/namedropper/Assets/Resources/shapes/circle-striped.png b/namedropper/Assets/Resources/shapes/circle-striped.png deleted file mode 100644 index d24cff3..0000000 Binary files a/namedropper/Assets/Resources/shapes/circle-striped.png and /dev/null differ diff --git a/namedropper/Assets/Resources/shapes/circle.png b/namedropper/Assets/Resources/shapes/circle.png new file mode 100644 index 0000000..859abf0 Binary files /dev/null and b/namedropper/Assets/Resources/shapes/circle.png differ diff --git a/namedropper/Assets/Resources/shapes/circle-striped.png.meta b/namedropper/Assets/Resources/shapes/circle.png.meta similarity index 97% rename from namedropper/Assets/Resources/shapes/circle-striped.png.meta rename to namedropper/Assets/Resources/shapes/circle.png.meta index a8cfd9f..27e4167 100644 --- a/namedropper/Assets/Resources/shapes/circle-striped.png.meta +++ b/namedropper/Assets/Resources/shapes/circle.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 86051e82417c1914a8e6752b99eed6fd +guid: 29c9a7bdd71327e479ca1f32b14d99ef TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 8 + spritePixelsToUnits: 9 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/namedropper/Assets/Resources/shapes/diamond-none.png.meta b/namedropper/Assets/Resources/shapes/diamond-none.png.meta deleted file mode 100644 index 3dc5876..0000000 --- a/namedropper/Assets/Resources/shapes/diamond-none.png.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: d9d906d1681558447b577ef9950224c4 -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: 1 - wrapV: 1 - wrapW: 1 - 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: 1 - 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: 2048 - 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 - 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: diff --git a/namedropper/Assets/Resources/shapes/diamond-solid.png b/namedropper/Assets/Resources/shapes/diamond-solid.png deleted file mode 100644 index fe863de..0000000 Binary files a/namedropper/Assets/Resources/shapes/diamond-solid.png and /dev/null differ diff --git a/namedropper/Assets/Resources/shapes/diamond-solid.png.meta b/namedropper/Assets/Resources/shapes/diamond-solid.png.meta deleted file mode 100644 index e951777..0000000 --- a/namedropper/Assets/Resources/shapes/diamond-solid.png.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 5d8308d817c996948820c79df95039d4 -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: 1 - wrapV: 1 - wrapW: 1 - 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: 1 - 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: 2048 - 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 - 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: diff --git a/namedropper/Assets/Resources/shapes/diamond-striped.png b/namedropper/Assets/Resources/shapes/diamond-striped.png deleted file mode 100644 index f2ffc06..0000000 Binary files a/namedropper/Assets/Resources/shapes/diamond-striped.png and /dev/null differ diff --git a/namedropper/Assets/Resources/shapes/diamond-none.png b/namedropper/Assets/Resources/shapes/diamond.png similarity index 98% rename from namedropper/Assets/Resources/shapes/diamond-none.png rename to namedropper/Assets/Resources/shapes/diamond.png index 23f7891..fe1dcbe 100644 Binary files a/namedropper/Assets/Resources/shapes/diamond-none.png and b/namedropper/Assets/Resources/shapes/diamond.png differ diff --git a/namedropper/Assets/Resources/shapes/diamond-striped.png.meta b/namedropper/Assets/Resources/shapes/diamond.png.meta similarity index 97% rename from namedropper/Assets/Resources/shapes/diamond-striped.png.meta rename to namedropper/Assets/Resources/shapes/diamond.png.meta index 880f0b6..a82ff50 100644 --- a/namedropper/Assets/Resources/shapes/diamond-striped.png.meta +++ b/namedropper/Assets/Resources/shapes/diamond.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 550707a65a319694390f44236e7fb115 +guid: a54494efde92b524a8d4a94cfaa7f841 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 8 + spritePixelsToUnits: 9 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/namedropper/Assets/Resources/shapes/heart.png b/namedropper/Assets/Resources/shapes/heart.png new file mode 100644 index 0000000..639c714 Binary files /dev/null and b/namedropper/Assets/Resources/shapes/heart.png differ diff --git a/namedropper/Assets/Resources/shapes/triangle-striped.png.meta b/namedropper/Assets/Resources/shapes/heart.png.meta similarity index 97% rename from namedropper/Assets/Resources/shapes/triangle-striped.png.meta rename to namedropper/Assets/Resources/shapes/heart.png.meta index 526ddd8..e731d22 100644 --- a/namedropper/Assets/Resources/shapes/triangle-striped.png.meta +++ b/namedropper/Assets/Resources/shapes/heart.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 344c82e8c19e4c1488a0c58bf991af0a +guid: 0b7646c8a3b310f41b5afd6fe45f388a TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 8 + spritePixelsToUnits: 9 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/namedropper/Assets/Resources/shapes/hourglass.png b/namedropper/Assets/Resources/shapes/hourglass.png new file mode 100644 index 0000000..fe8d881 Binary files /dev/null and b/namedropper/Assets/Resources/shapes/hourglass.png differ diff --git a/namedropper/Assets/Resources/shapes/circle-solid.png.meta b/namedropper/Assets/Resources/shapes/hourglass.png.meta similarity index 97% rename from namedropper/Assets/Resources/shapes/circle-solid.png.meta rename to namedropper/Assets/Resources/shapes/hourglass.png.meta index 73150fd..700ddbe 100644 --- a/namedropper/Assets/Resources/shapes/circle-solid.png.meta +++ b/namedropper/Assets/Resources/shapes/hourglass.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 33c4632329ed20f4d91996fd8e3e429f +guid: 8a37d6aac502e5a43bc4a7498bf1a759 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 9 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/namedropper/Assets/Resources/shapes/spade.png b/namedropper/Assets/Resources/shapes/spade.png new file mode 100644 index 0000000..8dcdc7c Binary files /dev/null and b/namedropper/Assets/Resources/shapes/spade.png differ diff --git a/namedropper/Assets/Resources/shapes/spade.png.meta b/namedropper/Assets/Resources/shapes/spade.png.meta new file mode 100644 index 0000000..c73c4e7 --- /dev/null +++ b/namedropper/Assets/Resources/shapes/spade.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 10da3d99fb1f91345b7758e4315b907b +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: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 9 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + 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: 2048 + 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 + 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: diff --git a/namedropper/Assets/Resources/shapes/square.png b/namedropper/Assets/Resources/shapes/square.png new file mode 100644 index 0000000..ceeb523 Binary files /dev/null and b/namedropper/Assets/Resources/shapes/square.png differ diff --git a/namedropper/Assets/Resources/shapes/square.png.meta b/namedropper/Assets/Resources/shapes/square.png.meta new file mode 100644 index 0000000..7d0efd3 --- /dev/null +++ b/namedropper/Assets/Resources/shapes/square.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 2437f34789bce7f44a4574b047e5b86e +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: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 9 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + 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: 2048 + 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 + 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: diff --git a/namedropper/Assets/Resources/shapes/star.png b/namedropper/Assets/Resources/shapes/star.png new file mode 100644 index 0000000..c493d5c Binary files /dev/null and b/namedropper/Assets/Resources/shapes/star.png differ diff --git a/namedropper/Assets/Resources/shapes/star.png.meta b/namedropper/Assets/Resources/shapes/star.png.meta new file mode 100644 index 0000000..c5fdba9 --- /dev/null +++ b/namedropper/Assets/Resources/shapes/star.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 0dd1fab3f4264c54c9669b0270cb29e3 +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: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 9 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + 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: 2048 + 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 + 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: diff --git a/namedropper/Assets/Resources/shapes/triangle-none.png b/namedropper/Assets/Resources/shapes/triangle-none.png deleted file mode 100644 index 38e854c..0000000 Binary files a/namedropper/Assets/Resources/shapes/triangle-none.png and /dev/null differ diff --git a/namedropper/Assets/Resources/shapes/triangle-none.png.meta b/namedropper/Assets/Resources/shapes/triangle-none.png.meta deleted file mode 100644 index 20c4f9e..0000000 --- a/namedropper/Assets/Resources/shapes/triangle-none.png.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: f567efcf826945f4f911aa4b15693f4c -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: 1 - wrapV: 1 - wrapW: 1 - 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: 1 - 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: 2048 - 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 - 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: diff --git a/namedropper/Assets/Resources/shapes/triangle-solid.png b/namedropper/Assets/Resources/shapes/triangle-solid.png deleted file mode 100644 index e84dc55..0000000 Binary files a/namedropper/Assets/Resources/shapes/triangle-solid.png and /dev/null differ diff --git a/namedropper/Assets/Resources/shapes/triangle-solid.png.meta b/namedropper/Assets/Resources/shapes/triangle-solid.png.meta deleted file mode 100644 index e8b5ffb..0000000 --- a/namedropper/Assets/Resources/shapes/triangle-solid.png.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: 04544b57d37fa6744a2b8c9f36185765 -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: 1 - wrapV: 1 - wrapW: 1 - 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: 1 - 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: 2048 - 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 - 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: diff --git a/namedropper/Assets/Resources/shapes/triangle-striped.png b/namedropper/Assets/Resources/shapes/triangle-striped.png deleted file mode 100644 index a8e1193..0000000 Binary files a/namedropper/Assets/Resources/shapes/triangle-striped.png and /dev/null differ diff --git a/namedropper/Assets/Resources/shapes/triangle.png b/namedropper/Assets/Resources/shapes/triangle.png new file mode 100644 index 0000000..0c3e908 Binary files /dev/null and b/namedropper/Assets/Resources/shapes/triangle.png differ diff --git a/namedropper/Assets/Resources/shapes/triangle.png.meta b/namedropper/Assets/Resources/shapes/triangle.png.meta new file mode 100644 index 0000000..7d34e3e --- /dev/null +++ b/namedropper/Assets/Resources/shapes/triangle.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 15900d8584225b348b9c469c3cf04e66 +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: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 9 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + 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: 2048 + 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 + 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: diff --git a/namedropper/Assets/Resources/shapes/x.png b/namedropper/Assets/Resources/shapes/x.png new file mode 100644 index 0000000..68b28d1 Binary files /dev/null and b/namedropper/Assets/Resources/shapes/x.png differ diff --git a/namedropper/Assets/Resources/shapes/x.png.meta b/namedropper/Assets/Resources/shapes/x.png.meta new file mode 100644 index 0000000..cad704b --- /dev/null +++ b/namedropper/Assets/Resources/shapes/x.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 8d32c20519afb5a4d813d92949142f26 +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: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 9 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + 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: 2048 + 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 + 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: diff --git a/namedropper/Assets/Scripts/CardData.cs b/namedropper/Assets/Scripts/CardData.cs index 9438805..ce7eb82 100644 --- a/namedropper/Assets/Scripts/CardData.cs +++ b/namedropper/Assets/Scripts/CardData.cs @@ -9,36 +9,64 @@ public class CardData { public enum Shape { - TRIANGLE, + NONE, CIRCLE, - DIAMOND + DIAMOND, + //HEART, + HOURGLASS, + //SPADE, + //SQUARE, + STAR, + TRIANGLE, + X } - public Shape _shape; + public Shape[] _shapes; - public enum Fill + public int CompareMatches(CardData otherCardData) { - NONE, - SOLID, - STRIPED - } + int score = 0; + Shape[] tempOtherShapes = new Shape[otherCardData._shapes.Length]; - public Fill _fill; + for (int j = 0; j < otherCardData._shapes.Length; j++) + { + tempOtherShapes[j] = otherCardData._shapes[j]; + } - public int _number; + for (int i = 0; i < _shapes.Length; i++) + { + for (int j = 0; j < tempOtherShapes.Length; j++) + { + if (_shapes[i] == tempOtherShapes[j]) + { + score++; + tempOtherShapes[j] = Shape.NONE; + break; + } + } + } - public void Randomize() - { - _number = UnityEngine.Random.Range(1, 5); + return score; + } + public void Randomize(int count) + { + _shapes = new Shape[count]; var rnd = new System.Random(Guid.NewGuid().GetHashCode()); - _shape = (Shape)rnd.Next(Enum.GetNames(typeof(Shape)).Length); - _fill = (Fill)rnd.Next(Enum.GetNames(typeof(Fill)).Length); + + for (int i = 0; i < count; i++) + { + do + { + _shapes[i] = (Shape)rnd.Next(Enum.GetNames(typeof(Shape)).Length); + } + while (_shapes[i] == Shape.NONE); + } } - public Sprite GetSprite() + public Sprite GetSprite(int i) { - string filename = "shapes/" + _shape.ToString().ToLower() + "-" + _fill.ToString().ToLower(); + string filename = "shapes/" + _shapes[i].ToString().ToLower(); Debug.Log("loading: " + filename); return Resources.Load(filename); } diff --git a/namedropper/Assets/Scripts/GameManager.cs b/namedropper/Assets/Scripts/GameManager.cs index 8532914..63c924f 100644 --- a/namedropper/Assets/Scripts/GameManager.cs +++ b/namedropper/Assets/Scripts/GameManager.cs @@ -19,7 +19,7 @@ public class GameManager int _round = 1; public bool[] PlayerJoined = new bool[4]; - public static bool MINIGAMES = true; + public static bool MINIGAMES = false; public static int PLAYER_SKIN = 5; //0 == puck, 1 == pancake, 2 == gummybear, 3==pig, 4==ball w/ bear, 5==pop public static int MAX_PLAYER_SKIN = 5; public static int MVP = -1; diff --git a/namedropper/Assets/Scripts/JoinPlayer.cs b/namedropper/Assets/Scripts/JoinPlayer.cs index cb7fff8..444ac7d 100644 --- a/namedropper/Assets/Scripts/JoinPlayer.cs +++ b/namedropper/Assets/Scripts/JoinPlayer.cs @@ -100,10 +100,13 @@ public class JoinPlayer : MonoBehaviour void GotoFirstScene() { + /* if (GameManager.MINIGAMES) SceneManager.LoadScene("Wheel Scene"); else SceneManager.LoadScene("TopicSelect"); + */ + SceneManager.LoadScene("Game"); } void Redo() diff --git a/namedropper/Assets/Scripts/Level.cs b/namedropper/Assets/Scripts/Level.cs index 831f7d4..1bb55db 100644 --- a/namedropper/Assets/Scripts/Level.cs +++ b/namedropper/Assets/Scripts/Level.cs @@ -189,7 +189,7 @@ public class Level : MonoBehaviour { SceneManager.LoadScene("GameOver"); } - else if (GameManager.Instance.Round == 3 && GameManager.MINIGAMES == false) + else if (GameManager.Instance.Round == 3 && GameManager.MINIGAMES == false && false) { SceneManager.LoadScene("ChallengingStage"); } @@ -198,7 +198,7 @@ public class Level : MonoBehaviour if (GameManager.MINIGAMES) SceneManager.LoadScene("Wheel Scene"); else - SceneManager.LoadScene("TopicSelect"); + SceneManager.LoadScene("Game"); } } } diff --git a/namedropper/Assets/Scripts/Player.cs b/namedropper/Assets/Scripts/Player.cs index 3649878..759c811 100644 --- a/namedropper/Assets/Scripts/Player.cs +++ b/namedropper/Assets/Scripts/Player.cs @@ -225,6 +225,34 @@ public class Player : MonoBehaviour private void OnTriggerEnter2D(Collider2D collision) { + //join + JoinGameBox joinGameBox = collision.gameObject.GetComponent(); + if (joinGameBox != null) + { + /* + //destroy the other player picker + NumPlayerPicker[] playerPickers = GameObject.FindObjectsOfType(); + foreach (NumPlayerPicker pp in playerPickers) + { + if (pp != numPlayerPicker) + { + GameObject.Destroy(pp.gameObject); + } + } + */ + JoinPlayer jp = GameObject.FindObjectOfType(); + jp.Join(); + + this.gameObject.SetActive(false); + GameManager.Instance.PlayerJoined[_playerNumber] = true; + //StartCountdown(); + + //if (_joinedPlayers) + //Invoke("LoadTopicSelect", 2f); + //LoadGame(); + //Invoke("LoadGame", 1f); + return; + } CardData categoryCardData = collision.gameObject.GetComponent()._cardData; @@ -234,6 +262,9 @@ public class Player : MonoBehaviour int score = 0; string message = ""; CardData myCardData = GetComponent()._cardData; + score = myCardData.CompareMatches(categoryCardData); + collision.gameObject.GetComponent().Redraw(); + /* if (categoryCardData._shape == myCardData._shape) { score++; message += "Shape\n"; @@ -250,9 +281,10 @@ public class Player : MonoBehaviour score++; message += "Count\n"; } + */ Category category = collision.gameObject.GetComponent(); - category.ShowFeedbackBad(message); + category.ShowFeedbackBad(score.ToString()); category.AddScore(score, _team); this.gameObject.SetActive(false); @@ -339,33 +371,7 @@ public class Player : MonoBehaviour //Invoke("LoadGame", 1f); } - //join - JoinGameBox joinGameBox = collision.gameObject.GetComponent(); - if (joinGameBox != null) - { - /* - //destroy the other player picker - NumPlayerPicker[] playerPickers = GameObject.FindObjectsOfType(); - foreach (NumPlayerPicker pp in playerPickers) - { - if (pp != numPlayerPicker) - { - GameObject.Destroy(pp.gameObject); - } - } - */ - JoinPlayer jp = GameObject.FindObjectOfType(); - jp.Join(); - - this.gameObject.SetActive(false); - GameManager.Instance.PlayerJoined[_playerNumber] = true; - //StartCountdown(); - - //if (_joinedPlayers) - //Invoke("LoadTopicSelect", 2f); - //LoadGame(); - //Invoke("LoadGame", 1f); - } + //calibration box CalibrationBox calibrationBox = collision.gameObject.GetComponent();