diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab
index b18a78ee997f0ca01c0eef2859312efb7ee84857..3aa2dc83b248dc38af237490cc47fcd884e899d9 100644
--- a/Assets/Resources/Prefabs/Stage_Default.prefab
+++ b/Assets/Resources/Prefabs/Stage_Default.prefab
@@ -508,82 +508,6 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
---- !u!1 &8171206648154100825
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6759952084766777062}
- - component: {fileID: 3007632598098748251}
- - component: {fileID: 7811490445748491816}
- m_Layer: 5
- m_Name: Scrolls
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &6759952084766777062
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8171206648154100825}
- 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: 1734510802251275973}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 1}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 100, y: 5}
- m_Pivot: {x: 1, y: 1}
---- !u!114 &3007632598098748251
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8171206648154100825}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: -5
- m_Right: 0
- m_Top: 5
- m_Bottom: 0
- m_ChildAlignment: 0
- m_StartCorner: 0
- m_StartAxis: 0
- m_CellSize: {x: 100, y: 100}
- m_Spacing: {x: 0, y: 5}
- m_Constraint: 0
- m_ConstraintCount: 2
---- !u!114 &7811490445748491816
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8171206648154100825}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalFit: 0
- m_VerticalFit: 1
--- !u!1001 &442227395851957050
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2050,11 +1974,21 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0.00047302246
objectReference: {fileID: 0}
+ - target: {fileID: 861183262117291136, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 861183262117291136, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 861183262117291137, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: scrollscreenContent
value:
- objectReference: {fileID: 3231672574655777648}
+ objectReference: {fileID: 1871548913918342015}
- target: {fileID: 861183262247596663, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchorMax.x
@@ -2073,13 +2007,18 @@ PrefabInstance:
- target: {fileID: 861183262295209870, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0.000091552734
+ value: 0.000030517578
objectReference: {fileID: 0}
- target: {fileID: 861183262417667852, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_Size
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 861183262417667852, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_Value
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 861183262417667854, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_IsActive
@@ -2600,6 +2539,11 @@ PrefabInstance:
propertyPath: m_OverrideSorting
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4527154854479571703, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4847292362846859827, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_LocalRotation.x
@@ -2827,6 +2771,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b996060e27da25c498842defc1996d84, type: 3}
+--- !u!224 &1871548913918342015 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 4527154854479571703, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ m_PrefabInstance: {fileID: 2822275412857346440}
+ m_PrefabAsset: {fileID: 0}
--- !u!114 &3020720018354060034 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1063267682327585418, guid: b996060e27da25c498842defc1996d84,
@@ -2851,12 +2801,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 2822275412857346440}
m_PrefabAsset: {fileID: 0}
---- !u!224 &3231672574655777648 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 861183262554624760, guid: b996060e27da25c498842defc1996d84,
- type: 3}
- m_PrefabInstance: {fileID: 2822275412857346440}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &3231672575207917305 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 861183262000521073, guid: b996060e27da25c498842defc1996d84,
@@ -3425,7 +3369,7 @@ PrefabInstance:
type: 3}
propertyPath: scrollscreenContent
value:
- objectReference: {fileID: 6759952084766777062}
+ objectReference: {fileID: 3256699174731649202}
- target: {fileID: 6368005776962444133, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
type: 3}
propertyPath: m_Pivot.x
@@ -3570,51 +3514,15 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_MovementRange: 50
m_ControlPath: <Gamepad>/leftStick
---- !u!224 &1734510802251275973 stripped
+--- !u!224 &1734510802335769907 stripped
RectTransform:
- m_CorrespondingSourceObject: {fileID: 6368005776962444133, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
- type: 3}
- m_PrefabInstance: {fileID: 4633513391531001248}
- m_PrefabAsset: {fileID: 0}
---- !u!1 &1734510802251275974 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 6368005776962444134, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
+ m_CorrespondingSourceObject: {fileID: 6368005777045954707, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
type: 3}
m_PrefabInstance: {fileID: 4633513391531001248}
m_PrefabAsset: {fileID: 0}
---- !u!114 &7398656717031369850
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1734510802251275974}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Content: {fileID: 6759952084766777062}
- m_Horizontal: 1
- m_Vertical: 1
- m_MovementType: 2
- m_Elasticity: 0.1
- m_Inertia: 1
- m_DecelerationRate: 0.135
- m_ScrollSensitivity: 10
- m_Viewport: {fileID: 1734510802251275973}
- m_HorizontalScrollbar: {fileID: 0}
- m_VerticalScrollbar: {fileID: 0}
- m_HorizontalScrollbarVisibility: 0
- m_VerticalScrollbarVisibility: 0
- m_HorizontalScrollbarSpacing: 0
- m_VerticalScrollbarSpacing: 0
- m_OnValueChanged:
- m_PersistentCalls:
- m_Calls: []
---- !u!224 &1734510802335769907 stripped
+--- !u!224 &3256699174731649202 stripped
RectTransform:
- m_CorrespondingSourceObject: {fileID: 6368005777045954707, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
+ m_CorrespondingSourceObject: {fileID: 7890189193044333842, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
type: 3}
m_PrefabInstance: {fileID: 4633513391531001248}
m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
index 11d5e17d1d85c212f29a1de3290b1042202aadd7..fd2e7abfceea67c7fa4b9e8c32297d1c2c1693de 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
@@ -1,5 +1,81 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &961080257836305183
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6500467619489830996}
+ - component: {fileID: 6592514254180342026}
+ - component: {fileID: 8189407137150641278}
+ m_Layer: 5
+ m_Name: Scrolls
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6500467619489830996
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 961080257836305183}
+ 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: 8004702058016740899}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 100, y: 0}
+ m_Pivot: {x: 1, y: 1}
+--- !u!114 &6592514254180342026
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 961080257836305183}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: -5
+ m_Right: 0
+ m_Top: 5
+ m_Bottom: 0
+ m_ChildAlignment: 0
+ m_StartCorner: 0
+ m_StartAxis: 0
+ m_CellSize: {x: 100, y: 100}
+ m_Spacing: {x: 0, y: 5}
+ m_Constraint: 0
+ m_ConstraintCount: 2
+--- !u!114 &8189407137150641278
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 961080257836305183}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 1
--- !u!1 &1447414525858596195
GameObject:
m_ObjectHideFlags: 0
@@ -1165,7 +1241,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: -0.000030517578, y: 0.000030517578}
+ m_AnchoredPosition: {x: -3887.4707, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &8004702056565720367
@@ -1541,7 +1617,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 8004702056618112982}
m_Direction: 0
m_Value: 0
- m_Size: 1
+ m_Size: 0.39999986
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -2829,7 +2905,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 0
+ m_PresetInfoIsWorld: 1
--- !u!114 &8004702057932254676
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2859,6 +2935,7 @@ GameObject:
- component: {fileID: 8004702058016740900}
- component: {fileID: 8004702058016740901}
- component: {fileID: 8004702058016740898}
+ - component: {fileID: 3490402746730127523}
m_Layer: 5
m_Name: Scrollscreen
m_TagString: Untagged
@@ -2877,15 +2954,16 @@ 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: 6500467619489830996}
m_Father: {fileID: 8004702057932254677}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -53, y: -540}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 105, y: 1080}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_Pivot: {x: 1, y: 1}
--- !u!222 &8004702058016740900
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -2942,12 +3020,42 @@ MonoBehaviour:
ScrollPrefab: {fileID: 3173330253721512196, guid: a6a9a3ebdb022e546a21d9f9ff148261,
type: 3}
DetailScreen: {fileID: 8004702057798297436}
- scrollscreenContent: {fileID: 0}
+ scrollscreenContent: {fileID: 6500467619489830996}
x_Start: -240
y_Start: 200
X_Pacece_Between_Items: 105
y_Pacece_Between_Items: 105
number_of_Column: 3
+--- !u!114 &3490402746730127523
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8004702058016740896}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Content: {fileID: 6500467619489830996}
+ m_Horizontal: 1
+ m_Vertical: 1
+ m_MovementType: 2
+ m_Elasticity: 0.1
+ m_Inertia: 1
+ m_DecelerationRate: 0.135
+ m_ScrollSensitivity: 10
+ m_Viewport: {fileID: 8004702058016740899}
+ m_HorizontalScrollbar: {fileID: 0}
+ m_VerticalScrollbar: {fileID: 0}
+ m_HorizontalScrollbarVisibility: 0
+ m_VerticalScrollbarVisibility: 0
+ m_HorizontalScrollbarSpacing: 0
+ m_VerticalScrollbarSpacing: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &8004702058047913763
GameObject:
m_ObjectHideFlags: 0
@@ -3421,7 +3529,7 @@ PrefabInstance:
- target: {fileID: 4838871000058222821, guid: 49deb83b881477047bfac0ee629a7ae9,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -0.000030517578
+ value: 4860
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3}
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index c5d5362f8260bf2f73a2906a063b3a7f2bfdc4ad..79deb82ac5dcb444f58d8824d3e6ad23fea8b151 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -15,13 +15,10 @@ EditorUserSettings:
value: 0702005254070d5d5d5a5d7145210f444116487c282d7f357e7a1e66b6b0313a
flags: 0
RecentlyUsedSceneGuid-3:
- value: 0709560454055c0d0c5e5c2444740b4413154a72792d22627c714963e0b6373d
+ value: 57505505560608585a56557116730644404e4d7b7c7b7562787e4f66e4b1313e
flags: 0
RecentlyUsedSceneGuid-4:
- value: 0502505152005e020c0d0e2446275e44144f19287f707e362c7c4b60b2b9353c
- flags: 0
- RecentlyUsedSceneGuid-5:
- value: 57505505560608585a56557116730644404e4d7b7c7b7562787e4f66e4b1313e
+ value: 0709560454055c0d0c5e5c2444740b4413154a72792d22627c714963e0b6373d
flags: 0
RecentlyUsedSceneGuid-5:
value: 0502505152005e020c0d0e2446275e44144f19287f707e362c7c4b60b2b9353c