Responsive window resizing and storage container fix
This commit is contained in:
parent
3746d39045
commit
f2ccb40938
@ -1235,11 +1235,11 @@ MonoBehaviour:
|
||||
m_Content: {fileID: 2770326606141421692}
|
||||
m_Horizontal: 0
|
||||
m_Vertical: 1
|
||||
m_MovementType: 1
|
||||
m_MovementType: 2
|
||||
m_Elasticity: 0.1
|
||||
m_Inertia: 0
|
||||
m_DecelerationRate: 0.135
|
||||
m_ScrollSensitivity: 1
|
||||
m_ScrollSensitivity: 10
|
||||
m_Viewport: {fileID: 4086661973484093150}
|
||||
m_HorizontalScrollbar: {fileID: 51727583602948897}
|
||||
m_VerticalScrollbar: {fileID: 3684466523276116297}
|
||||
@ -1721,7 +1721,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: 296.4995, y: -667.5}
|
||||
m_AnchoredPosition: {x: 296.4995, y: -542.5}
|
||||
m_SizeDelta: {x: 572.999, y: 175}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2770326604746266598
|
||||
@ -2853,7 +2853,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -0.00036621094}
|
||||
m_AnchoredPosition: {x: 0, y: -0.00012207031}
|
||||
m_SizeDelta: {x: 0, y: 2250}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &2770326604978625766
|
||||
@ -6862,6 +6862,8 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 2770326605600926436}
|
||||
- component: {fileID: 2770326605600926437}
|
||||
- component: {fileID: 2077220343}
|
||||
- component: {fileID: 2077220344}
|
||||
m_Layer: 5
|
||||
m_Name: Tactical Rig Slot Group Container
|
||||
m_TagString: Untagged
|
||||
@ -6886,7 +6888,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 572.9989, y: 350}
|
||||
m_SizeDelta: {x: 572.9989, y: 225}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2770326605600926437
|
||||
CanvasRenderer:
|
||||
@ -6896,6 +6898,48 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2770326605600926435}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2077220343
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2770326605600926435}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f5976e5eb04a41147958945844fb319d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
MinimumSize: 225
|
||||
--- !u!114 &2077220344
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2770326605600926435}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &2770326605604030062
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8122,6 +8166,8 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 2770326605768550993}
|
||||
- component: {fileID: 2770326605768550994}
|
||||
- component: {fileID: 1620325807}
|
||||
- component: {fileID: 1620325808}
|
||||
m_Layer: 5
|
||||
m_Name: Tactical Rig Slot Group
|
||||
m_TagString: Untagged
|
||||
@ -8147,7 +8193,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 10, y: 0}
|
||||
m_SizeDelta: {x: 572.999, y: 350}
|
||||
m_SizeDelta: {x: 572.999, y: 225}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2770326605768550994
|
||||
CanvasRenderer:
|
||||
@ -8157,6 +8203,48 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2770326605768550992}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1620325807
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2770326605768550992}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f5976e5eb04a41147958945844fb319d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
MinimumSize: 225
|
||||
--- !u!114 &1620325808
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2770326605768550992}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &2770326605768611109
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8992,6 +9080,7 @@ GameObject:
|
||||
- component: {fileID: 2770326605851189361}
|
||||
- component: {fileID: 2770326605851189364}
|
||||
- component: {fileID: 2805822561179475849}
|
||||
- component: {fileID: 986673371}
|
||||
m_Layer: 5
|
||||
m_Name: Plate Carrier Group Slot Manager
|
||||
m_TagString: Untagged
|
||||
@ -9048,6 +9137,26 @@ MonoBehaviour:
|
||||
- {fileID: 2770326605258052311}
|
||||
AllowedItemTags: 12000000
|
||||
--- !u!114 &2805822561179475849
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2770326605851189360}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 886d4d53fb341454aa56488c1768c081, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
limitStackSlots:
|
||||
- {fileID: 2770326605039798047}
|
||||
- {fileID: 2770326605069652577}
|
||||
- {fileID: 2770326605604029970}
|
||||
- {fileID: 2770326606725301637}
|
||||
combinedLimit: 1
|
||||
itemUI: {fileID: 0}
|
||||
slot: {fileID: 2770326606194450705}
|
||||
--- !u!114 &986673371
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -10181,7 +10290,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: 296.4995, y: -410}
|
||||
m_AnchoredPosition: {x: 296.4995, y: -285}
|
||||
m_SizeDelta: {x: 572.999, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2770326606002374602
|
||||
@ -10365,9 +10474,9 @@ RectTransform:
|
||||
m_Father: {fileID: 4508597830310062939}
|
||||
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: 784.583, y: -2500.0005}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 784.583, y: 0}
|
||||
m_SizeDelta: {x: 767.58325, y: 762.71313}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2770326606043385264
|
||||
@ -10975,7 +11084,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: -0.00048828125, y: -0.00034455254}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 582.99915, y: 1200}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &2770326606141421693
|
||||
@ -12687,6 +12796,7 @@ GameObject:
|
||||
- component: {fileID: 2770326606332454989}
|
||||
- component: {fileID: 2770326606332454990}
|
||||
- component: {fileID: 634964390482256711}
|
||||
- component: {fileID: 329037812}
|
||||
m_Layer: 5
|
||||
m_Name: Tactical Rig Group Slot Manager
|
||||
m_TagString: Untagged
|
||||
@ -12743,6 +12853,26 @@ MonoBehaviour:
|
||||
hideGameObjects: []
|
||||
AllowedItemTags: 09000000
|
||||
--- !u!114 &634964390482256711
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2770326606332454988}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 886d4d53fb341454aa56488c1768c081, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
limitStackSlots:
|
||||
- {fileID: 2770326605039798047}
|
||||
- {fileID: 2770326605069652577}
|
||||
- {fileID: 2770326605604029970}
|
||||
- {fileID: 2770326606725301637}
|
||||
combinedLimit: 1
|
||||
itemUI: {fileID: 0}
|
||||
slot: {fileID: 2770326606194450705}
|
||||
--- !u!114 &329037812
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -14943,7 +15073,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: 296.4995, y: -520}
|
||||
m_AnchoredPosition: {x: 296.4995, y: -395}
|
||||
m_SizeDelta: {x: 572.999, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2770326606660306587
|
||||
@ -16004,7 +16134,7 @@ MonoBehaviour:
|
||||
m_TargetGraphic: {fileID: 2770326606276845106}
|
||||
m_HandleRect: {fileID: 2770326606276845105}
|
||||
m_Direction: 2
|
||||
m_Value: 1.0000002
|
||||
m_Value: 1.0000001
|
||||
m_Size: 0.29797193
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
@ -17006,8 +17136,8 @@ MonoBehaviour:
|
||||
m_TargetGraphic: {fileID: 8873855520739210168}
|
||||
m_HandleRect: {fileID: 52681282418728116}
|
||||
m_Direction: 2
|
||||
m_Value: 1.0000008
|
||||
m_Size: 0.6525001
|
||||
m_Value: 1
|
||||
m_Size: 0.6525
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -13,7 +13,6 @@ GameObject:
|
||||
- component: {fileID: 8715477175483360843}
|
||||
- component: {fileID: 47521878755422833}
|
||||
- component: {fileID: 2245991356252128075}
|
||||
- component: {fileID: 6861668140644729986}
|
||||
m_Layer: 5
|
||||
m_Name: High Capacity Rig UI
|
||||
m_TagString: Untagged
|
||||
@ -69,6 +68,9 @@ MonoBehaviour:
|
||||
monetaryValue: 400000
|
||||
containerUIPrefab: {fileID: 8693914790612862727, guid: 4388120732ddcf44e90443329e307ef2,
|
||||
type: 3}
|
||||
NestCapacityWeight: 0
|
||||
NestCapacity: 12
|
||||
NestCapacityText: {fileID: 0}
|
||||
backdropImage: {fileID: 4890513872887803874}
|
||||
emptyGridContainer: {fileID: 7341519070824901537}
|
||||
titleText: {fileID: 8566834606193857390}
|
||||
@ -76,14 +78,14 @@ MonoBehaviour:
|
||||
interactable: 1
|
||||
overrideSortingCanvas: {fileID: 0}
|
||||
Equipped: 0
|
||||
ContainedItems: []
|
||||
NestedItems: []
|
||||
ParentContainer: {fileID: 0}
|
||||
container: {fileID: 0}
|
||||
canvas: {fileID: 0}
|
||||
PickedUpOnFrame: 0
|
||||
ContextWindows: []
|
||||
StorageWindow: {fileID: 0}
|
||||
limitStackSlotCapacity: {fileID: 0}
|
||||
limitStackItemManager: {fileID: 0}
|
||||
pickUp: {fileID: 0}
|
||||
targetAttachment: {fileID: 0}
|
||||
Inventory: {fileID: 0}
|
||||
@ -136,20 +138,6 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &6861668140644729986
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8715477175483360852}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: cb119beeb7574074d927412671ae9921, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Capacity: 24
|
||||
limitStackSlotCapacities: {fileID: 0}
|
||||
--- !u!1 &8715477176133586259
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -34,8 +34,8 @@ RectTransform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 75, y: 75}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
@ -85,6 +85,7 @@ MonoBehaviour:
|
||||
Height: 1
|
||||
testItem: {fileID: 0}
|
||||
testItems: []
|
||||
itemsOnGrid: []
|
||||
--- !u!114 &4972946875524611880
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -35,8 +35,8 @@ RectTransform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 75, y: 150}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
@ -86,6 +86,7 @@ MonoBehaviour:
|
||||
Height: 2
|
||||
testItem: {fileID: 0}
|
||||
testItems: []
|
||||
itemsOnGrid: []
|
||||
--- !u!114 &5669249702482988909
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -37,8 +37,8 @@ RectTransform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
@ -88,6 +88,7 @@ MonoBehaviour:
|
||||
Height: 2
|
||||
testItem: {fileID: 0}
|
||||
testItems: []
|
||||
itemsOnGrid: []
|
||||
--- !u!114 &1471210313782040237
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -37,8 +37,8 @@ RectTransform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 75, y: 225}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
|
@ -13,6 +13,8 @@ GameObject:
|
||||
- component: {fileID: 8693914790612862720}
|
||||
- component: {fileID: 4435060939358027050}
|
||||
- component: {fileID: 6100806319322366412}
|
||||
- component: {fileID: 1297651228205162313}
|
||||
- component: {fileID: 2173421741184714090}
|
||||
m_Layer: 5
|
||||
m_Name: Pouch Container
|
||||
m_TagString: Untagged
|
||||
@ -37,7 +39,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 512, y: 480}
|
||||
m_SizeDelta: {x: 512, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &8693914790612862723
|
||||
CanvasRenderer:
|
||||
@ -106,10 +108,44 @@ MonoBehaviour:
|
||||
m_Top: 5
|
||||
m_Bottom: 5
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 100
|
||||
m_Spacing: 10
|
||||
m_LineSpacing: 10
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!114 &1297651228205162313
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8693914790612862727}
|
||||
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 &2173421741184714090
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8693914790612862727}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: 235
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,34 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class DeriveSizeFromChild : MonoBehaviour
|
||||
{
|
||||
RectTransform rect;
|
||||
RectTransform childRect;
|
||||
public float MinimumSize;
|
||||
public float MinimumSizeX;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
rect = GetComponent<RectTransform>();
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
if(childRect == null && transform.childCount > 0 && transform.GetChild(0) != null)
|
||||
{
|
||||
childRect = transform.GetChild(0).GetComponent<RectTransform>();
|
||||
}
|
||||
if (childRect != null && rect != null)
|
||||
{
|
||||
Debug.Log(childRect.rect);
|
||||
if(childRect.rect.height > MinimumSize)
|
||||
rect.sizeDelta = new Vector3(rect.sizeDelta.x, childRect.sizeDelta.y);
|
||||
else
|
||||
rect.sizeDelta = new Vector3(rect.sizeDelta.x, MinimumSize);
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f5976e5eb04a41147958945844fb319d
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -777,7 +777,7 @@ namespace SimpleInventorySystem
|
||||
Debug.Log("Grab and drag");
|
||||
GrabAndDragItem();
|
||||
}
|
||||
else if (Input.GetMouseButtonDown(2))
|
||||
else if (Input.GetMouseButtonDown(2) && !Equipped)
|
||||
{
|
||||
ShowStorageWindow();
|
||||
}
|
||||
|
@ -7314,32 +7314,6 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 328506870}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &329037811 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2770326606332454988, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &329037812
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 329037811}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 886d4d53fb341454aa56488c1768c081, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
limitStackSlots:
|
||||
- {fileID: 1398510206}
|
||||
- {fileID: 2038131952}
|
||||
- {fileID: 924261203}
|
||||
- {fileID: 716133342}
|
||||
combinedLimit: 1
|
||||
itemUI: {fileID: 0}
|
||||
slot: {fileID: 2027593487}
|
||||
--- !u!1 &333145654
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -14416,18 +14390,6 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 584433973}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &716133342 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2770326606725301637, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 10cced2d2da0da042904a89dbd544987, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &716675402
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -23167,18 +23129,6 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 922596141}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &924261203 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2770326605604029970, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 10cced2d2da0da042904a89dbd544987, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &927487909
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -24366,32 +24316,6 @@ GameObject:
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!1 &986673369 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2770326605851189360, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &986673371
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 986673369}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 886d4d53fb341454aa56488c1768c081, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
limitStackSlots:
|
||||
- {fileID: 1398510206}
|
||||
- {fileID: 2038131952}
|
||||
- {fileID: 924261203}
|
||||
- {fileID: 716133342}
|
||||
combinedLimit: 1
|
||||
itemUI: {fileID: 0}
|
||||
slot: {fileID: 2027593487}
|
||||
--- !u!4 &992107632 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8057961283841219706, guid: dd9b029df69093b488cafc213793511e,
|
||||
@ -37465,18 +37389,6 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1397649401}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1398510206 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2770326605039798047, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 10cced2d2da0da042904a89dbd544987, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1400863731
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -51710,18 +51622,6 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2027311414}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2027593487 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2770326606194450705, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3ef5d74bab1474e4489c7b99860a62bf, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &2028429108
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -51848,18 +51748,6 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1891797248}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2038131952 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2770326605069652577, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 10cced2d2da0da042904a89dbd544987, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &2044589599
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -56482,10 +56370,6 @@ PrefabInstance:
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2109804768, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 51727583602948897, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_Value
|
||||
@ -56506,21 +56390,6 @@ PrefabInstance:
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1024558551205503332, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_ScrollSensitivity
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1024558551205503332, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_Vertical
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1024558551205503332, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_MovementType
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1751467116486688318, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
@ -56541,16 +56410,6 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326604711117547, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326604711117547, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_isOrthographic
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326604746266596, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
@ -56569,7 +56428,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2770326604746266596, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -797.5
|
||||
value: -542.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326604942899899, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
@ -56614,7 +56473,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2770326604978625765, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -0.00012207031
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605030914168, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
@ -56631,11 +56490,6 @@ PrefabInstance:
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605232467538, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605244884164, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
@ -56831,11 +56685,6 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605532365201, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 373.79163
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605589712583, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
@ -56851,11 +56700,6 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605600926436, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 480
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605623600441, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
@ -56926,11 +56770,6 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605768550993, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 480
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605790841685, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
@ -57046,11 +56885,6 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605851189363, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
@ -57094,22 +56928,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2770326606002374600, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -540
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -285
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
@ -57164,7 +56983,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2770326606141421692, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -0.00012207031
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326606150301029, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
@ -57484,7 +57303,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -650
|
||||
value: -395
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
@ -57556,10 +57375,10 @@ PrefabInstance:
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3684466523276116297, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
- target: {fileID: 3305621909771891433, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_Value
|
||||
value: 1
|
||||
propertyPath: m_ScrollSensitivity
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3684466523276116297, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
@ -57581,14 +57400,7 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8577955505915834254, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 2770326605851189363, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
|
||||
- {fileID: 2109804768, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
|
||||
--- !u!64 &3968453558880047856
|
||||
MeshCollider:
|
||||
|
Loading…
Reference in New Issue
Block a user