Skip to content

Commit

Permalink
new health and mana icons
Browse files Browse the repository at this point in the history
  • Loading branch information
leon-arndt committed Jan 3, 2023
1 parent 8290a4f commit 9eec8be
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 1 deletion.
Binary file modified Assets/2D/Sprites/heart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/2D/Sprites/mana.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
136 changes: 136 additions & 0 deletions Assets/2D/Sprites/mana.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 22 additions & 1 deletion Assets/Prefabs/UI/InGameCanvas.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1605,6 +1605,7 @@ Canvas:
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
Expand Down Expand Up @@ -2616,7 +2617,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 64a98c05e8c3e4fcd8652259830bd8dd, type: 3}
m_Sprite: {fileID: 21300000, guid: b9c13ca4c70cb194a82f611769c6030e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -2868,6 +2869,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4466309659932527594}
m_Modifications:
- target: {fileID: 1737000127117592281, guid: f272fb38aad2d714383b3f1a31405067,
Expand Down Expand Up @@ -2981,6 +2983,9 @@ PrefabInstance:
value: SkillPanel
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f272fb38aad2d714383b3f1a31405067, type: 3}
--- !u!224 &4466309660091371567 stripped
RectTransform:
Expand All @@ -2993,6 +2998,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 8823912626799881647}
m_Modifications:
- target: {fileID: 2080849586138877250, guid: 8aa34285d70b9794b90d246a00c85c85,
Expand Down Expand Up @@ -3111,6 +3117,9 @@ PrefabInstance:
value: MathAnswerView (3)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8aa34285d70b9794b90d246a00c85c85, type: 3}
--- !u!114 &2025868487112326348 stripped
MonoBehaviour:
Expand All @@ -3135,6 +3144,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 8823912626799881647}
m_Modifications:
- target: {fileID: 2080849586138877250, guid: 8aa34285d70b9794b90d246a00c85c85,
Expand Down Expand Up @@ -3253,6 +3263,9 @@ PrefabInstance:
value: MathAnswerView (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8aa34285d70b9794b90d246a00c85c85, type: 3}
--- !u!114 &1322523968922346757 stripped
MonoBehaviour:
Expand All @@ -3277,6 +3290,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 8823912626799881647}
m_Modifications:
- target: {fileID: 2080849586138877250, guid: 8aa34285d70b9794b90d246a00c85c85,
Expand Down Expand Up @@ -3395,6 +3409,9 @@ PrefabInstance:
value: MathAnswerView (2)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8aa34285d70b9794b90d246a00c85c85, type: 3}
--- !u!114 &1619160689449561813 stripped
MonoBehaviour:
Expand All @@ -3419,6 +3436,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 8823912626799881647}
m_Modifications:
- target: {fileID: 2080849586138877250, guid: 8aa34285d70b9794b90d246a00c85c85,
Expand Down Expand Up @@ -3537,6 +3555,9 @@ PrefabInstance:
value: MathAnswerView
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8aa34285d70b9794b90d246a00c85c85, type: 3}
--- !u!224 &6523996780100014862 stripped
RectTransform:
Expand Down

0 comments on commit 9eec8be

Please sign in to comment.