情報表示PopUI調整

This commit is contained in:
kimura 2021-10-15 10:10:17 +09:00
parent 01678ea0af
commit c14d536f17
2 changed files with 268 additions and 63 deletions

View File

@ -1,5 +1,84 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4874146888205238299
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2523338578469946763}
- component: {fileID: 7875790899304939210}
- component: {fileID: 9206794629415608258}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2523338578469946763
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4874146888205238299}
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_Children:
- {fileID: 6859128401750419788}
- {fileID: 6859128401179691650}
- {fileID: 6859128402478722386}
m_Father: {fileID: 6859128401118579130}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7875790899304939210
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4874146888205238299}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &9206794629415608258
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4874146888205238299}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 86
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &6859128400961489648
GameObject:
m_ObjectHideFlags: 0
@ -514,6 +593,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6859128401107917370}
- component: {fileID: 1642413381154068434}
- component: {fileID: 636377501859366768}
m_Layer: 5
m_Name: ShopInfoPanel
m_TagString: Untagged
@ -535,13 +616,52 @@ RectTransform:
- {fileID: 6859128401118579130}
- {fileID: 6859128401189677495}
m_Father: {fileID: 6859128402620403790}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -17.000021, y: -490}
m_SizeDelta: {x: -930, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0.000004172325, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1642413381154068434
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6859128401107917369}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &636377501859366768
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6859128401107917369}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 53
m_Top: 32
m_Bottom: 26
m_ChildAlignment: 1
m_Spacing: -79.7
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &6859128401114444105
GameObject:
m_ObjectHideFlags: 0
@ -625,6 +745,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6859128401118579130}
- component: {fileID: 992655073622745958}
- component: {fileID: 8322560947797788913}
m_Layer: 0
m_Name: total
m_TagString: Untagged
@ -644,17 +766,54 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6859128401119072707}
- {fileID: 6859128401750419788}
- {fileID: 6859128401179691650}
- {fileID: 6859128402478722386}
- {fileID: 2523338578469946763}
m_Father: {fileID: 6859128401107917370}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 350}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 438.5, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &992655073622745958
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6859128401118579129}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &8322560947797788913
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6859128401118579129}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 196.4
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &6859128401119072706
GameObject:
m_ObjectHideFlags: 0
@ -688,9 +847,9 @@ RectTransform:
m_Father: {fileID: 6859128401118579130}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -10, y: 98}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 820, y: 56}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6859128401119072709
@ -764,7 +923,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -4, y: 0}
m_AnchoredPosition: {x: -4, y: 115.999954}
m_SizeDelta: {x: 800, y: 6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6859128401121084843
@ -911,9 +1070,9 @@ RectTransform:
m_Father: {fileID: 6859128401189677495}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -9.999998, y: 98.000015}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 820, y: 56}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6859128401135470827
@ -1000,9 +1159,9 @@ RectTransform:
m_Father: {fileID: 6859128401189677495}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -600}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6859128401143531342
@ -1038,8 +1197,8 @@ MonoBehaviour:
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 86
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
@ -1074,12 +1233,12 @@ RectTransform:
- {fileID: 6859128401279285592}
- {fileID: 6859128402077804074}
- {fileID: 6859128402988545725}
m_Father: {fileID: 6859128401118579130}
m_RootOrder: 2
m_Father: {fileID: 2523338578469946763}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -198}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6859128401189677494
@ -1091,6 +1250,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6859128401189677495}
- component: {fileID: 3563385494164262890}
- component: {fileID: 7037958270222043150}
m_Layer: 0
m_Name: history
m_TagString: Untagged
@ -1114,11 +1275,50 @@ RectTransform:
m_Father: {fileID: 6859128401107917370}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 45}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 438.5, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3563385494164262890
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6859128401189677494}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &7037958270222043150
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6859128401189677494}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 70.2
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &6859128401228114187
GameObject:
m_ObjectHideFlags: 0
@ -1250,6 +1450,7 @@ MonoBehaviour:
recordEnabled: {fileID: 6859128401526997402}
shopInfoButton: {fileID: 6859128401074204927}
recordButton: {fileID: 6859128402628860639}
scrollRect: {fileID: 6859128403032312400}
shopInfoObject: {fileID: 6859128401107917369}
recordObject: {fileID: 6859128401516038726}
--- !u!1 &6859128401238665809
@ -1510,9 +1711,9 @@ RectTransform:
m_Father: {fileID: 6859128401516038727}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -580}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6859128401308736559
@ -1626,9 +1827,9 @@ RectTransform:
m_Father: {fileID: 6859128401516038727}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -160}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6859128401366313435
@ -2058,7 +2259,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6859128401516038727
RectTransform:
m_ObjectHideFlags: 0
@ -2075,13 +2276,13 @@ RectTransform:
- {fileID: 6859128402165333294}
- {fileID: 6859128401308582515}
m_Father: {fileID: 6859128402620403790}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -17.000021, y: -490.0005}
m_SizeDelta: {x: -930, y: 580}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0.000004172325, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &6859128401516038713
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2110,8 +2311,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Right: 35
m_Top: 200
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 210
@ -2489,12 +2690,12 @@ RectTransform:
- {fileID: 6859128401079520716}
- {fileID: 6859128401308736544}
- {fileID: 6859128401758168908}
m_Father: {fileID: 6859128401118579130}
m_RootOrder: 1
m_Father: {fileID: 2523338578469946763}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -123}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6859128401758168907
@ -2609,9 +2810,9 @@ RectTransform:
m_Father: {fileID: 6859128401516038727}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 40}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6859128401897583260
@ -3413,9 +3614,9 @@ RectTransform:
m_Father: {fileID: 6859128401516038727}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -385}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6859128402182084771
@ -4382,12 +4583,12 @@ RectTransform:
- {fileID: 6859128401121084841}
- {fileID: 6859128402708489557}
- {fileID: 6859128402839842459}
m_Father: {fileID: 6859128401118579130}
m_RootOrder: 3
m_Father: {fileID: 2523338578469946763}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -157}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6859128402510750601
@ -4494,8 +4695,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6859128401516038727}
- {fileID: 6859128401107917370}
- {fileID: 6859128401516038727}
m_Father: {fileID: 6859128403032312415}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4799,7 +5000,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -51, y: 32}
m_AnchoredPosition: {x: -50.99995, y: 147.99995}
m_SizeDelta: {x: 700, y: 56}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6859128402708489559
@ -5019,7 +5220,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6859128402839842458}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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_Children:
@ -5030,7 +5231,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 359.9, y: 66.2}
m_AnchoredPosition: {x: 359.90012, y: 182.19995}
m_SizeDelta: {x: 0, y: 60}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6859128402839842463

View File

@ -16,6 +16,7 @@ public class Information : MonoBehaviour
[SerializeField] private Button shopInfoButton;
[SerializeField] private Button recordButton;
[SerializeField] private ScrollRect scrollRect;
[SerializeField] private GameObject shopInfoObject;
[SerializeField] private GameObject recordObject;
@ -40,6 +41,9 @@ public class Information : MonoBehaviour
recordButton.gameObject.SetActive(isShopInfo);
recordEnabled.SetActive(!isShopInfo);
recordObject.SetActive(!isShopInfo);
scrollRect.content = (isShopInfo ? shopInfoObject.transform : recordObject.transform) as RectTransform;
LayoutRebuilder.ForceRebuildLayoutImmediate(scrollRect.content);
scrollRect.verticalNormalizedPosition = 1;
}).AddTo(this);
shopInfoButton.onClick.Invoke();
}