Browse Source

slightly better shields and feedback

shapes
Josh 1 year ago
parent
commit
2ca3d59426
  1. 4
      namedropper/Assets/Prefabs/Category Prefab.prefab
  2. 8
      namedropper/Assets/Scripts/Category.cs
  3. 8
      namedropper/Assets/Scripts/GameDataManager.cs
  4. BIN
      namedropper/Assets/patterns/pink and purple halftone.jpg
  5. BIN
      namedropper/Assets/patterns/red and orange halftone.jpg
  6. BIN
      namedropper/Assets/patterns/xred and orange halftone.jpg
  7. 16
      namedropper/Assets/patterns/xred and orange halftone.jpg.meta

4
namedropper/Assets/Prefabs/Category Prefab.prefab

@ -552,7 +552,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 500, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!23 &5950246395176158827 --- !u!23 &5950246395176158827
@ -1114,7 +1114,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7182421569596414056} m_GameObject: {fileID: 7182421569596414056}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} 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_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []

8
namedropper/Assets/Scripts/Category.cs

@ -79,10 +79,13 @@ 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; Color newColor = Color.white;
if (_color == Player.Team.GREEN) if (_color == Player.Team.GREEN)
{ {
@ -93,6 +96,7 @@ public class Category : MonoBehaviour
newColor = Color.red; newColor = Color.red;
} }
this.transform.Find("CategoryBox").gameObject.GetComponent<SpriteRenderer>().color = newColor; this.transform.Find("CategoryBox").gameObject.GetComponent<SpriteRenderer>().color = newColor;
_shieldsText.color = newColor;
} }
public void ShowFeedbackBad(string wrongAnswer) public void ShowFeedbackBad(string wrongAnswer)
{ {

8
namedropper/Assets/Scripts/GameDataManager.cs

@ -41,12 +41,12 @@ public class GameDataManager {
int categoryIndex = Random.Range(0, topicData.Categories.Count); int categoryIndex = Random.Range(0, topicData.Categories.Count);
CategoryData categoryData = topicData.Categories[categoryIndex]; //CategoryData categoryData = topicData.Categories[categoryIndex];
if (removeFromTopic) //if (removeFromTopic)
topicData.Categories.RemoveAt(categoryIndex); // topicData.Categories.RemoveAt(categoryIndex);
return categoryData; return null;
} }
public static GameDataManager Instance public static GameDataManager Instance

BIN
namedropper/Assets/patterns/pink and purple halftone.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

BIN
namedropper/Assets/patterns/red and orange halftone.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 68 KiB

BIN
namedropper/Assets/patterns/xred and orange halftone.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

16
namedropper/Assets/patterns/pink and purple halftone.jpg.meta → namedropper/Assets/patterns/xred and orange halftone.jpg.meta

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: b8766938355546740a8ab9ae748f4eac guid: 374644b0af4d9eb4887a207ec460d003
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}
@ -24,6 +24,7 @@ TextureImporter:
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
vTOnly: 0 vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
@ -88,6 +89,18 @@ TextureImporter:
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 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: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
@ -101,6 +114,7 @@ TextureImporter:
edges: [] edges: []
weights: [] weights: []
secondaryTextures: [] secondaryTextures: []
nameFileIdTable: {}
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
Loading…
Cancel
Save