diff --git a/namedropper/Assets/Prefabs/Category Prefab.prefab b/namedropper/Assets/Prefabs/Category Prefab.prefab index af64acc..1a83b80 100644 --- a/namedropper/Assets/Prefabs/Category Prefab.prefab +++ b/namedropper/Assets/Prefabs/Category Prefab.prefab @@ -552,7 +552,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: -122.7, y: -160.7} + m_AnchoredPosition: {x: -122.7, y: -228.3} m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &5950246395176158827 @@ -1114,7 +1114,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7182421569596414056} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -127.20996, y: -243, z: 188.9996} + m_LocalPosition: {x: -127.20996, y: -276.4, z: 188.9996} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/namedropper/Assets/Scripts/Category.cs b/namedropper/Assets/Scripts/Category.cs index fccf6c3..b3e51a4 100644 --- a/namedropper/Assets/Scripts/Category.cs +++ b/namedropper/Assets/Scripts/Category.cs @@ -79,9 +79,12 @@ public class Category : MonoBehaviour } } - _shieldsText.text = _shields.ToString(); - if (_shields == 0) - _shieldsText.text = ""; + _shieldsText.text = ""; + + for (int i=0; i < _shields; i++) + { + _shieldsText.text += "O"; + } Color newColor = Color.white; if (_color == Player.Team.GREEN) @@ -93,6 +96,7 @@ public class Category : MonoBehaviour newColor = Color.red; } this.transform.Find("CategoryBox").gameObject.GetComponent().color = newColor; + _shieldsText.color = newColor; } public void ShowFeedbackBad(string wrongAnswer) { diff --git a/namedropper/Assets/Scripts/GameDataManager.cs b/namedropper/Assets/Scripts/GameDataManager.cs index f687cf0..a129628 100644 --- a/namedropper/Assets/Scripts/GameDataManager.cs +++ b/namedropper/Assets/Scripts/GameDataManager.cs @@ -41,12 +41,12 @@ public class GameDataManager { int categoryIndex = Random.Range(0, topicData.Categories.Count); - CategoryData categoryData = topicData.Categories[categoryIndex]; + //CategoryData categoryData = topicData.Categories[categoryIndex]; - if (removeFromTopic) - topicData.Categories.RemoveAt(categoryIndex); + //if (removeFromTopic) + // topicData.Categories.RemoveAt(categoryIndex); - return categoryData; + return null; } public static GameDataManager Instance diff --git a/namedropper/Assets/patterns/pink and purple halftone.jpg b/namedropper/Assets/patterns/pink and purple halftone.jpg deleted file mode 100644 index db64b24..0000000 Binary files a/namedropper/Assets/patterns/pink and purple halftone.jpg and /dev/null differ diff --git a/namedropper/Assets/patterns/red and orange halftone.jpg b/namedropper/Assets/patterns/red and orange halftone.jpg index 45eae9a..db64b24 100644 Binary files a/namedropper/Assets/patterns/red and orange halftone.jpg and b/namedropper/Assets/patterns/red and orange halftone.jpg differ diff --git a/namedropper/Assets/patterns/xred and orange halftone.jpg b/namedropper/Assets/patterns/xred and orange halftone.jpg new file mode 100644 index 0000000..45eae9a Binary files /dev/null and b/namedropper/Assets/patterns/xred and orange halftone.jpg differ diff --git a/namedropper/Assets/patterns/pink and purple halftone.jpg.meta b/namedropper/Assets/patterns/xred and orange halftone.jpg.meta similarity index 85% rename from namedropper/Assets/patterns/pink and purple halftone.jpg.meta rename to namedropper/Assets/patterns/xred and orange halftone.jpg.meta index 21cff2f..dd15ce7 100644 --- a/namedropper/Assets/patterns/pink and purple halftone.jpg.meta +++ b/namedropper/Assets/patterns/xred and orange halftone.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b8766938355546740a8ab9ae748f4eac +guid: 374644b0af4d9eb4887a207ec460d003 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -88,6 +89,18 @@ TextureImporter: 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: [] @@ -101,6 +114,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0