diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 410a758..0474cd0 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -4118,6 +4118,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 176599693} m_CullTransparentMesh: 1 +--- !u!1 &181741204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 181741205} + - component: {fileID: 181741207} + - component: {fileID: 181741206} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &181741205 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 181741204} + 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: 255097491} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.9999999} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &181741206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 181741204} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 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 &181741207 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 181741204} + m_CullTransparentMesh: 1 --- !u!1 &192666331 GameObject: m_ObjectHideFlags: 0 @@ -5127,6 +5202,132 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 248521853} m_CullTransparentMesh: 1 +--- !u!1 &249198988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 249198989} + - component: {fileID: 249198992} + - component: {fileID: 249198991} + - component: {fileID: 249198990} + 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 &249198989 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249198988} + 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: 255097491} + m_Father: {fileID: 755865959} + m_RootOrder: 1 + 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: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &249198990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249198988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 181741206} + m_HandleRect: {fileID: 181741205} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &249198991 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249198988} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + 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!222 &249198992 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249198988} + m_CullTransparentMesh: 1 --- !u!1 &249508950 GameObject: m_ObjectHideFlags: 0 @@ -5328,6 +5529,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 252055468} m_CullTransparentMesh: 1 +--- !u!1 &255097490 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 255097491} + 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 &255097491 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 255097490} + 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: 181741205} + m_Father: {fileID: 249198989} + 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 &255869795 GameObject: m_ObjectHideFlags: 0 @@ -12555,6 +12792,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 499497005} m_CullTransparentMesh: 1 +--- !u!1 &501922200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 501922201} + - component: {fileID: 501922204} + - component: {fileID: 501922203} + - component: {fileID: 501922202} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &501922201 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 501922200} + 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: 1362635897} + m_Father: {fileID: 755865959} + 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: -17, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &501922202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 501922200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &501922203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 501922200} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 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 &501922204 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 501922200} + m_CullTransparentMesh: 1 --- !u!1 &504748474 GameObject: m_ObjectHideFlags: 0 @@ -14417,7 +14744,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1890798835} + - {fileID: 755865959} m_Father: {fileID: 242004464} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -19172,6 +19499,115 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &755865958 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 755865959} + - component: {fileID: 755865962} + - component: {fileID: 755865961} + - component: {fileID: 755865960} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &755865959 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755865958} + 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: 501922201} + - {fileID: 249198989} + - {fileID: 801393421} + m_Father: {fileID: 566097865} + 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: -600.0001, y: -160.00026} + m_SizeDelta: {x: 600, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &755865960 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755865958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1362635897} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 50 + m_Viewport: {fileID: 501922201} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 249198990} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &755865961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755865958} + 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.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + 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!222 &755865962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755865958} + m_CullTransparentMesh: 1 --- !u!1 &756250017 GameObject: m_ObjectHideFlags: 0 @@ -20525,7 +20961,7 @@ GameObject: - component: {fileID: 801393423} - component: {fileID: 801393422} m_Layer: 5 - m_Name: Button + m_Name: Close m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -20538,16 +20974,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 801393420} - 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: 1890798835} - m_RootOrder: 1 + m_Father: {fileID: 755865959} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000061035156, y: 0} + m_AnchoredPosition: {x: -18.999908, y: 0.00010681152} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 1, y: 1} --- !u!114 &801393422 @@ -20594,7 +21030,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1890798834} + - m_Target: {fileID: 755865958} m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_MethodName: SetActive m_Mode: 6 @@ -20606,6 +21042,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1111410415} + m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI + m_MethodName: set_text + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &801393423 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20619,7 +21067,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6415094, g: 0.6415094, b: 0.6415094, a: 1} + m_Color: {r: 0.047169805, g: 0.047169805, b: 0.047169805, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -28361,7 +28809,6 @@ GameObject: - component: {fileID: 1111410418} - component: {fileID: 1111410417} - component: {fileID: 1111410415} - - component: {fileID: 1111410416} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -28391,7 +28838,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 036631af73b15ac41a9d10f75f5bbafe, type: 3} - m_FontSize: 22 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -28400,24 +28847,9 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!114 &1111410416 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1111410414} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 1} - m_EffectDistance: {x: 1, y: 1} - m_UseGraphicAlpha: 1 --- !u!222 &1111410417 CanvasRenderer: m_ObjectHideFlags: 0 @@ -28437,13 +28869,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1890798835} + m_Father: {fileID: 1362635897} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: 540, y: 190} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: 535, y: 19.603962} m_Pivot: {x: 0, y: 1} --- !u!1 &1111689041 GameObject: @@ -30292,7 +30724,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1882365343} m_HandleRect: {fileID: 1882365342} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -34863,6 +35295,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1360377348} m_CullTransparentMesh: 1 +--- !u!1 &1362635896 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1362635897} + - component: {fileID: 1362635899} + - component: {fileID: 1362635898} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1362635897 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1362635896} + 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: 1111410418} + m_Father: {fileID: 501922201} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 19.603962} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1362635898 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1362635896} + 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 &1362635899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1362635896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 5 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1364855925 GameObject: m_ObjectHideFlags: 0 @@ -39248,7 +39758,7 @@ MonoBehaviour: PropPageCtrl: {fileID: 1552044446} SceneList: {fileID: 835845609} ScenePageCtrl: {fileID: 1045478985} - MessagePannel: {fileID: 1890798834} + MessageScrollRect: {fileID: 755865960} MessageText: {fileID: 1111410415} EmotionList: {fileID: 1699478760} FacialList: {fileID: 1684693614} @@ -48208,83 +48718,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 695731892} m_PrefabAsset: {fileID: 0} ---- !u!1 &1890798834 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1890798835} - - component: {fileID: 1890798837} - - component: {fileID: 1890798836} - m_Layer: 5 - m_Name: background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1890798835 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890798834} - 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: 1111410418} - - {fileID: 801393421} - m_Father: {fileID: 566097865} - 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: -300, y: -60.000122} - m_SizeDelta: {x: 600, y: 200} - m_Pivot: {x: 1, y: 1} ---- !u!114 &1890798836 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890798834} - 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.39215687} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - 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!222 &1890798837 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890798834} - m_CullTransparentMesh: 1 --- !u!1 &1892028685 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Config.cs b/Assets/Scripts/Config.cs index ab583d7..71ec41f 100644 --- a/Assets/Scripts/Config.cs +++ b/Assets/Scripts/Config.cs @@ -36,7 +36,7 @@ public class Config } catch (Exception ex) { - UmaViewerUI.Instance.ShowMessage("Config load error. Using default. " + ex.Message); + UmaViewerUI.Instance.ShowMessage("Config load error. Using default. " + ex.Message, UIMessageType.Error); MainPath = $@"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "Low"}\Cygames\umamusume"; } } @@ -47,7 +47,7 @@ public class Config public void UpdateConfig() { File.WriteAllText(configPath, JsonUtility.ToJson(this, true)); - UmaViewerUI.Instance.ShowMessage("The configuration has changed. Please restart the application."); + UmaViewerUI.Instance.ShowMessage("The configuration has changed. Please restart the application.", UIMessageType.Default); } } diff --git a/Assets/Scripts/Manifest/ManifestDB.cs b/Assets/Scripts/Manifest/ManifestDB.cs index f33dafd..9ee3bf5 100644 --- a/Assets/Scripts/Manifest/ManifestDB.cs +++ b/Assets/Scripts/Manifest/ManifestDB.cs @@ -13,8 +13,8 @@ public class ManifestDB { public SqliteConnection MetaDB; public static string DBPath; - public Action callback; - + public Action callback; + private bool isError; public ManifestDB() { string DBPath = $"{Config.Instance.MainPath}\\meta_umaviewer"; @@ -51,13 +51,14 @@ public class ManifestDB } } - public IEnumerator UpdateResourceVersion(Action callback) + public IEnumerator UpdateResourceVersion(Action callback) { + isError = false; this.callback = callback; - callback?.Invoke("Checking Resource Version"); + callback?.Invoke("Checking Resource Version", UIMessageType.Default); yield return UpdateMetaDB(); yield return UpdateMasterDB(); - callback?.Invoke($"Done. Please restart the application."); + callback?.Invoke(isError ? "Update aborted." : $"Done. Please restart the application.", isError ? UIMessageType.Error : UIMessageType.Success); } //umamusume uses the manifest file to generate meta database. @@ -68,7 +69,7 @@ public class ManifestDB public IEnumerator UpdateMetaDB() { string rootHash = null; - callback?.Invoke("Getting resource version"); + callback?.Invoke("Getting resource version", UIMessageType.Default); yield return UmaViewerDownload.DownloadText("https://www.tracenacademy.com/api/MetaC/root", txt => { if (string.IsNullOrEmpty(txt)) return; @@ -81,7 +82,9 @@ public class ManifestDB if (rootHash == null) { + callback?.Invoke("Get RootHash Error", UIMessageType.Error); Debug.LogError("Get RootHash Error"); + isError = true; yield break; } @@ -99,7 +102,7 @@ public class ManifestDB public IEnumerator UpdateMetaDB(ManifestEntry rootEntry) { - if (MetaDB == null || MetaDB.State == System.Data.ConnectionState.Closed) + if (MetaDB == null || MetaDB.State != System.Data.ConnectionState.Open) { Debug.LogError("Open Meta Database Error"); yield break; @@ -112,12 +115,13 @@ public class ManifestDB UpdateManifestEntry(index, "manifest3", rootEntry, ref command); //Insert platform - callback?.Invoke("Reading Platform Manifest"); + callback?.Invoke("Reading Platform Manifest", UIMessageType.Default); ManifestEntry[] platformEntrys = null; yield return GetManifest(rootEntry.hname, Kind.PlatformManifest, entrys => { platformEntrys = entrys; }); if (platformEntrys == null) { Debug.LogError("Read PlatformManifest Error"); + isError = true; MetaDB.Close(); yield break; } @@ -126,11 +130,13 @@ public class ManifestDB UpdateManifestEntry(index, "manifest2", platformEntry, ref command); //Insert AssetManifest + callback?.Invoke($"Reading Assets Manifest", UIMessageType.Default); ManifestEntry[] assetEntrys = null; yield return GetManifest(platformEntry.hname, Kind.AssetManifest, entrys => { assetEntrys = entrys; }); if (assetEntrys == null) { Debug.LogError("Read AssetManifest Error"); + isError = true; MetaDB.Close(); yield break; } @@ -139,7 +145,6 @@ public class ManifestDB for (int i = 0; i < assetEntrys.Length; i++) { index++; - callback?.Invoke($"Reading Assets Manifest : {assetEntrys[i].tname} ({i + 1}/{assetEntrys.Length})"); UpdateManifestEntry(index, "manifest", assetEntrys[i], ref command); } tran.Commit(); @@ -153,13 +158,14 @@ public class ManifestDB if (assets == null) { Debug.LogError("Read AssetManifest Error"); + isError = true; continue; } + callback?.Invoke($"Reading AssetBundles Manifest : {assetEntry.tname}", UIMessageType.Default); using SqliteTransaction tran = MetaDB.BeginTransaction(); for (int i = 0; i < assets.Length; i++) { index++; - callback?.Invoke($"Reading AssetBundles Manifest : {assetEntry.tname} ({i + 1}/{assets.Length})"); UpdateManifestEntry(index, assetEntry.tname, assets[i], ref command); } tran.Commit(); @@ -168,13 +174,17 @@ public class ManifestDB public IEnumerator UpdateMasterDB() { - if (MetaDB == null || MetaDB.State == System.Data.ConnectionState.Closed) + if (MetaDB == null || MetaDB.State != System.Data.ConnectionState.Open) { Debug.LogError("Open Meta Database Error"); + isError = true; yield break; } - callback?.Invoke($"Checking master.mdb"); + var masterPath = $"{Path.GetDirectoryName(DBPath)}\\master\\master_umaviewer.mdb"; + var masterDir = Path.GetDirectoryName(masterPath); + + callback?.Invoke($"Checking master.mdb", UIMessageType.Default); SqliteCommand command = new SqliteCommand("SELECT h FROM a WHERE n LIKE 'master.mdb.lz4'", MetaDB); var reader = command.ExecuteReader(); @@ -184,7 +194,7 @@ public class ManifestDB var path = GetManifestPath(hash); if (!File.Exists(path)) { - callback?.Invoke($"Downloading master.mdb"); + callback?.Invoke($"Downloading master.mdb", UIMessageType.Default); UnityWebRequest www = UnityWebRequest.Get(UmaViewerDownload.GetGenericRequestUrl(hash)); yield return www.SendWebRequest(); if (www.result == UnityWebRequest.Result.Success) @@ -194,20 +204,24 @@ public class ManifestDB else { Debug.LogError("Download Master.mdb Failed :" + www.error); + callback?.Invoke("Download Master.mdb Failed :" + www.error, UIMessageType.Error); + isError = true; yield break; } } - callback?.Invoke($"Decompress master.mdb"); - var masterPath = $"{Path.GetDirectoryName(DBPath)}/master/master_umaviewer.mdb"; - Directory.CreateDirectory(Path.GetDirectoryName(masterPath)); + callback?.Invoke($"Decompress master.mdb", UIMessageType.Default); try { - File.WriteAllBytes(masterPath, LZ4Util.DecompressFromFile(path)); + Directory.CreateDirectory(masterDir); + var bytes = LZ4Util.DecompressFromFile(path); + File.WriteAllBytes(masterPath, bytes); } - catch + catch (Exception e) { - callback?.Invoke($"Decompress master.mdb error"); + Debug.LogError($"Decompress master.mdb Error: {e.Message}"); + callback?.Invoke($"Decompress master.mdb Error", UIMessageType.Error); + isError = true; yield break; } } @@ -268,7 +282,7 @@ public class ManifestDB var path = GetManifestPath(hash); if (!File.Exists(path)) { - this.callback?.Invoke($"Downloading Manifest :{hash}"); + this.callback?.Invoke($"Downloading Manifest :{hash}", UIMessageType.Default); yield return DownloadManifest(hash); } if (File.Exists(path)) @@ -289,7 +303,8 @@ public class ManifestDB else { Debug.LogError("Download Manifest Failed :" + www.error); - callback?.Invoke($"Download Manifest Failed :{www.error},Update aborted"); + callback?.Invoke($"Download Manifest Failed :{www.error}", UIMessageType.Error); + isError = true; yield break; } } diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs index a5cc1a8..76c63fd 100644 --- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs +++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using Gallop; using System.IO; +using static UmaViewerUI; public class UmaDatabaseEntry { @@ -28,9 +29,9 @@ public class UmaDatabaseEntry public static void DownloadAsset(UmaDatabaseEntry entry) { var path = $"{Config.Instance.MainPath}\\dat\\{entry.Url.Substring(0, 2)}\\{entry.Url}"; - UmaViewerDownload.DownloadAssetSync(entry, path , delegate(string msg) + UmaViewerDownload.DownloadAssetSync(entry, path , delegate(string msg, UIMessageType type) { - UmaViewerUI.Instance.ShowMessage(msg); + Instance.ShowMessage(msg, type); }); } @@ -132,6 +133,13 @@ public class CostumeEntry public Sprite Icon; } +public enum UIMessageType +{ + Default, + Warning, + Error, + Success +} public enum UmaFileType { _3d_cutt, diff --git a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs index d5582b6..6a754ca 100644 --- a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs +++ b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs @@ -92,7 +92,7 @@ public class UmaDatabaseController { msg += "\nPlease install the dmm game client"; } - UmaViewerUI.Instance.ShowMessage(msg); + UmaViewerUI.Instance.ShowMessage(msg, UIMessageType.Error); } } @@ -131,7 +131,6 @@ public class UmaDatabaseController return ReadMaster(conn, "SELECT * FROM mob_data"); } - static IEnumerable ReadMaster(SqliteConnection conn,string sql) { SqliteCommand sqlite_cmd = conn.CreateCommand(); @@ -144,6 +143,7 @@ public class UmaDatabaseController { yield return (DataRow)temp.Current; } + sqlite_cmd.Dispose(); } static IEnumerable ReadFaceTypeData(SqliteConnection conn) @@ -191,7 +191,6 @@ public class UmaDatabaseController return null; } - public static DataRow ReadMobDressColor(string mobid) { var results= ReadMaster(instance.masterDb, $"SELECT * FROM mob_dress_color_set WHERE id LIKE {mobid}"); @@ -216,6 +215,11 @@ public class UmaDatabaseController { masterDb.Close(); metaDb.Close(); + masterDb.Dispose(); + metaDb.Dispose(); + SqliteConnection.ClearAllPools(); + GC.Collect(); + GC.WaitForPendingFinalizers(); } } diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index df36923..7e60cba 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -1744,16 +1744,19 @@ public class UmaViewerBuilder : MonoBehaviour { string value = $"chara/chr{id}/chr_icon_{id}"; var entry = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name.Equals(value)); - string path = entry.FilePath; - if (File.Exists(path)) + if (entry != null) { - AssetBundle assetBundle = AssetBundle.LoadFromFile(path); - if (assetBundle.Contains($"chr_icon_{id}")) + string path = entry.FilePath; + if (File.Exists(path)) { - Texture2D texture = (Texture2D)assetBundle.LoadAsset($"chr_icon_{id}"); - Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero); - assetBundle.Unload(false); - return sprite; + AssetBundle assetBundle = AssetBundle.LoadFromFile(path); + if (assetBundle.Contains($"chr_icon_{id}")) + { + Texture2D texture = (Texture2D)assetBundle.LoadAsset($"chr_icon_{id}"); + Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero); + assetBundle.Unload(false); + return sprite; + } } } return null; diff --git a/Assets/Scripts/UmaViewerDownload.cs b/Assets/Scripts/UmaViewerDownload.cs index 99eb7a5..40fe29c 100644 --- a/Assets/Scripts/UmaViewerDownload.cs +++ b/Assets/Scripts/UmaViewerDownload.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.IO; using UnityEngine; using UnityEngine.Networking; +using static UmaViewerUI; public class UmaViewerDownload : MonoBehaviour { @@ -28,13 +29,10 @@ public class UmaViewerDownload : MonoBehaviour } } - public static void DownloadAssetSync(UmaDatabaseEntry entry,string path, Action callback = null) + public static void DownloadAssetSync(UmaDatabaseEntry entry,string path, Action callback = null) { - string baseurl = GetAssetRequestUrl(entry.Url); - if (!string.IsNullOrEmpty(Path.GetExtension(entry.Name))) - { - baseurl = GetGenericRequestUrl(entry.Url); - } + callback?.Invoke($"Downloading AssetBundle: {Path.GetFileName(entry.Name)}", UIMessageType.Default); + string baseurl = (string.IsNullOrEmpty(Path.GetExtension(entry.Name)) ? GetAssetRequestUrl(entry.Url) : GetGenericRequestUrl(entry.Url)); using UnityWebRequest www = UnityWebRequest.Get(baseurl); www.SendWebRequest(); @@ -42,7 +40,7 @@ public class UmaViewerDownload : MonoBehaviour if (www.result != UnityWebRequest.Result.Success) { Debug.LogError(www.error); - callback?.Invoke($"Failed to download resources : {www.error}"); + callback?.Invoke($"Failed to download resources : {www.error}", UIMessageType.Error); } else { diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 5b5e553..102b79f 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -9,6 +9,7 @@ using System.Linq; using TMPro; using UnityEngine; using UnityEngine.UI; +using Debug = UnityEngine.Debug; public class UmaViewerUI : MonoBehaviour { @@ -40,7 +41,7 @@ public class UmaViewerUI : MonoBehaviour public PageManager PropPageCtrl; public ScrollRect SceneList; public PageManager ScenePageCtrl; - public GameObject MessagePannel; + public ScrollRect MessageScrollRect; public Text MessageText; [Header("lists")] @@ -1221,7 +1222,7 @@ public class UmaViewerUI : MonoBehaviour if (UpdateResVerCoroutine != null && Config.Instance.WorkMode != WorkMode.Standalone) return; UmaDatabaseController.Instance.CloseAllConnection(); ManifestDB dB = new ManifestDB(); - UpdateResVerCoroutine = dB.UpdateResourceVersion(delegate (string msg) { ShowMessage(msg); }); + UpdateResVerCoroutine = dB.UpdateResourceVersion(delegate (string msg, UIMessageType type) { ShowMessage(msg,type); }); StartCoroutine(UpdateResVerCoroutine); } @@ -1261,10 +1262,16 @@ public class UmaViewerUI : MonoBehaviour Shader.SetGlobalFloat("_GlobalOutlineWidth", val); } - public void ShowMessage(string msg) + public void ShowMessage(string msg, UIMessageType type) { - MessagePannel.SetActive(true); - MessageText.text = msg; + MessageText.text += type switch + { + UIMessageType.Error => string.Format("{0}\n", msg), + UIMessageType.Warning => string.Format("{0}\n", msg), + UIMessageType.Success => string.Format("{0}\n", msg), + _ => $"{msg}\n", + }; + MessageScrollRect.gameObject.SetActive(true); + MessageScrollRect.verticalNormalizedPosition = 0; } - }