diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index 9bd8cd8..f94b7a7 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -414,6 +414,94 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 87046198}
m_CullTransparentMesh: 0
+--- !u!1 &142933188
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 142933189}
+ - component: {fileID: 142933192}
+ - component: {fileID: 142933191}
+ - component: {fileID: 142933190}
+ m_Layer: 5
+ m_Name: Viewport
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &142933189
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 142933188}
+ 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: 1606562827}
+ m_Father: {fileID: 1565351064}
+ m_RootOrder: 0
+ 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, y: 1}
+--- !u!114 &142933190
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 142933188}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ShowMaskGraphic: 0
+--- !u!114 &142933191
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 142933188}
+ 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: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10917, 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!222 &142933192
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 142933188}
+ m_CullTransparentMesh: 0
--- !u!1 &151330253
GameObject:
m_ObjectHideFlags: 0
@@ -1488,7 +1576,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.024978638, y: 119.100006}
+ m_AnchoredPosition: {x: 0.024963379, y: 119.100006}
m_SizeDelta: {x: -0.050049, y: -528.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &338512867
@@ -1673,6 +1761,42 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 497961715}
m_CullTransparentMesh: 0
+--- !u!1 &637169289
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 637169290}
+ m_Layer: 5
+ m_Name: Sliding Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &637169290
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 637169289}
+ 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: 2060602795}
+ m_Father: {fileID: 912875800}
+ m_RootOrder: 0
+ 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}
+ m_SizeDelta: {x: -20, y: -20}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &638057720
GameObject:
m_ObjectHideFlags: 0
@@ -2614,7 +2738,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 740830547}
m_CullTransparentMesh: 0
---- !u!1 &886952270
+--- !u!1 &829915099
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2622,7 +2746,7 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 886952271}
+ - component: {fileID: 829915100}
m_Layer: 5
m_Name: Sliding Area
m_TagString: Untagged
@@ -2630,19 +2754,19 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &886952271
+--- !u!224 &829915100
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 886952270}
+ m_GameObject: {fileID: 829915099}
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: 434511985}
- m_Father: {fileID: 665000139}
+ - {fileID: 905406068}
+ m_Father: {fileID: 1740950866}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -2650,7 +2774,7 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &1035055859
+--- !u!1 &886952270
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2658,85 +2782,35 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1035055860}
- - component: {fileID: 1035055861}
+ - component: {fileID: 886952271}
m_Layer: 5
- m_Name: Item
+ m_Name: Sliding Area
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &1035055860
+--- !u!224 &886952271
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1035055859}
+ m_GameObject: {fileID: 886952270}
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: 497961716}
- - {fileID: 1345966606}
- - {fileID: 736158047}
- m_Father: {fileID: 638057721}
+ - {fileID: 434511985}
+ m_Father: {fileID: 665000139}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.5}
- m_AnchorMax: {x: 1, y: 0.5}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 20}
+ m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1035055861
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1035055859}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_SelectedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_SelectedTrigger: Selected
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 497961717}
- toggleTransition: 1
- graphic: {fileID: 1345966607}
- m_Group: {fileID: 0}
- onValueChanged:
- m_PersistentCalls:
- m_Calls: []
- m_IsOn: 1
---- !u!1 &1069210152
+--- !u!1 &905406067
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2744,76 +2818,72 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1069210153}
- - component: {fileID: 1069210155}
- - component: {fileID: 1069210154}
+ - component: {fileID: 905406068}
+ - component: {fileID: 905406070}
+ - component: {fileID: 905406069}
m_Layer: 5
- m_Name: Item Label
+ m_Name: Handle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &1069210153
+--- !u!224 &905406068
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1069210152}
+ m_GameObject: {fileID: 905406067}
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: []
- m_Father: {fileID: 652536889}
- m_RootOrder: 2
+ m_Father: {fileID: 829915100}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 5, y: -0.5}
- m_SizeDelta: {x: -30, y: -3}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1069210154
+--- !u!114 &905406069
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1069210152}
+ m_GameObject: {fileID: 905406067}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 14
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 10
- m_MaxSize: 40
- m_Alignment: 3
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: Option A
---- !u!222 &1069210155
+ m_Sprite: {fileID: 10905, 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!222 &905406070
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1069210152}
+ m_GameObject: {fileID: 905406067}
m_CullTransparentMesh: 0
---- !u!1 &1119606190
+--- !u!1 &912875799
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2821,47 +2891,333 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1119606191}
- - component: {fileID: 1119606194}
- - component: {fileID: 1119606193}
- - component: {fileID: 1119606192}
+ - component: {fileID: 912875800}
+ - component: {fileID: 912875803}
+ - component: {fileID: 912875802}
+ - component: {fileID: 912875801}
m_Layer: 5
- m_Name: ChangeButton
+ m_Name: Scrollbar Horizontal
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &1119606191
+--- !u!224 &912875800
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1119606190}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_GameObject: {fileID: 912875799}
+ 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: 259287311}
- m_Father: {fileID: 1130152798}
- m_RootOrder: 3
+ - {fileID: 637169290}
+ m_Father: {fileID: 1565351064}
+ 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.000002861, y: -226.1}
- m_SizeDelta: {x: 145.3, y: 93.6}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1119606192
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 20}
+ m_Pivot: {x: 0, y: 0}
+--- !u!114 &912875801
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1119606190}
+ m_GameObject: {fileID: 912875799}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 2060602796}
+ m_HandleRect: {fileID: 2060602795}
+ m_Direction: 0
+ m_Value: 0
+ m_Size: 0.57281554
+ m_NumberOfSteps: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &912875802
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 912875799}
+ 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: 1}
+ m_RaycastTarget: 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!222 &912875803
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 912875799}
+ m_CullTransparentMesh: 0
+--- !u!1 &1035055859
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1035055860}
+ - component: {fileID: 1035055861}
+ m_Layer: 5
+ m_Name: Item
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1035055860
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1035055859}
+ 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: 497961716}
+ - {fileID: 1345966606}
+ - {fileID: 736158047}
+ m_Father: {fileID: 638057721}
+ m_RootOrder: 0
+ 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: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1035055861
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1035055859}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 497961717}
+ toggleTransition: 1
+ graphic: {fileID: 1345966607}
+ m_Group: {fileID: 0}
+ onValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_IsOn: 1
+--- !u!1 &1069210152
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1069210153}
+ - component: {fileID: 1069210155}
+ - component: {fileID: 1069210154}
+ m_Layer: 5
+ m_Name: Item Label
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1069210153
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1069210152}
+ 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: []
+ m_Father: {fileID: 652536889}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 5, y: -0.5}
+ m_SizeDelta: {x: -30, y: -3}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1069210154
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1069210152}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Option A
+--- !u!222 &1069210155
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1069210152}
+ m_CullTransparentMesh: 0
+--- !u!1 &1119606190
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1119606191}
+ - component: {fileID: 1119606194}
+ - component: {fileID: 1119606193}
+ - component: {fileID: 1119606192}
+ m_Layer: 5
+ m_Name: ChangeButton
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1119606191
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1119606190}
+ 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: 259287311}
+ m_Father: {fileID: 1130152798}
+ m_RootOrder: 3
+ 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.000002861, y: -226.1}
+ m_SizeDelta: {x: 145.3, y: 93.6}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1119606192
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1119606190}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -4041,7 +4397,7 @@ MonoBehaviour:
m_ScaleFactor: 1
m_ReferenceResolution: {x: 414, y: 736}
m_ScreenMatchMode: 0
- m_MatchWidthOrHeight: 0
+ m_MatchWidthOrHeight: 1
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
@@ -4078,7 +4434,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- - {fileID: 1606562827}
+ - {fileID: 1565351064}
- {fileID: 1334056115}
- {fileID: 1497447744}
- {fileID: 338512866}
@@ -4470,9 +4826,86 @@ CanvasRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1547974099}
+ m_GameObject: {fileID: 1547974099}
+ m_CullTransparentMesh: 0
+--- !u!1 &1555543616
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1555543617}
+ - component: {fileID: 1555543619}
+ - component: {fileID: 1555543618}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1555543617
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1555543616}
+ 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: []
+ m_Father: {fileID: 1666129873}
+ m_RootOrder: 0
+ 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}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1555543618
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1555543616}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 101
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u524A\u9664"
+--- !u!222 &1555543619
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1555543616}
m_CullTransparentMesh: 0
---- !u!1 &1555543616
+--- !u!1 &1565351063
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -4480,74 +4913,104 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1555543617}
- - component: {fileID: 1555543619}
- - component: {fileID: 1555543618}
+ - component: {fileID: 1565351064}
+ - component: {fileID: 1565351067}
+ - component: {fileID: 1565351066}
+ - component: {fileID: 1565351065}
m_Layer: 5
- m_Name: Text
+ m_Name: Scroll View
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &1555543617
+--- !u!224 &1565351064
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1555543616}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_GameObject: {fileID: 1565351063}
+ 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: []
- m_Father: {fileID: 1666129873}
+ m_Children:
+ - {fileID: 142933189}
+ - {fileID: 912875800}
+ - {fileID: 1740950866}
+ m_Father: {fileID: 1404803283}
m_RootOrder: 0
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}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 18.250004, y: 2.6}
+ m_SizeDelta: {x: 377.5, y: 581.4}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1555543618
+--- !u!114 &1565351065
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1555543616}
+ m_GameObject: {fileID: 1565351063}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Content: {fileID: 1606562827}
+ 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: 142933189}
+ m_HorizontalScrollbar: {fileID: 912875801}
+ m_VerticalScrollbar: {fileID: 1740950867}
+ m_HorizontalScrollbarVisibility: 1
+ m_VerticalScrollbarVisibility: 2
+ m_HorizontalScrollbarSpacing: -3
+ m_VerticalScrollbarSpacing: -3
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &1565351066
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1565351063}
+ 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: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 30
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 0
- m_MaxSize: 101
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\u524A\u9664"
---- !u!222 &1555543619
+ 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!222 &1565351067
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1555543616}
+ m_GameObject: {fileID: 1565351063}
m_CullTransparentMesh: 0
--- !u!1 &1584462986
GameObject:
@@ -4741,6 +5204,7 @@ GameObject:
- component: {fileID: 1606562830}
- component: {fileID: 1606562829}
- component: {fileID: 1606562828}
+ - component: {fileID: 1606562832}
m_Layer: 5
m_Name: DisplayPlaceButton
m_TagString: Untagged
@@ -4755,17 +5219,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1606562826}
- 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: []
- m_Father: {fileID: 1404803283}
+ m_Father: {fileID: 142933189}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 7, y: 2.5999756}
- m_SizeDelta: {x: -106.8, y: -154.6}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0.30004883}
+ m_SizeDelta: {x: 308, y: 582}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1606562828
MonoBehaviour:
@@ -4843,6 +5307,21 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1606562826}
m_CullTransparentMesh: 0
+--- !u!114 &1606562832
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1606562826}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3c4537d15df030346b8badf4ffcb7a10, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ strechPanel: {fileID: 1606562827}
+ myLayOut: {fileID: 1606562829}
+ startWait: 0.1
--- !u!1 &1622355172
GameObject:
m_ObjectHideFlags: 0
@@ -5285,6 +5764,129 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4e042f92075967440ba8e17b817a09dc, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &1740950865
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1740950866}
+ - component: {fileID: 1740950869}
+ - component: {fileID: 1740950868}
+ - component: {fileID: 1740950867}
+ m_Layer: 5
+ m_Name: Scrollbar Vertical
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1740950866
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1740950865}
+ 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: 829915100}
+ m_Father: {fileID: 1565351064}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 20, y: -17}
+ m_Pivot: {x: 1, y: 1}
+--- !u!114 &1740950867
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1740950865}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 905406069}
+ m_HandleRect: {fileID: 905406068}
+ m_Direction: 2
+ m_Value: 0
+ m_Size: 0.49948466
+ m_NumberOfSteps: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &1740950868
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1740950865}
+ 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: 1}
+ m_RaycastTarget: 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!222 &1740950869
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1740950865}
+ m_CullTransparentMesh: 0
--- !u!1 &1766514621
GameObject:
m_ObjectHideFlags: 0
@@ -5578,6 +6180,79 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2045038074}
m_CullTransparentMesh: 0
+--- !u!1 &2060602794
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2060602795}
+ - component: {fileID: 2060602797}
+ - component: {fileID: 2060602796}
+ m_Layer: 5
+ m_Name: Handle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2060602795
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2060602794}
+ 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: []
+ m_Father: {fileID: 637169290}
+ m_RootOrder: 0
+ 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: 20, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2060602796
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2060602794}
+ 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: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10905, 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!222 &2060602797
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2060602794}
+ m_CullTransparentMesh: 0
--- !u!1 &2064386645
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Script/CleanDataList.cs b/Assets/Script/CleanDataList.cs
index 3f7d3a9..9b9f21a 100644
--- a/Assets/Script/CleanDataList.cs
+++ b/Assets/Script/CleanDataList.cs
@@ -12,35 +12,127 @@ public class CleanPlaceData
[SerializeField] string place;
public string Place { get { return place; }private set { place = value; } }
- [SerializeField] SEDataTime lastUpdateTime;
- [SerializeField] SEDataTime cleanInterval;
- public SEDataTime CleanInterval { get { return cleanInterval; } }
- [SerializeField] string dateData;
- public string DateDataText { get { return dateData; } }
- [SerializeField] string cleanIntervalText;
- public string CleanIntervalText { get { return cleanIntervalText; } }
+ [SerializeField] SEDataTime lastUpdateTime_forSave;//セーブ用の「最終更新時刻」
+ [SerializeField] SEDataTime cleanInterval_forSave;//セーブ用の「掃除間隔データ」
+
+ //時間などの文字列データ=============================================
+ public string LastUpdateTimeText { get {return TimeCovertToString.GetDateTime(LastUpdateTime); } }
+ public string CleanIntervalText { get { return TimeCovertToString.GetTimeSpan(CleanInterval); } }
+ public string NextCleanLeftTimeText { get { return TimeCovertToString.GetTimeSpan(NextCleanLeftTime); } }
+ //==============================================
+
+ //追加============================
+ public DateTime LastUpdateTime { get; private set; }//最終更新時刻
+ public TimeSpan CleanInterval { get; protected set; }//掃除間隔
+ public DateTime NextCleanDate { get { return LastUpdateTime + CleanInterval; } }//次に掃除する日時
+ public TimeSpan LastCleanPassTime { get { return DateTime.Now - LastUpdateTime; } }//最後に掃除してからの経過時間
+ public TimeSpan NextCleanLeftTime { get { return NextCleanDate - DateTime.Now; } }//次に掃除するまでの時間
+ //=============================
public CleanPlaceData(string place)
{
this.place = place;
- lastUpdateTime = new SEDataTime(DateTime.Now);
- dateData = lastUpdateTime.EntryDate();
- cleanInterval = new SEDataTime();
- cleanIntervalText = cleanInterval.DayInterval();
+ LastUpdateTime = DateTime.Now;
+ CleanInterval = new TimeSpan();
+ SetSETime();
+ }
+ #region SEDataTimeへの操作
+ public bool CheckHaveTarget()
+ {
+ return cleanInterval_forSave.CheackHaveTarget();
+ }
+
+ public bool SetTarget(string key)
+ {
+ return cleanInterval_forSave.ChangeTarget(key);
}
public void SetCleanIntervalDate(int i)
{
- cleanInterval.ChangeDate(i);
- cleanIntervalText = cleanInterval.DayInterval();
+ cleanInterval_forSave.ChangeDate(i);//SEのほうを変更
+ SetDateTime();//TimeSpanをSEに同期
+
}
+ #endregion
public void ResetLastUpdateTime()//lastUpdateTimeを現在の時間にする.
{
- lastUpdateTime = new SEDataTime(DateTime.Now);
- dateData = lastUpdateTime.EntryDate();
+ LastUpdateTime = DateTime.Now;
+ SetSETime();
+ }
+ ///
+ /// DateTime->SEへの変換
+ ///
+ void SetSETime()
+ {
+ lastUpdateTime_forSave =new SEDataTime(LastUpdateTime);
+ cleanInterval_forSave = new SEDataTime(CleanInterval);
+ }
+
+ ///
+ /// SE->DateTImeへの変換
+ ///
+ void SetDateTime()
+ {
+ LastUpdateTime = TimeCalucurator.REDataTime(lastUpdateTime_forSave);
+ CleanInterval = TimeCalucurator.ReTimeSpan(cleanInterval_forSave);
+ }
+
+
+ public void ChangeCleanTimeSpan(int num)
+ {
+ cleanInterval_forSave.ChangeDate(num);
+ SetDateTime();
+ }
+
+ public void InitAction()
+ {
+ SetDateTime();
+ }
+}
+
+///
+/// 時間データをstringで返す関数群
+///
+public class TimeCovertToString
+{
+ public static string GetTimeSpan( TimeSpan time)
+ {
+ string result = "";
+ result += time.Days+"日";
+ return result;
+ }
+
+ public static string GetDateTime(DateTime time)
+ {
+ return time.Year +"年"+time.Month + "月" + time.Day + "日" + time.Hour + "時" + time.Minute + "分" + time.Second + "秒";
+ }
+}
+
+///
+/// 時間の計算をする関数群
+///
+public class TimeCalucurator
+{
+ public static TimeSpan GetTimeSpan(DateTime frontTime,DateTime backTime)
+ {
+ return frontTime - backTime;
+ }
+ public static DateTime REDataTime(SEDataTime time)
+ {
+ var datas = time.OutDayDatas();
+ DateTime reDataTime = new DateTime(datas[0],datas[1],datas[2],datas[3],datas[4],datas[5]);
+ return reDataTime;
+ }
+
+ public static TimeSpan ReTimeSpan(SEDataTime time)
+ {
+ var datas = time.OutDayDatas();
+ TimeSpan reDataTime = new TimeSpan(datas[0]*365+datas[1]*30+ datas[2], datas[3], datas[4], datas[5]);
+ return reDataTime;
}
}
+
[System.Serializable]
public class SEDataTime{
[SerializeField] int year;
@@ -53,6 +145,7 @@ public class SEDataTime{
Dictionary dataTimeDictionary;
+
public SEDataTime(DateTime time)
{
this.year = time.Year;
@@ -63,57 +156,37 @@ public SEDataTime(DateTime time)
this.second = time.Second;
}
- public SEDataTime()
+ public SEDataTime(TimeSpan time)
{
+ //var day_temp = time.Days;
this.year = 0;
this.month = 0;
- this.day = 0;
- this.hour = 0;
- this.minute = 0;
- this.second = 0;
- }
-
- public string EntryDate()
- {
- return this.month + "月" + this.day + "日" + this.hour + "時" + this.minute + "分" + this.second + "秒";
- }
- public string DayInterval()
- {
- string Result="";
- if(this.year != 0)
- {
- Result += year + "年";
- }
- if (this.month != 0)
- {
- Result += month + "ヶ月";
- }
- if (this.day != 0)
- {
- Result += day + "日";
- }
- if (this.hour != 0)
+ /*while (day_temp > 365)
{
- Result += hour + "時";
+ day_temp -= 365;
+ this.year += 1;
}
- if (this.minute != 0)
- {
- Result += minute + "分";
- }
- if (this.second != 0)
- {
- Result += second + "秒";
- }
- if(Result == "")
+
+ while (day_temp > 30)
{
- return "0秒";
- }
- return Result;
+ day_temp -= 30;
+ this.month += 1;
+ }*/
+
+ this.day = time.Days;
+ this.hour = time.Hours;
+ this.minute = time.Minutes;
+ this.second = time.Seconds;
}
- public void ChengeData_day(int i)
+ public SEDataTime()
{
- day = i;
+ this.year = 0;
+ this.month = 0;
+ this.day = 0;
+ this.hour = 0;
+ this.minute = 0;
+ this.second = 0;
}
public bool ChangeTarget(string key)
@@ -144,6 +217,13 @@ public void ChangeDate(int value)
}
if (dataTimeDictionary.ContainsKey(targetkey))
{
+ year = 0;
+ month = 0;
+ day = 0;
+ hour = 0;
+ minute = 0;
+ second = 0;
+
//dataTimeDictionary[targetkey] = value;
switch (targetkey)
{
@@ -200,7 +280,31 @@ void InitDictionary()
dataTimeDictionary.Add("Second", second);
}
-
+ //時間に換算する関数
+ public void CalcuToHour()
+ {
+ DateTime date1 = new DateTime(2010, 1, 1, 8, 0, 15);
+ DateTime date2 = new DateTime(2010, 6, 1, 11, 2, 16);
+ TimeSpan interval = date2 - date1;
+ Debug.Log(interval);
+ DateTime date3 = new DateTime(1,1,1,0,0,0);
+ date3 += interval;
+ //Debug.Log(date3);
+ interval = new TimeSpan(1, 2, 3);
+ date2 += interval;
+ //Debug.Log(date2);
+ }
+ public List OutDayDatas()
+ {
+ var result = new List();
+ result.Add(year);
+ result.Add(month);
+ result.Add(day);
+ result.Add(hour);
+ result.Add(minute);
+ result.Add(second);
+ return result;
+ }
}
///
@@ -244,7 +348,7 @@ public string GetPlaceData(int index)
public string GetDateData(int index)
{
- return placeDataList[index].DateDataText;
+ return placeDataList[index].LastUpdateTimeText;
}
///
diff --git a/Assets/Script/DisplayCleanPlaceData.cs b/Assets/Script/DisplayCleanPlaceData.cs
index e5d3ee4..485810b 100644
--- a/Assets/Script/DisplayCleanPlaceData.cs
+++ b/Assets/Script/DisplayCleanPlaceData.cs
@@ -9,24 +9,24 @@ public class DisplayCleanPlaceData : MonoBehaviour
[SerializeField] Text lastUpdateTime;
[SerializeField] Text intervalTime;
- ///
- /// 表示するデータの登録
- ///
+ ///
+ /// 表示するデータの登録
+ ///
///
- public void SetCleanPlaceData(CleanPlaceData data)
- {
- myData = data;
+ public void SetCleanPlaceData(CleanPlaceData data)
+ {
+ myData = data;
}
- ///
- /// データをテキストに表示する関数
+ ///
+ /// データをテキストに表示する関数
///
- public void DisplayData()
- {
- if (myData != null)
- {
- lastUpdateTime.text = myData.DateDataText;
- intervalTime.text = myData.CleanIntervalText;
- }
+ public void DisplayData()
+ {
+ if (myData != null)
+ {
+ lastUpdateTime.text = myData.LastUpdateTimeText;
+ intervalTime.text = myData.CleanIntervalText;
+ }
}
}
diff --git a/Assets/Script/MainBase.cs b/Assets/Script/MainBase.cs
index 9bdf664..155cc5d 100644
--- a/Assets/Script/MainBase.cs
+++ b/Assets/Script/MainBase.cs
@@ -36,7 +36,19 @@ public enum CurrentMode
void Start()
{
LoadData();
+ foreach(var d in cleanDataList.placeDataList)
+ {
+ d.InitAction();
+ }
+
ChangeMode(CurrentMode.DISPLAY);
+
+
+ SEDataTime data = new SEDataTime();
+
+ //data.CalcuToHour();
+ //data.TimeSpanCalculater();
+ //data.REDataTime();
}
void Update()
@@ -106,6 +118,19 @@ void Update()
break;
}
case CurrentMode.PLACEDATAMODE:
+ if (inputData == "test")
+ {
+ var nowData = cleanDataList.GetCleanPlaceData(nowTargetIndex);
+ /*Debug.Log("Next limit : "+nowData.NextCleanDate);
+ Debug.Log("Next span : " + nowData.NextCleanLeftTime.Days);
+ Debug.Log("Next span : " + nowData.NextCleanLeftTime.Hours);
+ Debug.Log("Next span : " + nowData.NextCleanLeftTime.Minutes);*/
+ Debug.Log( nowData.NextCleanLeftTimeText);
+
+
+ WaitInput();
+ }
+
if (inputData == "display")
{
ChangeMode(CurrentMode.DISPLAY);
@@ -141,7 +166,7 @@ void Update()
if (result)//入力が数字だった時
{
var nowData = cleanDataList.GetCleanPlaceData(nowTargetIndex);
- if (nowData.CleanInterval.CheackHaveTarget())
+ if (nowData.CheckHaveTarget())
{
nowData.SetCleanIntervalDate(num);
ChangeMode(CurrentMode.DATAUPDATE);
@@ -158,7 +183,7 @@ void Update()
else//入力が数字以外だった場合
{
var nowData = cleanDataList.GetCleanPlaceData(nowTargetIndex);
- if (!nowData.CleanInterval.ChangeTarget(inputData))
+ if (!nowData.SetTarget(inputData))
{
Debug.Log("error Input : "+inputData);
}
@@ -325,4 +350,12 @@ void SaveData(){
void LoadData(){
cleanDataList=dataSave.LoadData(cleanDataListPath);
}
+
+ [ContextMenu("testTimeLimit")]
+ public void Debug_testLimit()
+ {
+ var nowData = cleanDataList.GetCleanPlaceData(nowTargetIndex);
+ //var data= nowData.CleanInterval.DayDataUntilNextClean(nowData.CleanInterval,nowData.LastUpdateTime);
+ //Debug.Log(data);
+ }
}
diff --git a/Assets/Script/Main_UI.cs b/Assets/Script/Main_UI.cs
index 494cf9a..48ba145 100644
--- a/Assets/Script/Main_UI.cs
+++ b/Assets/Script/Main_UI.cs
@@ -166,7 +166,8 @@ void DisplayData()
layoutTextList.ResetText();
for (int i = 0; i < cleanDataList.placeDataList.Count; i++)
{
- layoutTextList.AddText(cleanDataList.GetPlaceData(i));
+ layoutTextList.AddText(cleanDataList.GetPlaceData(i)+
+ " あと"+cleanDataList.GetCleanPlaceData(i).NextCleanLeftTimeText);
}
}
diff --git a/Assets/cleanPlaceData.json b/Assets/cleanPlaceData.json
index 9c4278b..7ef3094 100644
--- a/Assets/cleanPlaceData.json
+++ b/Assets/cleanPlaceData.json
@@ -1 +1,5 @@
-{"placeDataList":[{"place":"daigo","lastUpdateTime":{"year":2019,"month":11,"day":11,"hour":20,"minute":8,"second":12},"cleanInterval":{"year":10,"month":0,"day":5,"hour":0,"minute":0,"second":0},"dateData":"11月11日20時8分12秒","cleanIntervalText":"10年5日"},{"place":"daigogogo","lastUpdateTime":{"year":2019,"month":11,"day":11,"hour":19,"minute":25,"second":18},"cleanInterval":{"year":0,"month":0,"day":0,"hour":0,"minute":0,"second":0},"dateData":"11月11日19時25分18秒","cleanIntervalText":""},{"place":"藤村大吾","lastUpdateTime":{"year":2019,"month":11,"day":11,"hour":19,"minute":58,"second":21},"cleanInterval":{"year":0,"month":0,"day":0,"hour":0,"minute":0,"second":0},"dateData":"11月11日19時58分21秒","cleanIntervalText":"0秒"},{"place":"４","lastUpdateTime":{"year":2019,"month":11,"day":14,"hour":15,"minute":51,"second":9},"cleanInterval":{"year":0,"month":0,"day":7,"hour":0,"minute":0,"second":0},"dateData":"11月14日15時51分9秒","cleanIntervalText":"7日"},{"place":"リビング","lastUpdateTime":{"year":2019,"month":11,"day":14,"hour":16,"minute":26,"second":17},"cleanInterval":{"year":0,"month":0,"day":0,"hour":0,"minute":0,"second":0},"dateData":"11月14日16時26分17秒","cleanIntervalText":"0秒"}]}
\ No newline at end of file
+<<<<<<< HEAD
+{"placeDataList":[{"place":"daigo","lastUpdateTime":{"year":2019,"month":11,"day":11,"hour":20,"minute":8,"second":12},"cleanInterval":{"year":10,"month":0,"day":5,"hour":0,"minute":0,"second":0},"dateData":"11月11日20時8分12秒","cleanIntervalText":"10年5日"},{"place":"daigogogo","lastUpdateTime":{"year":2019,"month":11,"day":11,"hour":19,"minute":25,"second":18},"cleanInterval":{"year":0,"month":0,"day":0,"hour":0,"minute":0,"second":0},"dateData":"11月11日19時25分18秒","cleanIntervalText":""},{"place":"藤村大吾","lastUpdateTime":{"year":2019,"month":11,"day":11,"hour":19,"minute":58,"second":21},"cleanInterval":{"year":0,"month":0,"day":0,"hour":0,"minute":0,"second":0},"dateData":"11月11日19時58分21秒","cleanIntervalText":"0秒"},{"place":"４","lastUpdateTime":{"year":2019,"month":11,"day":14,"hour":15,"minute":51,"second":9},"cleanInterval":{"year":0,"month":0,"day":7,"hour":0,"minute":0,"second":0},"dateData":"11月14日15時51分9秒","cleanIntervalText":"7日"},{"place":"リビング","lastUpdateTime":{"year":2019,"month":11,"day":14,"hour":16,"minute":26,"second":17},"cleanInterval":{"year":0,"month":0,"day":0,"hour":0,"minute":0,"second":0},"dateData":"11月14日16時26分17秒","cleanIntervalText":"0秒"}]}
+=======
+{"placeDataList":[{"place":"test","lastUpdateTime_forSave":{"year":2019,"month":11,"day":14,"hour":18,"minute":0,"second":47},"cleanInterval_forSave":{"year":0,"month":0,"day":1,"hour":0,"minute":0,"second":0}},{"place":"unko","lastUpdateTime_forSave":{"year":2019,"month":11,"day":14,"hour":18,"minute":24,"second":44},"cleanInterval_forSave":{"year":0,"month":1,"day":0,"hour":0,"minute":0,"second":0}}]}
+>>>>>>> 88a60e21e0199aecd9b24bfc1daba1d5957ce6d9
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 0147887..122e0f2 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -4,5 +4,8 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
- m_Scenes: []
+ m_Scenes:
+ - enabled: 1
+ path: Assets/Scenes/MainScene.unity
+ guid: 3fe6a8c0519d6d848b3a712de66ea41f
m_configObjects: {}
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index c47f386..094afdf 100644
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -35,6 +35,9 @@ GraphicsSettings:
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index 2b1ab8e..3e24348 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.2.7f2
-m_EditorVersionWithRevision: 2019.2.7f2 (c96f78eb5904)
+m_EditorVersion: 2019.2.8f1
+m_EditorVersionWithRevision: 2019.2.8f1 (ff5b465c8d13)
diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset
index fa0b146..c3ae9a0 100644
--- a/ProjectSettings/UnityConnectSettings.asset
+++ b/ProjectSettings/UnityConnectSettings.asset
@@ -4,7 +4,7 @@
UnityConnectSettings:
m_ObjectHideFlags: 0
serializedVersion: 1
- m_Enabled: 0
+ m_Enabled: 1
m_TestMode: 0
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events