Skip to content
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.

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

Fixed loading screen UI bug when aspect ratio is 21:9 or similar ultr… #529

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_attackConfigSO: {fileID: 11400000, guid: fa67200955f70e64abecdd0107951472, type: 2}
--- !u!135 &6188918218575104391
SphereCollider:
--- !u!65 &85085901128719611
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
Expand All @@ -69,9 +69,9 @@ SphereCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.35
m_Center: {x: 0, y: 0.32, z: 0}
--- !u!135 &6274847306283701072
m_Size: {x: 0.64422137, y: 0.5481757, z: 0.72591937}
m_Center: {x: -0.004921645, y: 0.2887556, z: 0.014988601}
--- !u!135 &8467386107611288299
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand Down
16 changes: 10 additions & 6 deletions UOP1_Project/Assets/Prefabs/Nature/Bush.prefab
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!136 &1143880073
CapsuleCollider:
--- !u!65 &306546508537069537
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
Expand All @@ -10,10 +10,9 @@ CapsuleCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5
m_Height: 1.3
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0.018966928}
serializedVersion: 2
m_Size: {x: 0.8377218, y: 0.55013984, z: 0.8510349}
m_Center: {x: -0.0015015602, y: 0.2526749, z: 0.011384085}
--- !u!1 &6860398699643004296
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -134,6 +133,11 @@ PrefabInstance:
propertyPath: m_Name
value: Bush
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 9659edb29993c4ba2a4f75b3265d81de,
type: 3}
propertyPath: m_TagString
value: Bush
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 9659edb29993c4ba2a4f75b3265d81de,
type: 3}
propertyPath: m_NavMeshLayer
Expand Down
16 changes: 10 additions & 6 deletions UOP1_Project/Assets/Prefabs/Nature/BushThick2.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ LightProbeGroup:
m_SourcePositions:
- {x: 0, y: 0.74264735, z: -0.00000002371987}
m_Dering: 1
--- !u!136 &4946972002693030379
CapsuleCollider:
--- !u!65 &967800462607294721
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
Expand All @@ -52,10 +52,9 @@ CapsuleCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.45
m_Height: 1.34
m_Direction: 0
m_Center: {x: 0, y: 0.18, z: 0}
serializedVersion: 2
m_Size: {x: 1.0791984, y: 0.5343887, z: 0.839382}
m_Center: {x: -0.025821447, y: 0.26473704, z: -0.022540838}
--- !u!1001 &3596012594732811070
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -133,6 +132,11 @@ PrefabInstance:
propertyPath: m_Name
value: BushThick2
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 1d579b5b4d7455941a284294eecc3c1d,
type: 3}
propertyPath: m_TagString
value: Bush
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 1d579b5b4d7455941a284294eecc3c1d,
type: 3}
propertyPath: m_NavMeshLayer
Expand Down
13 changes: 13 additions & 0 deletions UOP1_Project/Assets/Scenes/Managers/PersistentManagers.unity
Original file line number Diff line number Diff line change
Expand Up @@ -593,13 +593,26 @@ GameObject:
- component: {fileID: 1387982343}
- component: {fileID: 1387982342}
- component: {fileID: 1387982341}
- component: {fileID: 1387982340}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1387982340
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1387982339}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14beef9872ff16d4f84de87287ee3c0d, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1387982341
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/Scenes/WIP/TestingGround_Slime.meta

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

Loading