Skip to content

Commit

Permalink
UI Adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
@WispyMouse
WispyMouse committed Apr 15, 2022
1 parent 3efda95 commit 887b168
Show file tree
Hide file tree
Showing 10 changed files with 231 additions and 222 deletions.
10 changes: 10 additions & 0 deletions Assets/AddressableAssetsData/link.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<linker>
<assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
</assembly>
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
</assembly>
</linker>
7 changes: 7 additions & 0 deletions Assets/AddressableAssetsData/link.xml.meta
View file

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

166 changes: 151 additions & 15 deletions Assets/Battle/Battle.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -6, y: -66.53}
m_SizeDelta: {x: 80, y: 140}
m_AnchoredPosition: {x: -6, y: -111.82}
m_SizeDelta: {x: 124.8, y: 197.1}
m_Pivot: {x: 1, y: 1}
--- !u!114 &70238715
MonoBehaviour:
Expand Down Expand Up @@ -599,14 +599,15 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 1080599488}
m_Father: {fileID: 398039739}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 2, y: 0}
m_SizeDelta: {x: 200, y: 0}
m_SizeDelta: {x: 320.6, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &131709540
MonoBehaviour:
Expand Down Expand Up @@ -655,15 +656,15 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 72.6
m_fontSizeBase: 72.6
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
Expand Down Expand Up @@ -1249,7 +1250,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3814927141530822275, guid: 5692237c1314d7741b1d4f223b8ab588, type: 3}
propertyPath: m_SizeDelta.x
value: -50
value: -204.8
objectReference: {fileID: 0}
- target: {fileID: 3814927141530822275, guid: 5692237c1314d7741b1d4f223b8ab588, type: 3}
propertyPath: m_SizeDelta.y
Expand Down Expand Up @@ -1285,7 +1286,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3814927141530822275, guid: 5692237c1314d7741b1d4f223b8ab588, type: 3}
propertyPath: m_AnchoredPosition.x
value: 25
value: 102.4
objectReference: {fileID: 0}
- target: {fileID: 3814927141530822275, guid: 5692237c1314d7741b1d4f223b8ab588, type: 3}
propertyPath: m_AnchoredPosition.y
Expand Down Expand Up @@ -3507,7 +3508,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -6, y: -6}
m_SizeDelta: {x: 432.4, y: 60}
m_SizeDelta: {x: 588.5, y: 103.2}
m_Pivot: {x: 1, y: 1}
--- !u!114 &996372638
MonoBehaviour:
Expand Down Expand Up @@ -3745,6 +3746,141 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2d89aa1d5528f1641b794a51da5d55f3, type: 3}
m_PrefabInstance: {fileID: 1074516629}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1080599487
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1080599488}
- component: {fileID: 1080599490}
- component: {fileID: 1080599489}
m_Layer: 10
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1080599488
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1080599487}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 131709539}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1080599489
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1080599487}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'AOF:'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 51
m_fontSizeBase: 51
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1080599490
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1080599487}
m_CullTransparentMesh: 1
--- !u!1001 &1085561617
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5040,7 +5176,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 70}
m_AnchoredPosition: {x: -63.3, y: 70}
m_SizeDelta: {x: 600, y: 300}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1346996722
Expand Down Expand Up @@ -5099,7 +5235,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_Spacing: 20
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
Expand Down Expand Up @@ -5599,7 +5735,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 44.75
m_fontSize: 72
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -6457,7 +6593,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 476.49, y: 126.7}
m_SizeDelta: {x: 579.7, y: 126.7}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1625652283
MonoBehaviour:
Expand Down
1 change: 0 additions & 1 deletion Assets/DCJam2022/DelverProfile.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ public class DelverProfile : ScriptableObject

public string FirstSkill;
public string SecondSkill;
public string ThirdSkill;

public List<PlayerMove> AttackOptions;
}
36 changes: 18 additions & 18 deletions Assets/DCJam2022/EncounterBattle/PlayerHealthInBattleHUD.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 11, y: -62}
m_SizeDelta: {x: -24.1, y: 20}
m_AnchoredPosition: {x: 11, y: -83.09}
m_SizeDelta: {x: -24.1, y: 29.6}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &914718528
CanvasRenderer:
Expand Down Expand Up @@ -95,8 +95,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 21
m_fontSizeBase: 21
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
Expand Down Expand Up @@ -235,7 +235,7 @@ MonoBehaviour:
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 50
m_fontSizeMax: 64
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 256
Expand Down Expand Up @@ -305,10 +305,10 @@ RectTransform:
m_Father: {fileID: 914718526}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -43.425, y: 0}
m_SizeDelta: {x: -88.35, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 43, y: 0}
m_SizeDelta: {x: -86, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &905149779654775945
CanvasRenderer:
Expand Down Expand Up @@ -365,14 +365,14 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontSize: 38
m_fontSizeBase: 38
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 4
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
Expand Down Expand Up @@ -602,7 +602,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_Color: {r: 0.5896226, g: 0.77174664, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
Expand Down Expand Up @@ -766,7 +766,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 300, y: 214.8}
m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &4116523624427723291
CanvasRenderer:
Expand All @@ -789,7 +789,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9166284, g: 0.9622642, b: 0.8297259, a: 0.48235294}
m_Color: {r: 0.9166284, g: 0.9622642, b: 0.8297259, a: 0.69411767}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
Expand Down Expand Up @@ -843,7 +843,7 @@ MonoBehaviour:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: 200
m_PreferredWidth: 300
m_PreferredHeight: 300
m_FlexibleWidth: -1
m_FlexibleHeight: -1
Expand Down Expand Up @@ -1914,7 +1914,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3814927141530822275, guid: 5692237c1314d7741b1d4f223b8ab588, type: 3}
propertyPath: m_SizeDelta.x
value: -90
value: -133.7
objectReference: {fileID: 0}
- target: {fileID: 3814927141530822275, guid: 5692237c1314d7741b1d4f223b8ab588, type: 3}
propertyPath: m_SizeDelta.y
Expand Down Expand Up @@ -1950,7 +1950,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3814927141530822275, guid: 5692237c1314d7741b1d4f223b8ab588, type: 3}
propertyPath: m_AnchoredPosition.x
value: 45
value: 66.85
objectReference: {fileID: 0}
- target: {fileID: 3814927141530822275, guid: 5692237c1314d7741b1d4f223b8ab588, type: 3}
propertyPath: m_AnchoredPosition.y
Expand Down
Loading

0 comments on commit 887b168

Please sign in to comment.