Skip to content

UI sprites split from atlas and TextMeshPro part 2 #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 1, 2021
Merged

UI sprites split from atlas and TextMeshPro part 2 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8db51d3
All UI elements except pop-up panels and Char select use TMP for all …
FPaizSF Mar 25, 2021
39827fb
re-adding default TMP assets
FPaizSF Mar 25, 2021
b8847c4
moved all sprites from ui_atlas into their own png files. renamed som…
FPaizSF Mar 25, 2021
a7774bf
WIP on pop-up panel
FPaizSF Mar 26, 2021
95b4c4e
taking develop merge
dwoodruffsf Mar 26, 2021
ba6274d
setup sprites and text for help panel
FPaizSF Mar 29, 2021
a9dc73c
font outlines settings are now in material presets
FPaizSF Mar 29, 2021
5f07d27
Char select and pop up panels use text mesh pro
FPaizSF Mar 29, 2021
f7083ab
merge from develop
FPaizSF Mar 29, 2021
1dae68d
taking develop merge
dwoodruffsf Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Assets/BossRoom/Fonts/Bungee-Regular SDF.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/Fonts/Roboto-Bold SDF.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Archer/ArcherBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Archer/ArcherChargedShot.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Archer/ArcherVolley.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Mage/MageBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Mage/MageHeal.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Rogue/RogueBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Rogue/RogueStealthMode.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Tank/TankBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Tank/TankShieldBuff.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/BossRoom/GameData/Action/Tank/TankShieldRush.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Character/Archer.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Character/Mage.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Character/Rogue.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Character/Tank.asset
View file
Open in desktop
Git LFS file not shown
6 changes: 3 additions & 3 deletions Assets/BossRoom/Prefabs/UI/AllyHUD.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -6230944662187124400, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
m_Sprite: {fileID: 21300000, guid: ac1ab0ffbf410094088db89d509a3a4a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -140,7 +140,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 3523798857041549916, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
m_Sprite: {fileID: 21300000, guid: ef7d52c26ae87e242b4274a30a69ab08, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -251,7 +251,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -720397744737086521, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
m_Sprite: {fileID: 21300000, guid: 276e272d29e17bd49abbcb6deda9c561, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down
32 changes: 16 additions & 16 deletions Assets/BossRoom/Prefabs/UI/Hero Action Bar.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 653711104564485137, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
m_Sprite: {fileID: 21300000, guid: 5fdcfd84d63238f49a0e5c12909e9901, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -358,7 +358,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 4629006799232479851, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
m_Sprite: {fileID: 21300000, guid: b9e99c5047610c0428b75996339649f7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -570,7 +570,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -2825189325306509334, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
m_Sprite: {fileID: 21300000, guid: cb875d631ae24fa4ca2ede5d055c53bf, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -760,21 +760,21 @@ MonoBehaviour:
- {fileID: 9059929381413149708}
m_EmotePanel: {fileID: 0}
m_TankIcons:
- {fileID: 1540522687219259310, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
- {fileID: -4296359016634765864, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
- {fileID: -2388657405067991389, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
- {fileID: 21300000, guid: c545bd0fd28c988429e5f9aa9d5f5979, type: 3}
- {fileID: 21300000, guid: 7113c11aec341254daf7144dec1cd2eb, type: 3}
- {fileID: 21300000, guid: e0d81ae7bf3334548ab3d2f83dc777e1, type: 3}
m_ArcherIcons:
- {fileID: -86643989335773967, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
- {fileID: -648594524209405482, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
- {fileID: -648594524209405482, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
- {fileID: 21300000, guid: 81a26dad52a33d44db38d191f7a1b6a0, type: 3}
- {fileID: 21300000, guid: 4938c18455b902748ba6007690f999ff, type: 3}
- {fileID: 21300000, guid: a6ec8825aed32a4429df5e20eb9a9986, type: 3}
m_RogueIcons:
- {fileID: -5674376572046109326, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
- {fileID: -538430575990610775, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
- {fileID: -1472494204491392689, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
- {fileID: 21300000, guid: d77f9608d8f7ff843a09227abdf39463, type: 3}
- {fileID: 21300000, guid: 398025be84a763e4c9438505f0c020aa, type: 3}
- {fileID: 21300000, guid: 3b685d5ba0e7bc44bb122a5c8252668e, type: 3}
m_MageIcons:
- {fileID: 4629006799232479851, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
- {fileID: 2812619407168195412, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
- {fileID: 653711104564485137, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
- {fileID: 21300000, guid: b9e99c5047610c0428b75996339649f7, type: 3}
- {fileID: 21300000, guid: 9840d62bc2dd2074cb672acb47b92e03, type: 3}
- {fileID: 21300000, guid: 5fdcfd84d63238f49a0e5c12909e9901, type: 3}
--- !u!1 &9059929381734582208
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -842,7 +842,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 2812619407168195412, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
m_Sprite: {fileID: 21300000, guid: 9840d62bc2dd2074cb672acb47b92e03, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down
13 changes: 4 additions & 9 deletions Assets/BossRoom/Prefabs/UI/Hero Emote Bar.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 3560111661982681200, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
m_Sprite: {fileID: 21300000, guid: 0c93d17ba64cd5e4bb6b16d840df0d1d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -437,7 +437,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 1866683241425957968, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
m_Sprite: {fileID: 21300000, guid: 3823a418dc4ce2644b374b9ae95fbd7a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -570,7 +570,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 8603631976929927373, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
m_Sprite: {fileID: 21300000, guid: a227c692fe57f8847be119f493ebc848, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -753,11 +753,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6186abc45a9f82542a1f46850a0a20a1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Buttons:
- {fileID: 7109257143461247493}
- {fileID: 7109257144072312886}
- {fileID: 7109257144468149070}
- {fileID: 7109257143859656615}
--- !u!1 &7109257144468149064
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -825,7 +820,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -8245234026199263008, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3}
m_Sprite: {fileID: 21300000, guid: 939464c9272031d4c983c7e1a7568d84, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down
Loading