diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index b41aedc..7e125d2 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -73,8 +73,10 @@ + + diff --git a/Assets/Graphics/Materials/wide line(doubleres)(stretch).mat b/Assets/Graphics/Materials/wide line(doubleres)(stretch).mat new file mode 100644 index 0000000..0d17200 --- /dev/null +++ b/Assets/Graphics/Materials/wide line(doubleres)(stretch).mat @@ -0,0 +1,119 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: wide line(doubleres)(stretch) + m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHABLEND_ON _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + m_LightmapFlags: 0 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - ALWAYS + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 43e41599f690ea846a985bf130e079c5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMask: 15 + - _ColorMode: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 1 + - _EmissionEnabled: 0 + - _EnableExternalAlpha: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _LightingEnabled: 0 + - _Metallic: 0 + - _Mode: 4 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 1 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 0 + m_Colors: + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0, g: 0.8213, b: 1, a: 1} + - _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0.25, g: 0.25, b: 0.25, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + - _Specular: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Graphics/linecover(stretch).png b/Assets/Graphics/linecover(stretch).png new file mode 100644 index 0000000..62764f1 Binary files /dev/null and b/Assets/Graphics/linecover(stretch).png differ diff --git a/Assets/Graphics/pause.png b/Assets/Graphics/pause.png new file mode 100644 index 0000000..a1b1697 Binary files /dev/null and b/Assets/Graphics/pause.png differ diff --git a/Assets/Graphics/play.png b/Assets/Graphics/play.png new file mode 100644 index 0000000..cb2c5e9 Binary files /dev/null and b/Assets/Graphics/play.png differ diff --git a/Assets/Graphics/wide line(doubleres)(stretch).png b/Assets/Graphics/wide line(doubleres)(stretch).png new file mode 100644 index 0000000..9f48e62 Binary files /dev/null and b/Assets/Graphics/wide line(doubleres)(stretch).png differ diff --git a/Assets/Resources/New Material.mat b/Assets/Resources/New Material.mat new file mode 100644 index 0000000..93a9403 --- /dev/null +++ b/Assets/Resources/New Material.mat @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Material + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _ALPHAPREMULTIPLY_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EnableExternalAlpha: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Resources/pause.png b/Assets/Resources/pause.png new file mode 100644 index 0000000..2e9b8ae Binary files /dev/null and b/Assets/Resources/pause.png differ diff --git a/Assets/Resources/play.png b/Assets/Resources/play.png new file mode 100644 index 0000000..741ef0e Binary files /dev/null and b/Assets/Resources/play.png differ diff --git a/Assets/Scenes/gameplay.unity b/Assets/Scenes/gameplay.unity index 8e83c00..dc777f1 100644 --- a/Assets/Scenes/gameplay.unity +++ b/Assets/Scenes/gameplay.unity @@ -156,8 +156,9 @@ RectTransform: - {fileID: 527138616} - {fileID: 1610915245} - {fileID: 764225839} + - {fileID: 1052748394} m_Father: {fileID: 195393353} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -177,7 +178,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.3137255} + m_Color: {r: 0, g: 0, b: 0, a: 0.3764706} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -231,12 +232,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 195393353} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -297, y: 3} - m_SizeDelta: {x: 434.40454, y: 574.99994} + m_AnchoredPosition: {x: -302, y: 0} + m_SizeDelta: {x: 434.40454, y: 574} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &162652244 MonoBehaviour: @@ -375,7 +376,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &195393349 GameObject: @@ -468,13 +469,14 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1214107196} + - {fileID: 1332371260} - {fileID: 215633822} - {fileID: 162652243} - {fileID: 85128991} - {fileID: 676209737} - {fileID: 775839459} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -589,7 +591,7 @@ RectTransform: - {fileID: 1610823697} - {fileID: 1412832945} m_Father: {fileID: 195393353} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -830,12 +832,12 @@ RectTransform: m_Children: - {fileID: 199041650} m_Father: {fileID: 1412832945} - m_RootOrder: 0 + 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: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} + m_AnchoredPosition: {x: 0, y: -1.4000015} + m_SizeDelta: {x: -19.99995, y: 12.221924} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &458455753 GameObject: @@ -1198,8 +1200,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0.000061035} - m_SizeDelta: {x: 1020, y: 573.99994} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1024, y: 573.99994} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &654221312 MonoBehaviour: @@ -1269,7 +1271,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 195393353} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1420,7 +1422,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &739849727 RectTransform: m_ObjectHideFlags: 0 @@ -1657,7 +1659,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 195393353} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1917,6 +1919,211 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 958417784} m_CullTransparentMesh: 0 +--- !u!1 &999269847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 999269848} + - component: {fileID: 999269850} + - component: {fileID: 999269849} + m_Layer: 8 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &999269848 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999269847} + 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: 1884089172} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1024, y: 574} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &999269849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999269847} + 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.9056604, g: 0.9056604, b: 0.9056604, a: 0.2509804} + m_RaycastTarget: 1 + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b503a58971fa454489807071a2727a2a, type: 3} + m_Type: 0 + 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 &999269850 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999269847} + m_CullTransparentMesh: 0 +--- !u!1 &1052748393 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1052748394} + - component: {fileID: 1052748397} + - component: {fileID: 1052748396} + - component: {fileID: 1052748395} + - component: {fileID: 1052748398} + m_Layer: 5 + m_Name: PlayButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1052748394 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1052748393} + 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: 85128991} + m_RootOrder: 6 + 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: -217, y: -53} + m_SizeDelta: {x: 48, y: 48} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1052748395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1052748393} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1052748396} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1052748396 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1052748393} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 1247c12da09410d44bfe28163506b399, type: 3} + m_Type: 0 + 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 &1052748397 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1052748393} + m_CullTransparentMesh: 0 +--- !u!114 &1052748398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1052748393} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c953de3efdb264043b91b1d8c489a6ce, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1097725190 GameObject: m_ObjectHideFlags: 0 @@ -2002,6 +2209,7 @@ GameObject: - component: {fileID: 1214107196} - component: {fileID: 1214107198} - component: {fileID: 1214107197} + - component: {fileID: 1214107199} m_Layer: 5 m_Name: SongImage m_TagString: Untagged @@ -2016,19 +2224,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1214107195} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.10452846, w: 0.9945219} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.655, y: 0.655, z: 1} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: - {fileID: 739849727} - {fileID: 2115507994} m_Father: {fileID: 195393353} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 12} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -204.5, y: 1} - m_SizeDelta: {x: 570, y: 880} + m_AnchoredPosition: {x: -205, y: 23} + m_SizeDelta: {x: 460, y: 460} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1214107197 MonoBehaviour: @@ -2067,6 +2275,113 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1214107195} m_CullTransparentMesh: 0 +--- !u!114 &1214107199 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1214107195} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.21960784} + m_EffectDistance: {x: -20, y: -20} + m_UseGraphicAlpha: 1 +--- !u!1 &1293466181 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1293466183} + - component: {fileID: 1293466182} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1293466182 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1293466181} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1293466183 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1293466181} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: -17.35, y: 0.55813336, z: 91.58} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1307926492 GameObject: m_ObjectHideFlags: 0 @@ -2097,11 +2412,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1412832945} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.000013351, y: 112.1} + m_AnchoredPosition: {x: 0, y: 112.1} m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1307926494 @@ -2141,6 +2456,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1307926492} m_CullTransparentMesh: 0 +--- !u!1 &1332371255 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1332371260} + - component: {fileID: 1332371259} + - component: {fileID: 1332371258} + - component: {fileID: 1332371257} + - component: {fileID: 1332371256} + m_Layer: 5 + m_Name: HexLine (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1332371256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1332371255} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 46efa0cf951288943ac8d2b5a3155d5f, type: 3} + m_Name: + m_EditorClassIdentifier: + quadGameObject: {fileID: 0} +--- !u!64 &1332371257 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1332371255} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1332371258 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1332371255} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 94b8d8db183f9774aafb4469aec611c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1332371259 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1332371255} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1332371260 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1332371255} + m_LocalRotation: {x: -0, y: -0, z: 0.087155774, w: 0.9961947} + m_LocalPosition: {x: -15, y: 174, z: -0.5} + m_LocalScale: {x: 1274.3757, y: 155.41173, z: 57.559887} + m_Children: [] + m_Father: {fileID: 195393353} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 10} --- !u!1 &1412832944 GameObject: m_ObjectHideFlags: 0 @@ -2172,9 +2595,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 446225461} - {fileID: 1307926493} - {fileID: 1919517977} + - {fileID: 446225461} m_Father: {fileID: 215633822} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} @@ -2399,8 +2822,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0.000022888} - m_SizeDelta: {x: 1020, y: 573.99994} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1024, y: 574} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1434511999 MonoBehaviour: @@ -2439,6 +2862,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1434511997} m_CullTransparentMesh: 0 +--- !u!1 &1447288099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1447288103} + - component: {fileID: 1447288102} + - component: {fileID: 1447288101} + - component: {fileID: 1447288100} + - component: {fileID: 1447288104} + m_Layer: 8 + m_Name: HexLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &1447288100 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447288099} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1447288101 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447288099} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 94b8d8db183f9774aafb4469aec611c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1447288102 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447288099} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1447288103 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447288099} + m_LocalRotation: {x: -0, y: -0, z: -0.6427876, w: 0.7660445} + m_LocalPosition: {x: -5.28, y: -0.74, z: 0} + m_LocalScale: {x: 24.6, y: 3, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -80} +--- !u!114 &1447288104 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447288099} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 46efa0cf951288943ac8d2b5a3155d5f, type: 3} + m_Name: + m_EditorClassIdentifier: + quadGameObject: {fileID: 0} --- !u!1 &1584246054 GameObject: m_ObjectHideFlags: 0 @@ -2920,7 +3451,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!120 &1784338458 LineRenderer: @@ -3207,8 +3738,9 @@ RectTransform: m_Children: - {fileID: 654221311} - {fileID: 1434511998} + - {fileID: 999269848} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3281,11 +3813,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1412832945} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.000026703, y: -112} + m_AnchoredPosition: {x: 0, y: -112} m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1919517978 @@ -3342,7 +3874,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2115507994 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/SongListScrollbar.cs b/Assets/SongListScrollbar.cs index 57b71df..ffb145f 100644 --- a/Assets/SongListScrollbar.cs +++ b/Assets/SongListScrollbar.cs @@ -6,13 +6,14 @@ public class SongListScrollbar : MonoBehaviour { // Update is called once per frame + private bool HasFocus; void Update() { - if(Input.GetAxis("Mouse ScrollWheel") > 0 && m_Scrollbar.value<1) + if(HasFocus && Input.GetAxis("Mouse ScrollWheel") > 0 && m_Scrollbar.value<1) { m_Scrollbar.value += 0.02f; } - if(Input.GetAxis("Mouse ScrollWheel") < 0 && m_Scrollbar.value>0) + if(HasFocus && Input.GetAxis("Mouse ScrollWheel") < 0 && m_Scrollbar.value>0) { m_Scrollbar.value -= 0.02f; } @@ -34,5 +35,9 @@ private void OnValueChangedPrivate(float T) MusicWheelBase.UpdateWheelPos(T); //print("代码控制" + T); } - + void OnApplicationFocus(bool focus) + { + //Debug.Log(string.Format("OnApplicationFocus:{0}", focus)); + HasFocus = focus; + } } diff --git a/Assets/scripts/MusicLoader.cs b/Assets/scripts/MusicLoader.cs index 692faa6..abe9c92 100644 --- a/Assets/scripts/MusicLoader.cs +++ b/Assets/scripts/MusicLoader.cs @@ -273,10 +273,10 @@ private static void CreateWheelItems(List mdata) temp.text_title.transform.localPosition = new Vector3(0, 2.8f, 0); temp.text_title_tm.fontSize = 24; - temp.text_artist.transform.localPosition = new Vector3(0, -0.2f, 0); - temp.text_artist_tm.fontSize = 16; + temp.text_artist.transform.localPosition = new Vector3(0, -1f, 0); + temp.text_artist_tm.fontSize = 12; - temp.text_animation.transform.localPosition = new Vector3(38, -0.2f, 0); + temp.text_animation.transform.localPosition = new Vector3(38, -0.8f, 0); temp.text_animation_tm.fontSize = 16; temp.text_animation_tm.anchor = TextAnchor.UpperRight; diff --git a/Assets/scripts/MusicPlayer.cs b/Assets/scripts/MusicPlayer.cs index 7dcb87a..a3c7526 100644 --- a/Assets/scripts/MusicPlayer.cs +++ b/Assets/scripts/MusicPlayer.cs @@ -9,15 +9,22 @@ public static class MusicPlayer { private const string cLocalPath = "file:///"; private static Dictionary audioDic = new Dictionary(); - public static string currentAudio; + public static string currentAudio= ""; private static AudioSource bgAudioSource; private static bool is_playing; private static object audioload_lock = new object(); + public static string GetCurAudio() + { + return currentAudio; + } public static float GetSongLength() { - return bgAudioSource.clip.length; + if (bgAudioSource.clip) + return bgAudioSource.clip.length; + else + return 0.01f; } public static bool GetIsPlaying() { @@ -135,12 +142,12 @@ public static void PlayAudio(string audioName, float volume = 1, bool isLoop = f } } } - public static void PauseAudio(int index) + public static void PauseAudio() { bgAudioSource.Pause(); is_playing = false; } - public static void ResumeAudio(int index) + public static void ResumeAudio() { bgAudioSource.UnPause(); is_playing = true; diff --git a/Assets/scripts/MusicWheelItem.cs b/Assets/scripts/MusicWheelItem.cs index 77085b7..5b3f9e0 100644 --- a/Assets/scripts/MusicWheelItem.cs +++ b/Assets/scripts/MusicWheelItem.cs @@ -120,14 +120,19 @@ public void ButtonClicked() fileStream = null; //创建Texture - int width = 570; - int height = 880; - Texture2D texture = new Texture2D(width, height); + //int width = 570; + //int height = 880; + Texture2D texture = new Texture2D(0,0); texture.LoadImage(bytes); //创建Sprite + int area = texture.width * texture.height; + int max_area = 570 * 880; + float ratio = (float)(System.Math.Sqrt(max_area *1.0f / area)); Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f)); img.sprite = sprite; + img.GetComponent().sizeDelta = new Vector2(texture.width * ratio, texture.height * ratio); + } } diff --git a/Assets/scripts/PlayButton.cs b/Assets/scripts/PlayButton.cs new file mode 100644 index 0000000..ccda20e --- /dev/null +++ b/Assets/scripts/PlayButton.cs @@ -0,0 +1,42 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +public class PlayButton : MonoBehaviour +{ + // Start is called before the first frame update + private Button m_Button; + private Sprite play, pause; + void Start() + { + m_Button = gameObject.GetComponent