Skip to content

Commit

Permalink
Merge pull request PunicGames#275 from PunicGames/perks-mejoras
Browse files Browse the repository at this point in the history
mejoras
  • Loading branch information
Alvaroolav3D authored Dec 11, 2022
2 parents 5a5ec0a + 2b1a0d3 commit 50e9f18
Show file tree
Hide file tree
Showing 7 changed files with 255 additions and 23 deletions.
10 changes: 5 additions & 5 deletions Assets/Prefabs/Menu & UI's/InGameUI.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -13352,7 +13352,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'If you want to survive in this hell of a factory...
m_text: 'If you want to survive in this hell of a factory...

'
m_isRightToLeft: 0
Expand Down Expand Up @@ -14165,7 +14165,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2678066201739892489
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -17915,7 +17915,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6317922655147991132
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -20314,11 +20314,11 @@ MonoBehaviour:
- {fileID: 21300000, guid: 11dbb3531b47f4443a23b7068413eccd, type: 3}
- {fileID: 21300000, guid: 0a129518ce506c443b585d6db9cbe588, type: 3}
- {fileID: 21300000, guid: 9883da11b9015ca42af56bba585eb0fa, type: 3}
- {fileID: 21300000, guid: c606fd292ade4674cb3df0924c3f66d3, type: 3}
- {fileID: 21300000, guid: 68cfe17ca7beed843824c1b659128822, type: 3}
- {fileID: 21300000, guid: 38a6fd442dd398642b14e64b286dbbde, type: 3}
- {fileID: 21300000, guid: ed33c98c3756c474598c10432887b131, type: 3}
- {fileID: 21300000, guid: 821b3f661534e354e96ea075c25512b1, type: 3}
- {fileID: 21300000, guid: bad7d8fcf0a40724eb20d1d0c2663e3d, type: 3}
- {fileID: 21300000, guid: c14eb7e44609e8a40bb7ba0d34b6f9b6, type: 3}
spritesGuns:
- {fileID: 21300000, guid: 9515b9fa45bad854a8722c5c6bb7b50a, type: 3}
- {fileID: 21300000, guid: 08f7f6ea5cd589d42b6afc30b0534f72, type: 3}
Expand Down
8 changes: 4 additions & 4 deletions Assets/Prefabs/Menu & UI's/TutorialMenu.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -3869,7 +3869,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1602220943042850150
Transform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -4479,7 +4479,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: bad7d8fcf0a40724eb20d1d0c2663e3d, type: 3}
m_Sprite: {fileID: 21300000, guid: c14eb7e44609e8a40bb7ba0d34b6f9b6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -5239,7 +5239,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: c606fd292ade4674cb3df0924c3f66d3, type: 3}
m_Sprite: {fileID: 21300000, guid: 68cfe17ca7beed843824c1b659128822, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -8943,7 +8943,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &8495537254914375099
Transform:
m_ObjectHideFlags: 0
Expand Down
14 changes: 0 additions & 14 deletions Assets/Scenes/MainScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -623,20 +623,6 @@ PrefabInstance:
propertyPath: gameRegistry
value:
objectReference: {fileID: 1418230372}
- target: {fileID: 4753454841369738365, guid: 71b7e1e3f0af4db4da97b983d87288d6, type: 3}
propertyPath: m_text
value: 'If you want to survive in this hell of a factory...
'
objectReference: {fileID: 0}
- target: {fileID: 5048725444850633134, guid: 71b7e1e3f0af4db4da97b983d87288d6, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6752494730495819223, guid: 71b7e1e3f0af4db4da97b983d87288d6, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7943282192639027792, guid: 71b7e1e3f0af4db4da97b983d87288d6, type: 3}
propertyPath: gm
value:
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
123 changes: 123 additions & 0 deletions Assets/Sprites/Menus/HUD/iconos/Perks/armero 2.png.meta

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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
123 changes: 123 additions & 0 deletions Assets/Sprites/Menus/HUD/iconos/Perks/chaleco 1.png.meta

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

0 comments on commit 50e9f18

Please sign in to comment.