diff --git a/.gitignore b/.gitignore index 906129e..c0c0d74 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ sysinfo.txt *.apk *.unitypackage -Skin/*.* +UserSettings/* +Skin/* [Ll]ogs/* */[Ll]ogs/ diff --git a/Assets/Animation/CanvasAllPerfect.controller b/Assets/Animation/CanvasAllPerfect.controller index 8616739..ed99417 100644 --- a/Assets/Animation/CanvasAllPerfect.controller +++ b/Assets/Animation/CanvasAllPerfect.controller @@ -24,7 +24,7 @@ AnimatorController: m_Controller: {fileID: 9100000} --- !u!1107 &1117506739050932553 AnimatorStateMachine: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -33,7 +33,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 3247206718786772042} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 170, y: 190, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -46,7 +46,7 @@ AnimatorStateMachine: m_DefaultState: {fileID: 3247206718786772042} --- !u!1102 &3247206718786772042 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} diff --git a/Assets/Animation/Enter.anim b/Assets/Animation/Enter.anim index efd8a9a..b236010 100644 --- a/Assets/Animation/Enter.anim +++ b/Assets/Animation/Enter.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Enter - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -1828,6 +1828,43 @@ AnimationClip: path: APTEXT classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 2.8333333 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 3.1166666 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: ifStopRecording + path: + classID: 114 + script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -2095,6 +2132,13 @@ AnimationClip: typeID: 114 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3997314808 + script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1636770510 attribute: 2012719827 @@ -4183,6 +4227,43 @@ AnimationClip: path: APTEXT classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 2.8333333 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 3.1166666 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: ifStopRecording + path: + classID: 114 + script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Animation/JudgeBreak.anim b/Assets/Animation/JudgeBreak.anim new file mode 100644 index 0000000..0d8e05b --- /dev/null +++ b/Assets/Animation/JudgeBreak.anim @@ -0,0 +1,799 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JudgeBreak + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.2, y: 1.2, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: -3.0000005, y: -3.0000005, z: 0} + tangentMode: 0 + weightedMode: 2 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: JudgeObject + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.033333335 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.13333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1408019306 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2255016015 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2708085679 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2708085679 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2255016015 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2708085679 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2708085679 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2708085679 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2255016015 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2255016015 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2255016015 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.26666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.2 + inSlope: 0 + outSlope: -3.0000005 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: JudgeObject + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.2 + inSlope: 0 + outSlope: -3.0000005 + tangentMode: 65 + weightedMode: 2 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: JudgeObject + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: JudgeObject + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.033333335 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.13333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animation/JudgeBreak.anim.meta b/Assets/Animation/JudgeBreak.anim.meta new file mode 100644 index 0000000..1d96255 --- /dev/null +++ b/Assets/Animation/JudgeBreak.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42ad63122f3e0b944be62809c7ecb5c8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/JudgeEffect.controller b/Assets/Animation/JudgeEffect.controller new file mode 100644 index 0000000..1562f40 --- /dev/null +++ b/Assets/Animation/JudgeEffect.controller @@ -0,0 +1,240 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7426094377907327046 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JudgeIdle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 0139faae7ae35e14ca77370ba703be6b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-1126496831170440374 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JudgePerfect + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6660494152816089610} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 01a9f99813df2684d81f0588fd87e579, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JudgeEffect + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: perfect + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: break + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1780916007845171235} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1466101702976956874 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: break + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3650563550030023891} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &1780916007845171235 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -1126496831170440374} + m_Position: {x: 520, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7426094377907327046} + m_Position: {x: 360, y: -40, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3650563550030023891} + m_Position: {x: 270, y: 130, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 1466101702976956874} + - {fileID: 2456276686933160316} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 410, y: 310, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7426094377907327046} +--- !u!1101 &2456276686933160316 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: perfect + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1126496831170440374} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &3148295754947858700 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7426094377907327046} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &3650563550030023891 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JudgeBreak + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3148295754947858700} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 42ad63122f3e0b944be62809c7ecb5c8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6660494152816089610 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7426094377907327046} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animation/JudgeEffect.controller.meta b/Assets/Animation/JudgeEffect.controller.meta new file mode 100644 index 0000000..008ef5e --- /dev/null +++ b/Assets/Animation/JudgeEffect.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 22a146866860039438dfe95073e55db2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/JudgeIdle.anim b/Assets/Animation/JudgeIdle.anim new file mode 100644 index 0000000..43359d8 --- /dev/null +++ b/Assets/Animation/JudgeIdle.anim @@ -0,0 +1,143 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JudgeIdle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2708085679 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2255016015 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animation/JudgeIdle.anim.meta b/Assets/Animation/JudgeIdle.anim.meta new file mode 100644 index 0000000..009aeb9 --- /dev/null +++ b/Assets/Animation/JudgeIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0139faae7ae35e14ca77370ba703be6b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/JudgePerfect.anim b/Assets/Animation/JudgePerfect.anim new file mode 100644 index 0000000..744db7d --- /dev/null +++ b/Assets/Animation/JudgePerfect.anim @@ -0,0 +1,457 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JudgePerfect + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.2, y: 1.2, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: -3.0000005, y: -3.0000005, z: 0} + tangentMode: 0 + weightedMode: 2 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: JudgeObject + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1408019306 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2255016015 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2708085679 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2708085679 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2708085679 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2708085679 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2708085679 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.26666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.2 + inSlope: 0 + outSlope: -3.0000005 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: JudgeObject + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.2 + inSlope: 0 + outSlope: -3.0000005 + tangentMode: 65 + weightedMode: 2 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: JudgeObject + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: JudgeObject + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: JudgeObject/JudgeCPBreak + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: JudgeObject/JudgeCPNormal + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animation/JudgePerfect.anim.meta b/Assets/Animation/JudgePerfect.anim.meta new file mode 100644 index 0000000..d33bc9e --- /dev/null +++ b/Assets/Animation/JudgePerfect.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01a9f99813df2684d81f0588fd87e579 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Newtonsoft.Json.dll b/Assets/Plugins/Newtonsoft.Json.dll deleted file mode 100644 index 7af125a..0000000 Binary files a/Assets/Plugins/Newtonsoft.Json.dll and /dev/null differ diff --git a/Assets/Plugins/Newtonsoft.Json.dll.meta b/Assets/Plugins/Newtonsoft.Json.dll.meta deleted file mode 100644 index 04c1014..0000000 --- a/Assets/Plugins/Newtonsoft.Json.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: f1d1405f0fcbc99489f2a9d11ac56889 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefab/JudgeEffect.prefab b/Assets/Prefab/JudgeEffect.prefab new file mode 100644 index 0000000..1f66bae --- /dev/null +++ b/Assets/Prefab/JudgeEffect.prefab @@ -0,0 +1,251 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2214473122963414705 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1192576573309369434} + - component: {fileID: 5001827038414356516} + m_Layer: 0 + m_Name: JudgeEffect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1192576573309369434 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2214473122963414705} + m_LocalRotation: {x: 0, y: 0, z: -0.19509031, w: 0.98078537} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5123323238899579474} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -22.5} +--- !u!95 &5001827038414356516 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2214473122963414705} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 22a146866860039438dfe95073e55db2, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &5311390038410455478 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5123323238899579474} + m_Layer: 0 + m_Name: JudgeObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5123323238899579474 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5311390038410455478} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 3.92, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1806183516818557250} + - {fileID: 9141752703312117328} + m_Father: {fileID: 1192576573309369434} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6304527099344860671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9141752703312117328} + - component: {fileID: 3446787945564226199} + m_Layer: 0 + m_Name: JudgeCPBreak + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9141752703312117328 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6304527099344860671} + 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: 5123323238899579474} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3446787945564226199 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6304527099344860671} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 6cea13e5ba8275446be27a38daed20c7, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1918292637 + m_SortingLayer: 6 + m_SortingOrder: 33 + m_Sprite: {fileID: 21300000, guid: 25d0ff7497bd679459d11c5f342c99d6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.23, y: 0.82} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7993024342612718064 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1806183516818557250} + - component: {fileID: 5633416346708387541} + m_Layer: 0 + m_Name: JudgeCPNormal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1806183516818557250 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7993024342612718064} + 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: 5123323238899579474} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5633416346708387541 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7993024342612718064} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1918292637 + m_SortingLayer: 6 + m_SortingOrder: 32 + m_Sprite: {fileID: 21300000, guid: 6ee24318956cb154187385e5ac248fc2, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.23, y: 0.82} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefab/JudgeEffect.prefab.meta b/Assets/Prefab/JudgeEffect.prefab.meta new file mode 100644 index 0000000..5122723 --- /dev/null +++ b/Assets/Prefab/JudgeEffect.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e863ee95f9b63c044a47510ad82daf33 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/Touch.prefab b/Assets/Prefab/Touch.prefab index 2cf36c7..21da725 100644 --- a/Assets/Prefab/Touch.prefab +++ b/Assets/Prefab/Touch.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3167371521363346914} - component: {fileID: 3167371521363346913} m_Layer: 0 - m_Name: UI_NOTES_Touch_01 + m_Name: TouchPart_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -94,7 +94,7 @@ GameObject: - component: {fileID: 3167371521865756102} - component: {fileID: 3167371521865756103} m_Layer: 0 - m_Name: UI_NOTES_Touch_Just + m_Name: Touch_Just m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -177,7 +177,7 @@ GameObject: - component: {fileID: 3167371521975138487} - component: {fileID: 3167371521975138486} m_Layer: 0 - m_Name: UI_NOTES_Touch_01 (3) + m_Name: TouchPart_4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -260,7 +260,7 @@ GameObject: - component: {fileID: 3167371522082856908} - component: {fileID: 3167371522082856915} m_Layer: 0 - m_Name: UI_NOTES_Touch_Point + m_Name: Touch_Point m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -392,8 +392,6 @@ MonoBehaviour: tapEffect: {fileID: 544298055609030963, guid: ce8dca9ef711fc640a1b90ad7fb49838, type: 3} justEffect: {fileID: 3167371521865756101} - fireworkEffect: {fileID: 4239088390834088340, guid: c1701d28c8a13d74a90a9e4dea169092, - type: 3} multTouchEffect2: {fileID: 3167371522247862228} multTouchEffect3: {fileID: 3167371522402805961} faneachSprite: {fileID: 21300000, guid: f3974af5b544d2f459706acf1fa30d1e, type: 3} @@ -421,7 +419,7 @@ GameObject: - component: {fileID: 3167371522247862229} - component: {fileID: 3167371522247862230} m_Layer: 0 - m_Name: UI_NOTES_Touch_two + m_Name: Touch_border_two m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -504,7 +502,7 @@ GameObject: - component: {fileID: 3167371522283853493} - component: {fileID: 3167371522283853492} m_Layer: 0 - m_Name: UI_NOTES_Touch_01 (1) + m_Name: TouchPart_2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -587,7 +585,7 @@ GameObject: - component: {fileID: 3167371522402805962} - component: {fileID: 3167371522402805963} m_Layer: 0 - m_Name: UI_NOTES_Touch_three + m_Name: Touch_border_three m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -670,7 +668,7 @@ GameObject: - component: {fileID: 3167371522500999631} - component: {fileID: 3167371522500999630} m_Layer: 0 - m_Name: UI_NOTES_Touch_01 (2) + m_Name: TouchPart_3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefab/TouchHold.prefab b/Assets/Prefab/TouchHold.prefab index 4377ea4..5f43ef1 100644 --- a/Assets/Prefab/TouchHold.prefab +++ b/Assets/Prefab/TouchHold.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4570065831502088320} - component: {fileID: 4570065831502088327} m_Layer: 0 - m_Name: UI_NOTES_Touch_Point + m_Name: Touch_Point m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -42,10 +42,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -92,7 +94,7 @@ GameObject: - component: {fileID: 4570065831695336319} - component: {fileID: 4570065831695336312} m_Layer: 0 - m_Name: UI_NOTES_Touch_Hold_hold + m_Name: TouchHold_Border m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -123,10 +125,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -173,7 +177,7 @@ GameObject: - component: {fileID: 4570065831800169650} - component: {fileID: 4570065831800169649} m_Layer: 0 - m_Name: UI_NOTES_Touch_Hold_04 + m_Name: Touch_Hold_04 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -204,10 +208,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -254,7 +260,7 @@ GameObject: - component: {fileID: 4570065831974175033} - component: {fileID: 4570065831974175032} m_Layer: 0 - m_Name: New Sprite Mask + m_Name: TouchHold_Mask m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -285,10 +291,12 @@ SpriteMask: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -334,7 +342,7 @@ GameObject: - component: {fileID: 4570065832111625921} - component: {fileID: 4570065832111625920} m_Layer: 0 - m_Name: UI_NOTES_Touch_Hold_02 + m_Name: Touch_Hold_02 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -365,10 +373,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -415,7 +425,7 @@ GameObject: - component: {fileID: 4570065832418346543} - component: {fileID: 4570065832418346542} m_Layer: 0 - m_Name: UI_NOTES_Touch_Hold_03 + m_Name: Touch_Hold_03 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -446,10 +456,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -496,7 +508,7 @@ GameObject: - component: {fileID: 4570065832687991484} - component: {fileID: 4570065832687991427} m_Layer: 0 - m_Name: UI_NOTES_Touch_Hold_01 + m_Name: Touch_Hold_01 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -527,10 +539,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -624,8 +638,6 @@ MonoBehaviour: type: 3} holdEffect: {fileID: 692072832370815118, guid: 0bed8d7e7c63e184ab46c11a9653a6e2, type: 3} - fireworkEffect: {fileID: 4239088390834088340, guid: c1701d28c8a13d74a90a9e4dea169092, - type: 3} fans: - {fileID: 4570065831800169648} - {fileID: 4570065832418346541} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 1803862..56efb1f 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -123,6 +123,81 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &4894382 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 532882189} + m_Modifications: + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.19509041 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.9807853 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 157.5 + objectReference: {fileID: 0} + - target: {fileID: 2214473122963414705, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_Name + value: JudgeEffect5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} +--- !u!4 &4894383 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + m_PrefabInstance: {fileID: 4894382} + m_PrefabAsset: {fileID: 0} --- !u!1 &168172102 GameObject: m_ObjectHideFlags: 0 @@ -151,6 +226,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 635658491} m_RootOrder: 4 @@ -230,6 +306,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 616739454} m_RootOrder: 3 @@ -274,6 +351,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 214729930} m_CullTransparentMesh: 0 +--- !u!1 &214877813 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 214877814} + - component: {fileID: 214877816} + - component: {fileID: 214877815} + m_Layer: 5 + m_Name: Item Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &214877814 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 214877813} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 293753666} + 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 &214877815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 214877813} + 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.9607843, g: 0.9607843, b: 0.9607843, 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: 0} + 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 &214877816 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 214877813} + m_CullTransparentMesh: 1 --- !u!1 &245428340 GameObject: m_ObjectHideFlags: 0 @@ -303,6 +456,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 635658491} m_RootOrder: 1 @@ -369,6 +523,93 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 245428340} m_CullTransparentMesh: 0 +--- !u!1 &293753665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 293753666} + - component: {fileID: 293753667} + m_Layer: 5 + m_Name: Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &293753666 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 293753665} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 214877814} + - {fileID: 781543824} + m_Father: {fileID: 341740016} + 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 &293753667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 293753665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 214877815} + toggleTransition: 1 + graphic: {fileID: 0} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 1 --- !u!1 &295904845 GameObject: m_ObjectHideFlags: 0 @@ -398,6 +639,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 635658491} m_RootOrder: 2 @@ -491,6 +733,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -507,6 +750,43 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cfa32bf6168a75546824c3b3ea4208d0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &341740015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 341740016} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &341740016 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 341740015} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 293753666} + m_Father: {fileID: 1135025626} + 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: 28} + m_Pivot: {x: 0.5, y: 1} --- !u!1 &350294510 GameObject: m_ObjectHideFlags: 0 @@ -535,6 +815,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1153691782} m_RootOrder: 0 @@ -644,17 +925,49 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350294510} m_CullTransparentMesh: 1 +--- !u!1 &356933815 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 356933816} + m_Layer: 0 + m_Name: Debug + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &356933816 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 356933815} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.97977555, y: 0.4014719, z: -0.28508374} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2136680973} + m_Father: {fileID: 0} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &369171440 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 413796635} + m_TransformParent: {fileID: 939379138} m_Modifications: - target: {fileID: 314035496818238881, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_Name - value: Tap_Effect (2) + value: TapEffect4 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -679,7 +992,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalRotation.w - value: 0.50000083 + value: -0.19509031 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -694,7 +1007,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalRotation.z - value: 0.866025 + value: 0.98078537 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -709,7 +1022,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 120.00001 + value: 202.5 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -719,74 +1032,149 @@ Transform: type: 3} m_PrefabInstance: {fileID: 369171440} m_PrefabAsset: {fileID: 0} ---- !u!1001 &378737505 +--- !u!1001 &378430067 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 413796635} + m_TransformParent: {fileID: 532882189} m_Modifications: - - target: {fileID: 314035496818238881, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_Name - value: Tap_Effect (1) - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} propertyPath: m_RootOrder - value: 2 + value: 6 objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} propertyPath: m_LocalPosition.x - value: 4.4346 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} propertyPath: m_LocalPosition.y - value: -1.8369 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} propertyPath: m_LocalRotation.w - value: -0.9659264 + value: 0.8314697 objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} propertyPath: m_LocalRotation.z - value: 0.25881684 + value: 0.5555702 objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -30.000002 + value: 67.5 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 2214473122963414705, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_Name + value: JudgeEffect7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} +--- !u!4 &378430068 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + m_PrefabInstance: {fileID: 378430067} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &378737505 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 939379138} + m_Modifications: + - target: {fileID: 314035496818238881, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_Name + value: TapEffect3 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalPosition.x + value: 4.4346 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.8369 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.19509041 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.9807853 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 157.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} --- !u!4 &378737506 stripped Transform: @@ -886,6 +1274,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1320623865} - {fileID: 1501655042} @@ -893,7 +1282,7 @@ RectTransform: - {fileID: 898780137} - {fileID: 2067978104} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -902,7 +1291,7 @@ RectTransform: m_Pivot: {x: 0, y: 0} --- !u!95 &390047045 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -915,10 +1304,11 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 --- !u!114 &390047046 MonoBehaviour: m_ObjectHideFlags: 0 @@ -932,6 +1322,137 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ifDestroy: 0 + ifStopRecording: 0 +--- !u!1 &392650406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 392650407} + - component: {fileID: 392650409} + - component: {fileID: 392650408} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &392650407 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392650406} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 478309689} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.2} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &392650408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392650406} + 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 &392650409 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392650406} + m_CullTransparentMesh: 1 +--- !u!1 &406114713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 406114715} + - component: {fileID: 406114714} + m_Layer: 0 + m_Name: ObjectCounter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &406114714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 406114713} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d6456f9b10fc5f49a417eda1dbf2e63, type: 3} + m_Name: + m_EditorClassIdentifier: + tapCount: 0 + holdCount: 0 + slideCount: 0 + touchCount: 0 + breakCount: 0 + tapSum: 0 + holdSum: 0 + slideSum: 0 + touchSum: 0 + breakSum: 0 +--- !u!4 &406114715 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 406114713} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.4333515, y: -0.42842662, z: 0.050705917} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &410561408 GameObject: m_ObjectHideFlags: 0 @@ -1048,6 +1569,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -1063,7 +1585,7 @@ GameObject: - component: {fileID: 413796635} - component: {fileID: 413796634} m_Layer: 0 - m_Name: TapEffects + m_Name: NoteEffects m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1093,17 +1615,12 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3067806536291434088} - - {fileID: 1673765536} - - {fileID: 378737506} - - {fileID: 369171441} - - {fileID: 1495139241} - - {fileID: 1239329122} - - {fileID: 1762033402} - - {fileID: 949612863} + - {fileID: 939379138} + - {fileID: 532882189} m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &437313979 GameObject: @@ -1133,6 +1650,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1040656497} m_RootOrder: 3 @@ -1208,6 +1726,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1153691782} m_RootOrder: 1 @@ -1284,6 +1803,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1501655042} m_RootOrder: 1 @@ -1343,7 +1863,7 @@ MonoBehaviour: rotate: -0.12 wx: -0.2 wy: 2 ---- !u!1 &494240254 +--- !u!1 &478309688 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1351,82 +1871,341 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 494240255} - - component: {fileID: 494240257} - - component: {fileID: 494240256} + - component: {fileID: 478309689} m_Layer: 5 - m_Name: TitleText + m_Name: Sliding Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &494240255 +--- !u!224 &478309689 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 494240254} + m_GameObject: {fileID: 478309688} 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: 635658491} - m_RootOrder: 3 + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 392650407} + m_Father: {fileID: 1308235129} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -1.094, y: 24.51} - m_SizeDelta: {x: 32.522, y: 4.039} + 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!114 &494240256 +--- !u!1 &483431723 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 483431728} + - component: {fileID: 483431727} + - component: {fileID: 483431726} + - component: {fileID: 483431725} + - component: {fileID: 483431724} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &483431724 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 494240254} + m_GameObject: {fileID: 483431723} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: 706f87a89456f3342971fe2c6dbc2ce1, 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_FontData: - m_Font: {fileID: 12800000, guid: e330574b8b2e3fb48b915214d9946961, type: 3} - m_FontSize: 2 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 2 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u6211\u6740\u4E86\u4F60\u5988\u4F60\u6740\u4E86\u6211\u7801\u6211\u6740\u4E86\u4F60\u5988" ---- !u!222 &494240257 -CanvasRenderer: +--- !u!114 &483431725 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 494240254} - m_CullTransparentMesh: 0 ---- !u!1 &519420028 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_GameObject: {fileID: 483431723} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.07058824} + 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: 0.07058824} + 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: 483431726} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 483431724} + m_TargetAssemblyTypeName: ToggleFullScreen, Assembly-CSharp + m_MethodName: ToggleFullscreen + m_Mode: 1 + 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 &483431726 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 483431723} + 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: 21300000, guid: 77627fd83a5d3634bb30c108a994ff39, 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 &483431727 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 483431723} + m_CullTransparentMesh: 1 +--- !u!224 &483431728 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 483431723} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1208312101} + 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: 49.211998, y: 49.215004} + m_SizeDelta: {x: 9.576, y: 9.576} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &494240254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 494240255} + - component: {fileID: 494240257} + - component: {fileID: 494240256} + m_Layer: 5 + m_Name: TitleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &494240255 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 494240254} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 635658491} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -1.094, y: 24.51} + m_SizeDelta: {x: 32.522, y: 4.039} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &494240256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 494240254} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: e330574b8b2e3fb48b915214d9946961, type: 3} + m_FontSize: 2 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 2 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6211\u6740\u4E86\u4F60\u5988\u4F60\u6740\u4E86\u6211\u7801\u6211\u6740\u4E86\u4F60\u5988" +--- !u!222 &494240257 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 494240254} + m_CullTransparentMesh: 0 +--- !u!1001 &494995357 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 532882189} + m_Modifications: + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.8314697 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.5555702 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -67.5 + objectReference: {fileID: 0} + - target: {fileID: 2214473122963414705, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_Name + value: JudgeEffect2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} +--- !u!4 &494995358 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + m_PrefabInstance: {fileID: 494995357} + m_PrefabAsset: {fileID: 0} +--- !u!1 &519420028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: @@ -1501,10 +2280,50 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &532882188 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 532882189} + m_Layer: 0 + m_Name: JudgeEffects + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &532882189 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532882188} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9032917751368465164} + - {fileID: 494995358} + - {fileID: 1953456372} + - {fileID: 1390988451} + - {fileID: 4894383} + - {fileID: 1936313801} + - {fileID: 378430068} + - {fileID: 1961844058} + m_Father: {fileID: 413796635} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &562282296 GameObject: m_ObjectHideFlags: 0 @@ -1533,6 +2352,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 635658491} m_RootOrder: 6 @@ -1548,10 +2368,173 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 562282296} + m_GameObject: {fileID: 562282296} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: e330574b8b2e3fb48b915214d9946961, type: 3} + m_FontSize: 2 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 2 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: NECOCHAN +--- !u!222 &562282299 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 562282296} + m_CullTransparentMesh: 0 +--- !u!1 &569942660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 569942661} + - component: {fileID: 569942664} + - component: {fileID: 569942663} + - component: {fileID: 569942662} + m_Layer: 5 + m_Name: ResoDropdown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &569942661 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569942660} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.16031, y: 0.16031, z: 0.16031} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1514808770} + - {fileID: 976999065} + - {fileID: 966825655} + m_Father: {fileID: 1208312101} + 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: 43.74, y: 42.449993} + m_SizeDelta: {x: 105.674, y: 30.001} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &569942662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569942660} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, 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: 569942663} + m_Template: {fileID: 966825655} + m_CaptionText: {fileID: 1514808771} + m_CaptionImage: {fileID: 0} + m_ItemText: {fileID: 781543825} + m_ItemImage: {fileID: 0} + m_Value: 6 + m_Options: + m_Options: + - m_Text: 512x512 + m_Image: {fileID: 0} + - m_Text: 1080x1080 + m_Image: {fileID: 0} + - m_Text: 1280x720 + m_Image: {fileID: 0} + - m_Text: 1920x1080 + m_Image: {fileID: 0} + - m_Text: 2560x1440 + m_Image: {fileID: 0} + - m_Text: 3840x2160 + m_Image: {fileID: 0} + - m_Text: Select + m_Image: {fileID: 0} + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 483431724} + m_TargetAssemblyTypeName: ToggleFullScreen, Assembly-CSharp + m_MethodName: SetResolution + m_Mode: 1 + 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 + m_AlphaFadeSpeed: 0.15 +--- !u!114 &569942663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569942660} 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} @@ -1562,28 +2545,24 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: e330574b8b2e3fb48b915214d9946961, type: 3} - m_FontSize: 2 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 2 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: NECOCHAN ---- !u!222 &562282299 + 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 &569942664 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 562282296} - m_CullTransparentMesh: 0 + m_GameObject: {fileID: 569942660} + m_CullTransparentMesh: 1 --- !u!1 &574981606 GameObject: m_ObjectHideFlags: 0 @@ -1612,6 +2591,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1040656497} m_RootOrder: 0 @@ -1738,155 +2718,11 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &601489261 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 601489262} - - component: {fileID: 601489265} - - component: {fileID: 601489264} - - component: {fileID: 601489263} - - component: {fileID: 601489266} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &601489262 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 601489261} - 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: 616739454} - m_RootOrder: 9 - 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: 49.211998, y: 49.215004} - m_SizeDelta: {x: 9.576, y: 9.576} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &601489263 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 601489261} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.07058824} - 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: 0.07058824} - 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: 601489264} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 601489266} - m_TargetAssemblyTypeName: ToggleFullScreen, Assembly-CSharp - m_MethodName: ToggleFullscreen - m_Mode: 1 - 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 &601489264 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 601489261} - 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: 21300000, guid: 77627fd83a5d3634bb30c108a994ff39, 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 &601489265 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 601489261} - m_CullTransparentMesh: 1 ---- !u!114 &601489266 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 601489261} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 706f87a89456f3342971fe2c6dbc2ce1, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &616739450 GameObject: m_ObjectHideFlags: 0 @@ -1977,6 +2813,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 651504444} - {fileID: 1329098397} @@ -1987,11 +2824,8 @@ RectTransform: - {fileID: 753237955} - {fileID: 1555395485} - {fileID: 1846285904} - - {fileID: 601489262} - - {fileID: 1777903806} - - {fileID: 1509131978} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2025,6 +2859,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1130077455} - {fileID: 245428341} @@ -2077,6 +2912,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 616739454} m_RootOrder: 0 @@ -2214,9 +3050,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.1, y: 1.1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!328 &655536543 VideoPlayer: @@ -2238,7 +3075,7 @@ VideoPlayer: m_AspectRatio: 2 m_DataSource: 1 m_PlaybackSpeed: 1 - m_AudioOutputMode: 2 + m_AudioOutputMode: 0 m_TargetAudioSources: - {fileID: 0} m_DirectAudioVolumes: @@ -2281,6 +3118,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1828063905} m_RootOrder: 1 @@ -2323,9 +3161,89 @@ CanvasRenderer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 706356589} + m_GameObject: {fileID: 706356589} + m_CullTransparentMesh: 0 +--- !u!1 &753237954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 753237955} + - component: {fileID: 753237957} + - component: {fileID: 753237956} + m_Layer: 5 + m_Name: ErrText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &753237955 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 753237954} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 616739454} + 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: 1.6, y: 4} + m_SizeDelta: {x: 108, y: 97.17999} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &753237956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 753237954} + 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: 1, g: 0.3726415, b: 0.3726415, 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_FontData: + m_Font: {fileID: 12800000, guid: e330574b8b2e3fb48b915214d9946961, type: 3} + m_FontSize: 3 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &753237957 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 753237954} m_CullTransparentMesh: 0 ---- !u!1 &753237954 +--- !u!1 &781543823 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2333,49 +3251,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 753237955} - - component: {fileID: 753237957} - - component: {fileID: 753237956} + - component: {fileID: 781543824} + - component: {fileID: 781543826} + - component: {fileID: 781543825} m_Layer: 5 - m_Name: ErrText + m_Name: Item Label m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &753237955 +--- !u!224 &781543824 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753237954} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 781543823} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 616739454} - m_RootOrder: 6 + m_Father: {fileID: 293753666} + 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: 1.6, y: 4} - m_SizeDelta: {x: 108, y: 97.17999} + 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 &753237956 +--- !u!114 &781543825 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753237954} + m_GameObject: {fileID: 781543823} 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: 1, g: 0.3726415, b: 0.3726415, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2383,27 +3302,27 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e330574b8b2e3fb48b915214d9946961, type: 3} - m_FontSize: 3 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 300 - m_Alignment: 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: ---- !u!222 &753237957 + m_Text: Option A +--- !u!222 &781543826 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753237954} - m_CullTransparentMesh: 0 + m_GameObject: {fileID: 781543823} + m_CullTransparentMesh: 1 --- !u!1 &898780136 GameObject: m_ObjectHideFlags: 0 @@ -2431,6 +3350,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 390047044} m_RootOrder: 3 @@ -2496,7 +3416,7 @@ PrefabInstance: - target: {fileID: 1219397163196343875, guid: c1701d28c8a13d74a90a9e4dea169092, type: 3} propertyPath: m_RootOrder - value: 14 + value: 17 objectReference: {fileID: 0} - target: {fileID: 1219397163196343875, guid: c1701d28c8a13d74a90a9e4dea169092, type: 3} @@ -2560,6 +3480,45 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c1701d28c8a13d74a90a9e4dea169092, type: 3} +--- !u!1 &939379137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 939379138} + m_Layer: 0 + m_Name: TapEffects + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &939379138 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 939379137} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3067806536291434088} + - {fileID: 1673765536} + - {fileID: 378737506} + - {fileID: 369171441} + - {fileID: 1495139241} + - {fileID: 1239329122} + - {fileID: 1762033402} + - {fileID: 949612863} + m_Father: {fileID: 413796635} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &946807015 GameObject: m_ObjectHideFlags: 0 @@ -2635,89 +3594,275 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 946807015} - 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: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &949612862 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 413796635} - m_Modifications: - - target: {fileID: 314035496818238881, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_Name - value: Tap_Effect (6) - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalPosition.x - value: -1.8369 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalPosition.y - value: 4.4346 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.9659258 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.25881934 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 30.000002 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} ---- !u!4 &949612863 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - m_PrefabInstance: {fileID: 949612862} - m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 946807015} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &949612862 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 939379138} + m_Modifications: + - target: {fileID: 314035496818238881, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_Name + value: TapEffect8 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.8369 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalPosition.y + value: 4.4346 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.98078537 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.19509031 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 22.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} +--- !u!4 &949612863 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + m_PrefabInstance: {fileID: 949612862} + m_PrefabAsset: {fileID: 0} +--- !u!1 &966825654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 966825655} + - component: {fileID: 966825658} + - component: {fileID: 966825657} + - component: {fileID: 966825656} + m_Layer: 5 + m_Name: Template + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &966825655 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 966825654} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1135025626} + - {fileID: 1308235129} + m_Father: {fileID: 569942661} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 0, y: 150} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &966825656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 966825654} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 341740016} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 1135025626} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1308235130} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &966825657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 966825654} + 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 &966825658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 966825654} + m_CullTransparentMesh: 1 +--- !u!1 &976999064 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 976999065} + - component: {fileID: 976999067} + - component: {fileID: 976999066} + m_Layer: 5 + m_Name: Arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &976999065 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 976999064} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 569942661} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -15, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &976999066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 976999064} + 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: 10915, guid: 0000000000000000f000000000000000, type: 0} + 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 &976999067 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 976999064} + m_CullTransparentMesh: 1 --- !u!1 &1040656496 GameObject: m_ObjectHideFlags: 0 @@ -2744,6 +3889,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 574981607} - {fileID: 1741671573} @@ -2786,6 +3932,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 635658491} m_RootOrder: 0 @@ -2852,6 +3999,97 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1130077454} m_CullTransparentMesh: 0 +--- !u!1 &1135025625 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1135025626} + - component: {fileID: 1135025629} + - component: {fileID: 1135025628} + - component: {fileID: 1135025627} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1135025626 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1135025625} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 341740016} + m_Father: {fileID: 966825655} + 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: -18, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1135025627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1135025625} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &1135025628 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1135025625} + 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 &1135025629 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1135025625} + m_CullTransparentMesh: 1 --- !u!1 &1153691776 GameObject: m_ObjectHideFlags: 0 @@ -2875,7 +4113,7 @@ GameObject: m_IsActive: 1 --- !u!95 &1153691777 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2888,10 +4126,11 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 --- !u!114 &1153691778 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2905,6 +4144,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ifDestroy: 0 + ifStopRecording: 0 --- !u!114 &1153691779 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2966,22 +4206,126 @@ Canvas: m_SortingLayerID: 2089748817 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!224 &1153691782 +--- !u!224 &1153691782 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153691776} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 350294511} + - {fileID: 465836384} + - {fileID: 1040656497} + m_Father: {fileID: 0} + m_RootOrder: 11 + 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: 0} +--- !u!1 &1208312097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1208312101} + - component: {fileID: 1208312100} + - component: {fileID: 1208312099} + - component: {fileID: 1208312098} + m_Layer: 5 + m_Name: CanvasButtons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1208312098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1208312097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1208312099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1208312097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 192, y: 108} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 100 + m_PresetInfoIsWorld: 0 +--- !u!223 &1208312100 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1208312097} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 519420031} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: -166167497 + m_SortingOrder: 5 + m_TargetDisplay: 0 +--- !u!224 &1208312101 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1153691776} + m_GameObject: {fileID: 1208312097} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 350294511} - - {fileID: 465836384} - - {fileID: 1040656497} + - {fileID: 483431728} + - {fileID: 2015046460} + - {fileID: 569942661} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2993,12 +4337,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 413796635} + m_TransformParent: {fileID: 939379138} m_Modifications: - target: {fileID: 314035496818238881, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_Name - value: Tap_Effect (4) + value: TapEffect6 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -3023,7 +4367,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalRotation.w - value: 0.96592575 + value: -0.8314697 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -3038,7 +4382,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalRotation.z - value: 0.25881946 + value: 0.5555702 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -3053,7 +4397,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 30.000002 + value: 292.5 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -3093,6 +4437,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7411563, y: 0.7411563, z: 1.4823126} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1429845004} m_RootOrder: 0 @@ -3174,6 +4519,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1265497211} m_CullTransparentMesh: 0 +--- !u!1 &1308235128 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1308235129} + - component: {fileID: 1308235132} + - component: {fileID: 1308235131} + - component: {fileID: 1308235130} + m_Layer: 5 + m_Name: Scrollbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1308235129 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1308235128} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 478309689} + m_Father: {fileID: 966825655} + 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 &1308235130 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1308235128} + 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: 392650408} + m_HandleRect: {fileID: 392650407} + m_Direction: 2 + m_Value: 0 + m_Size: 0.2 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1308235131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1308235128} + 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 &1308235132 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1308235128} + m_CullTransparentMesh: 1 --- !u!1 &1311215480 GameObject: m_ObjectHideFlags: 0 @@ -3202,6 +4674,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 616739454} m_RootOrder: 5 @@ -3283,6 +4756,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 390047044} m_RootOrder: 0 @@ -3355,6 +4829,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 616739454} m_RootOrder: 1 @@ -3399,6 +4874,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1329098396} m_CullTransparentMesh: 0 +--- !u!1001 &1390988450 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 532882189} + m_Modifications: + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.19509037 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.98078525 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -157.5 + objectReference: {fileID: 0} + - target: {fileID: 2214473122963414705, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_Name + value: JudgeEffect4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} +--- !u!4 &1390988451 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + m_PrefabInstance: {fileID: 1390988450} + m_PrefabAsset: {fileID: 0} --- !u!1 &1429845003 GameObject: m_ObjectHideFlags: 0 @@ -3429,6 +4979,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2413037, y: 1.2413037, z: 0.62065184} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1265497212} m_Father: {fileID: 1558608921} @@ -3511,17 +5062,61 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 1} m_EffectDistance: {x: 0.22, y: -0.35} m_UseGraphicAlpha: 1 +--- !u!1 &1463030764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1463030766} + - component: {fileID: 1463030765} + m_Layer: 0 + m_Name: ScreenRecorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1463030765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1463030764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d58a05adbb88e644cab548f31f077071, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1463030766 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1463030764} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1495139240 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 413796635} + m_TransformParent: {fileID: 939379138} m_Modifications: - target: {fileID: 314035496818238881, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_Name - value: Tap_Effect (3) + value: TapEffect5 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -3546,7 +5141,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalRotation.w - value: 0.8660259 + value: -0.55557 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -3561,7 +5156,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalRotation.z - value: 0.4999992 + value: 0.8314698 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -3576,7 +5171,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 60.000004 + value: 247.5 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -3612,6 +5207,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1792493529} - {fileID: 476486099} @@ -3625,7 +5221,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1509131977 +--- !u!1 &1514808769 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3633,129 +5229,77 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1509131978} - - component: {fileID: 1509131981} - - component: {fileID: 1509131980} - - component: {fileID: 1509131979} + - component: {fileID: 1514808770} + - component: {fileID: 1514808772} + - component: {fileID: 1514808771} m_Layer: 5 - m_Name: Button (2) + m_Name: Label m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1509131978 +--- !u!224 &1514808770 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1509131977} - m_LocalRotation: {x: -0, y: -0, z: 0.7071064, w: -0.7071072} + m_GameObject: {fileID: 1514808769} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 616739454} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 49.212006, y: 42.45} - m_SizeDelta: {x: 6.413, y: 6.413} + m_Father: {fileID: 569942661} + 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.500004, y: -0.5} + m_SizeDelta: {x: -35, y: -13} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1509131979 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1509131977} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.07058824} - 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: 0.07058824} - 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: 1509131980} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 601489266} - m_TargetAssemblyTypeName: ToggleFullScreen, Assembly-CSharp - m_MethodName: ToggleWidth - m_Mode: 1 - 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 &1509131980 +--- !u!114 &1514808771 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1509131977} + m_GameObject: {fileID: 1514808769} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 21300000, guid: 6115bf0dc578de640a06b2a7382987b8, 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 &1509131981 + 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: Select +--- !u!222 &1514808772 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1509131977} + m_GameObject: {fileID: 1514808769} m_CullTransparentMesh: 1 --- !u!1 &1525475106 GameObject: @@ -3787,6 +5331,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -3819,9 +5364,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1533508239 GameObject: @@ -3862,6 +5408,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.6237138, y: 0.124985665, z: -4.3929367} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -3894,6 +5441,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1040656497} m_RootOrder: 2 @@ -3952,7 +5500,6 @@ GameObject: - component: {fileID: 1555395485} - component: {fileID: 1555395488} - component: {fileID: 1555395487} - - component: {fileID: 1555395486} m_Layer: 5 m_Name: ObjectCount m_TagString: Untagged @@ -3970,6 +5517,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 616739454} m_RootOrder: 7 @@ -3979,28 +5527,6 @@ RectTransform: m_AnchoredPosition: {x: 86.86501, y: -34.807} m_SizeDelta: {x: 60.79, y: 26.957} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1555395486 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1555395484} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6d6456f9b10fc5f49a417eda1dbf2e63, type: 3} - m_Name: - m_EditorClassIdentifier: - tapCount: 0 - holdCount: 0 - slideCount: 0 - touchCount: 0 - breakCount: 0 - tapSum: 0 - holdSum: 0 - slideSum: 0 - touchSum: 0 - breakSum: 0 --- !u!114 &1555395487 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4141,10 +5667,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1429845004} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4180,6 +5707,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1501655042} m_RootOrder: 2 @@ -4363,6 +5891,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -4381,18 +5910,19 @@ MonoBehaviour: m_EditorClassIdentifier: AudioTime: 0 isStart: 0 + isRecord: 0 offset: 0 --- !u!1001 &1673765535 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 413796635} + m_TransformParent: {fileID: 939379138} m_Modifications: - target: {fileID: 314035496818238881, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_Name - value: Tap_Effect + value: TapEffect2 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -4417,7 +5947,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalRotation.w - value: 0.9659256 + value: 0.55557024 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -4432,7 +5962,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalRotation.z - value: 0.25882035 + value: 0.8314696 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -4447,7 +5977,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 30.000002 + value: 112.5 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -4471,257 +6001,51 @@ GameObject: m_Layer: 5 m_Name: star2 m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1741671573 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1741671572} - 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: 1040656497} - 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: -18.8, y: -7.7907} - m_SizeDelta: {x: 8.12, y: 8.12} - m_Pivot: {x: 0.49999994, y: 0.49999997} ---- !u!114 &1741671574 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1741671572} - 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: 0.9943893, b: 0.4669811, a: 0} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8fef95e18dae5004daf8b7c574e2b087, 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 &1741671575 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1741671572} - m_CullTransparentMesh: 1 ---- !u!1001 &1762033401 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 413796635} - m_Modifications: - - target: {fileID: 314035496818238881, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_Name - value: Tap_Effect (5) - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalPosition.x - value: -4.4346 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.8369 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.79335326 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.6087616 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 75 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} ---- !u!4 &1762033402 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, - type: 3} - m_PrefabInstance: {fileID: 1762033401} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1777903805 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1777903806} - - component: {fileID: 1777903809} - - component: {fileID: 1777903808} - - component: {fileID: 1777903807} - m_Layer: 5 - m_Name: Button (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1777903806 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1777903805} - 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: 616739454} - m_RootOrder: 10 - 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: 41.63, y: 49.383} - m_SizeDelta: {x: 6.413, y: 6.413} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1777903807 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1777903805} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.07058824} - 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: 0.07058824} - 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: 1777903808} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1555395486} - m_TargetAssemblyTypeName: ObjectCount, Assembly-CSharp - m_MethodName: ToggleCombo - m_Mode: 1 - 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 &1777903808 + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1741671573 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1741671572} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1040656497} + 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: -18.8, y: -7.7907} + m_SizeDelta: {x: 8.12, y: 8.12} + m_Pivot: {x: 0.49999994, y: 0.49999997} +--- !u!114 &1741671574 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1777903805} + m_GameObject: {fileID: 1741671572} 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_Color: {r: 1, g: 0.9943893, b: 0.4669811, a: 0} + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2e3e31a0f2f702b44be6090f0e93d278, type: 3} + m_Sprite: {fileID: 21300000, guid: 8fef95e18dae5004daf8b7c574e2b087, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4731,14 +6055,89 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1777903809 +--- !u!222 &1741671575 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1777903805} + m_GameObject: {fileID: 1741671572} m_CullTransparentMesh: 1 +--- !u!1001 &1762033401 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 939379138} + m_Modifications: + - target: {fileID: 314035496818238881, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_Name + value: TapEffect7 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalPosition.x + value: -4.4346 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.8369 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.9807853 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.19509049 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 337.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} +--- !u!4 &1762033402 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, + type: 3} + m_PrefabInstance: {fileID: 1762033401} + m_PrefabAsset: {fileID: 0} --- !u!1 &1792493528 GameObject: m_ObjectHideFlags: 0 @@ -4768,6 +6167,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1501655042} m_RootOrder: 0 @@ -4834,7 +6234,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 3 + serializedVersion: 4 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -4847,7 +6247,7 @@ LightingSettings: m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 - m_TextureCompression: 1 + m_LightmapCompression: 3 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -4888,6 +6288,7 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 --- !u!1 &1828063904 GameObject: m_ObjectHideFlags: 0 @@ -4916,6 +6317,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 635658491} - {fileID: 706356590} @@ -4990,6 +6392,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 616739454} m_RootOrder: 8 @@ -5075,6 +6478,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 616739454} m_RootOrder: 2 @@ -5148,6 +6552,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 616739454} m_RootOrder: 4 @@ -5209,8 +6614,233 @@ CanvasRenderer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1904206638} - m_CullTransparentMesh: 0 + m_GameObject: {fileID: 1904206638} + m_CullTransparentMesh: 0 +--- !u!1001 &1936313800 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 532882189} + m_Modifications: + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.55557024 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.8314696 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 112.5 + objectReference: {fileID: 0} + - target: {fileID: 2214473122963414705, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_Name + value: JudgeEffect6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} +--- !u!4 &1936313801 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + m_PrefabInstance: {fileID: 1936313800} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1953456371 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 532882189} + m_Modifications: + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.55557024 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.83146966 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -112.5 + objectReference: {fileID: 0} + - target: {fileID: 2214473122963414705, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_Name + value: JudgeEffect3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} +--- !u!4 &1953456372 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + m_PrefabInstance: {fileID: 1953456371} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1961844057 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 532882189} + m_Modifications: + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.98078537 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.19509031 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 22.5 + objectReference: {fileID: 0} + - target: {fileID: 2214473122963414705, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_Name + value: JudgeEffect8 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} +--- !u!4 &1961844058 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + m_PrefabInstance: {fileID: 1961844057} + m_PrefabAsset: {fileID: 0} --- !u!1 &1989677412 GameObject: m_ObjectHideFlags: 0 @@ -5239,6 +6869,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 635658491} m_RootOrder: 5 @@ -5290,6 +6921,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1989677412} m_CullTransparentMesh: 0 +--- !u!1 &2015046459 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2015046460} + - component: {fileID: 2015046463} + - component: {fileID: 2015046462} + - component: {fileID: 2015046461} + m_Layer: 5 + m_Name: Button (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2015046460 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2015046459} + m_LocalRotation: {x: -0, y: -0, z: 0.7071064, w: -0.7071072} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1208312101} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 49.212006, y: 42.45} + m_SizeDelta: {x: 6.413, y: 6.413} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2015046461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2015046459} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.07058824} + 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: 0.07058824} + 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: 2015046462} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 483431724} + m_TargetAssemblyTypeName: ToggleFullScreen, Assembly-CSharp + m_MethodName: DisplayDropdown + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 +--- !u!114 &2015046462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2015046459} + 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: 21300000, guid: 6115bf0dc578de640a06b2a7382987b8, 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 &2015046463 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2015046459} + m_CullTransparentMesh: 1 --- !u!1 &2067978103 GameObject: m_ObjectHideFlags: 0 @@ -5317,6 +7081,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 390047044} m_RootOrder: 4 @@ -5402,6 +7167,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1501655042} m_RootOrder: 3 @@ -5461,12 +7227,96 @@ MonoBehaviour: rotate: -0.3 wx: -0.3 wy: 0.7 +--- !u!1 &2136680971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2136680973} + - component: {fileID: 2136680972} + m_Layer: 0 + m_Name: outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &2136680972 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2136680971} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: a886d5ab56cf45a43a80470ce8e7e8e4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9.8, y: 9.8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &2136680973 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2136680971} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.97977555, y: -0.4014719, z: 0.28508374} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 356933816} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3067806536291434087 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 413796635} + m_TransformParent: {fileID: 939379138} m_Modifications: - target: {fileID: 314035495445613876, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -5483,7 +7333,7 @@ PrefabInstance: - target: {fileID: 314035496818238881, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_Name - value: Tap_Effect (7) + value: TapEffect1 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -5508,7 +7358,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalRotation.w - value: 0.8653567 + value: 0.8314697 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -5523,7 +7373,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalRotation.z - value: 0.5011566 + value: 0.5555702 objectReference: {fileID: 0} - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -5538,7 +7388,7 @@ PrefabInstance: - target: {fileID: 314035496818238884, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 60.153004 + value: 67.5 objectReference: {fileID: 0} - target: {fileID: 314035496818238887, guid: 3edd06a81e4ec844bb281d728dce49b2, type: 3} @@ -5566,3 +7416,89 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3067806536291434087} m_PrefabAsset: {fileID: 0} +--- !u!1001 &9032917751368465163 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 532882189} + m_Modifications: + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.98078537 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.19509031 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -22.5 + objectReference: {fileID: 0} + - target: {fileID: 2214473122963414705, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_Name + value: JudgeEffect1 + objectReference: {fileID: 0} + - target: {fileID: 5633416346708387541, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 6ee24318956cb154187385e5ac248fc2, + type: 3} + - target: {fileID: 5633416346708387541, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e863ee95f9b63c044a47510ad82daf33, type: 3} +--- !u!4 &9032917751368465164 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1192576573309369434, guid: e863ee95f9b63c044a47510ad82daf33, + type: 3} + m_PrefabInstance: {fileID: 9032917751368465163} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Server.unity b/Assets/Scenes/Server.unity index aedd9a5..50cfc7a 100644 --- a/Assets/Scenes/Server.unity +++ b/Assets/Scenes/Server.unity @@ -375,6 +375,9 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} - {fileID: 0} + JudgeText_Normal: {fileID: 0} + JudgeText_Break: {fileID: 0} + test: {fileID: 2800000, guid: 6957da2c263275c4fb9bf416a25d654a, type: 3} --- !u!1 &1794058321 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AudioTimeProvider.cs b/Assets/Scripts/AudioTimeProvider.cs index ecf4b37..41e6852 100644 --- a/Assets/Scripts/AudioTimeProvider.cs +++ b/Assets/Scripts/AudioTimeProvider.cs @@ -11,16 +11,27 @@ public class AudioTimeProvider : MonoBehaviour float speed; long ticks = 0; public bool isStart = false; + public bool isRecord = false; public float offset = 0f; - public void SetStartTime(long _ticks, float _offset,float _speed) + public void SetStartTime(long _ticks, float _offset, float _speed, bool _isRecord = false) { ticks = _ticks; offset = _offset; AudioTime = offset; var dateTime = new DateTime(ticks); var seconds = (dateTime - DateTime.Now).TotalSeconds; - startTime = Time.realtimeSinceStartup + (float)seconds; - speed = _speed; + isRecord = _isRecord; + if (_isRecord) { + startTime = Time.time +5; + Time.timeScale = _speed; + Time.captureFramerate = 60; + } + else + { + startTime = Time.realtimeSinceStartup + (float)seconds; + speed = _speed; + Time.captureFramerate = 0; + } isStart = true; } @@ -34,6 +45,16 @@ public void ResetStartTime() void Update() { if (isStart) - AudioTime = (Time.realtimeSinceStartup - startTime) * speed + offset; + { + if (isRecord) + { + AudioTime = (Time.time - startTime) + offset; + } + else + { + AudioTime = (Time.realtimeSinceStartup - startTime) *speed + offset; + } + } } + } diff --git a/Assets/Scripts/HttpHandler.cs b/Assets/Scripts/HttpHandler.cs index 78642a7..4e74ba5 100644 --- a/Assets/Scripts/HttpHandler.cs +++ b/Assets/Scripts/HttpHandler.cs @@ -8,6 +8,7 @@ using System.IO; using Newtonsoft.Json; using UnityEngine.SceneManagement; +using UnityEngine.UI; public class HttpHandler : MonoBehaviour { @@ -44,8 +45,6 @@ void httpListen() stream.WriteLine("Hello!!!"); stream.Close(); context.Response.Close(); - - } print("exit listen"); } @@ -61,11 +60,14 @@ private void Update() if (request == "") return; var data = JsonConvert.DeserializeObject(request); + var loader = GameObject.Find("DataLoader").GetComponent(); var timeProvider = GameObject.Find("AudioTimeProvider").GetComponent(); var bgManager = GameObject.Find("Background").GetComponent(); var bgCover = GameObject.Find("BackgroundCover").GetComponent(); - var SongDetail = GameObject.Find("CanvasSongDetail"); + var screenRecorder = GameObject.Find("ScreenRecorder").GetComponent(); + var multTouchHandler = GameObject.Find("MultTouchHandler").GetComponent(); + var objectCounter = GameObject.Find("ObjectCounter").GetComponent(); if (data.control == EditorControlMethod.Start) { @@ -73,6 +75,7 @@ private void Update() timeProvider.SetStartTime(data.startAt, data.startTime, data.audioSpeed); loader.noteSpeed = (float)(107.25 / (71.4184491 * Mathf.Pow(data.noteSpeed + 0.9975f, -0.985558604f))); loader.touchSpeed = data.touchSpeed; + objectCounter.ComboSetActive(data.isComboEnabled); loader.LoadJson(File.ReadAllText(data.jsonPath),data.startTime); GameObject.Find("Notes").GetComponent().enabled = false; GameObject.Find("MultTouchHandler").GetComponent().clearSlots(); @@ -86,6 +89,7 @@ private void Update() timeProvider.SetStartTime(data.startAt, data.startTime, data.audioSpeed); loader.noteSpeed = (float)(107.25 / (71.4184491 * Mathf.Pow(data.noteSpeed + 0.9975f, -0.985558604f))); loader.touchSpeed = data.touchSpeed; + objectCounter.ComboSetActive(data.isComboEnabled); loader.LoadJson(File.ReadAllText(data.jsonPath), data.startTime); GameObject.Find("MultTouchHandler").GetComponent().clearSlots(); @@ -93,13 +97,31 @@ private void Update() bgCover.color = new Color(0f, 0f, 0f, data.backgroundCover); bgManager.PlaySongDetail(); } - if(data.control == EditorControlMethod.Pause) + if (data.control == EditorControlMethod.Record) + { + request = ""; + var maidataPath = new FileInfo(data.jsonPath).DirectoryName; + timeProvider.SetStartTime(data.startAt, data.startTime, data.audioSpeed,true); + screenRecorder.StartRecording(maidataPath); + loader.noteSpeed = (float)(107.25 / (71.4184491 * Mathf.Pow(data.noteSpeed + 0.9975f, -0.985558604f))); + loader.touchSpeed = data.touchSpeed; + objectCounter.ComboSetActive(data.isComboEnabled); + loader.LoadJson(File.ReadAllText(data.jsonPath), data.startTime); + multTouchHandler.clearSlots(); + + bgManager.LoadBGFromPath(maidataPath, data.audioSpeed); + bgCover.color = new Color(0f, 0f, 0f, data.backgroundCover); + bgManager.PlaySongDetail(); + GameObject.Find("CanvasButtons").SetActive(false); + } + if (data.control == EditorControlMethod.Pause) { timeProvider.isStart = false; bgManager.PauseVideo(); } if (data.control == EditorControlMethod.Stop) { + screenRecorder.StopRecording(); timeProvider.ResetStartTime(); SceneManager.LoadScene(1); } diff --git a/Assets/Scripts/JsonDataLoader.cs b/Assets/Scripts/JsonDataLoader.cs index 295b603..039d96e 100644 --- a/Assets/Scripts/JsonDataLoader.cs +++ b/Assets/Scripts/JsonDataLoader.cs @@ -32,7 +32,7 @@ public class JsonDataLoader : MonoBehaviour public RawImage cardImage; public Color[] diffColors = new Color[7]; - ObjectCount objectCount; + ObjectCounter ObjectCounter; CustomSkin customSkin; int slideLayer = -10000; @@ -40,7 +40,7 @@ public class JsonDataLoader : MonoBehaviour void Start() { Application.targetFrameRate = 120; - objectCount = GameObject.Find("ObjectCount").GetComponent(); + ObjectCounter = GameObject.Find("ObjectCounter").GetComponent(); customSkin = GameObject.Find("Outline").GetComponent(); } @@ -130,6 +130,9 @@ public void LoadJson(string json, float ignoreOffset) NDCompo.lastFor = (float)note.holdTime; NDCompo.speed = touchSpeed * timing.HSpeed; NDCompo.isFirework = note.isHanabi; + + Array.Copy(customSkin.TouchHold, NDCompo.TouchHoldSprite, 5); + NDCompo.TouchPointSprite = customSkin.TouchPoint; } if (note.noteType == SimaiNoteType.Touch) { @@ -138,6 +141,15 @@ public void LoadJson(string json, float ignoreOffset) NDCompo.time = (float)timing.time; NDCompo.areaPosition = note.touchArea; NDCompo.startPosition = note.startPosition; + + NDCompo.fanNormalSprite = customSkin.Touch; + NDCompo.fanEachSprite = customSkin.Touch_Each; + NDCompo.pointNormalSprite = customSkin.TouchPoint; + NDCompo.pointEachSprite = customSkin.TouchPoint_Each; + NDCompo.justSprite = customSkin.TouchJust; + Array.Copy(customSkin.TouchBorder, NDCompo.multTouchNormalSprite, 2); + Array.Copy(customSkin.TouchBorder_Each, NDCompo.multTouchEachSprite, 2); + if (timing.noteList.Count > 1) NDCompo.isEach = true; NDCompo.speed = touchSpeed * timing.HSpeed; NDCompo.isFirework = note.isHanabi; @@ -193,20 +205,20 @@ void CountNoteSum(Majson json) { if (!note.isBreak) { - if (note.noteType == SimaiNoteType.Tap) objectCount.tapSum++; - if (note.noteType == SimaiNoteType.Hold) objectCount.holdSum++; - if (note.noteType == SimaiNoteType.TouchHold) objectCount.holdSum++; - if (note.noteType == SimaiNoteType.Touch) objectCount.touchSum++; + if (note.noteType == SimaiNoteType.Tap) ObjectCounter.tapSum++; + if (note.noteType == SimaiNoteType.Hold) ObjectCounter.holdSum++; + if (note.noteType == SimaiNoteType.TouchHold) ObjectCounter.holdSum++; + if (note.noteType == SimaiNoteType.Touch) ObjectCounter.touchSum++; if (note.noteType == SimaiNoteType.Slide) { - if (!note.isSlideNoHead) objectCount.tapSum++; + if (!note.isSlideNoHead) ObjectCounter.tapSum++; if (note.isSlideBreak) { - objectCount.breakSum++; + ObjectCounter.breakSum++; } else { - objectCount.slideSum++; + ObjectCounter.slideSum++; } } } @@ -214,17 +226,17 @@ void CountNoteSum(Majson json) { if (note.noteType == SimaiNoteType.Slide) { - if (!note.isSlideNoHead) objectCount.breakSum++; + if (!note.isSlideNoHead) ObjectCounter.breakSum++; if (note.isSlideBreak) { - objectCount.breakSum++; + ObjectCounter.breakSum++; } else { - objectCount.slideSum++; + ObjectCounter.slideSum++; } } - else { objectCount.breakSum++; } + else { ObjectCounter.breakSum++; } } } } @@ -236,20 +248,20 @@ void CountNoteCount(List timing) { if (!note.isBreak) { - if (note.noteType == SimaiNoteType.Tap) objectCount.tapCount++; - if (note.noteType == SimaiNoteType.Hold) objectCount.holdCount++; - if (note.noteType == SimaiNoteType.TouchHold) objectCount.holdCount++; - if (note.noteType == SimaiNoteType.Touch) objectCount.touchCount++; + if (note.noteType == SimaiNoteType.Tap) ObjectCounter.tapCount++; + if (note.noteType == SimaiNoteType.Hold) ObjectCounter.holdCount++; + if (note.noteType == SimaiNoteType.TouchHold) ObjectCounter.holdCount++; + if (note.noteType == SimaiNoteType.Touch) ObjectCounter.touchCount++; if (note.noteType == SimaiNoteType.Slide) { - if (!note.isSlideNoHead) objectCount.tapCount++; + if (!note.isSlideNoHead) ObjectCounter.tapCount++; if (note.isSlideBreak) { - objectCount.breakCount++; + ObjectCounter.breakCount++; } else { - objectCount.slideCount++; + ObjectCounter.slideCount++; } } } @@ -257,17 +269,17 @@ void CountNoteCount(List timing) { if (note.noteType == SimaiNoteType.Slide) { - if (!note.isSlideNoHead) objectCount.breakCount++; + if (!note.isSlideNoHead) ObjectCounter.breakCount++; if (note.isSlideBreak) { - objectCount.breakCount++; + ObjectCounter.breakCount++; } else { - objectCount.slideCount++; + ObjectCounter.slideCount++; } } - else { objectCount.breakCount++; } + else { ObjectCounter.breakCount++; } } } } @@ -506,6 +518,10 @@ void InstantiateWifi(SimaiTimingPoint timing, SimaiNote note, bool isGroupPart, WifiCompo.breakStar = customSkin.Star_Break; WifiCompo.slideShine = BreakShine; + Array.Copy(customSkin.Wifi, WifiCompo.normalSlide, 11); + Array.Copy(customSkin.Wifi_Each, WifiCompo.eachSlide, 11); + Array.Copy(customSkin.Wifi_Break, WifiCompo.breakSlide, 11); + if (timing.noteList.Count > 1) { NDCompo.isEach = true; diff --git a/Assets/Scripts/Majson.cs b/Assets/Scripts/Majson.cs index fed0530..0b3f7ee 100644 --- a/Assets/Scripts/Majson.cs +++ b/Assets/Scripts/Majson.cs @@ -63,9 +63,10 @@ class EditRequestjson public float touchSpeed; public float backgroundCover; public float audioSpeed; + public bool isComboEnabled; } enum EditorControlMethod { - Start, Stop, OpStart, Pause, Continue + Start, Stop, OpStart, Pause, Continue, Record } diff --git a/Assets/Scripts/Misc/DestroySelf.cs b/Assets/Scripts/Misc/DestroySelf.cs index a9bc5fd..d38a252 100644 --- a/Assets/Scripts/Misc/DestroySelf.cs +++ b/Assets/Scripts/Misc/DestroySelf.cs @@ -6,6 +6,7 @@ public class DestroySelf : MonoBehaviour { public bool ifDestroy; + public bool ifStopRecording; // Start is called before the first frame update void Start() @@ -16,6 +17,7 @@ void Start() // Update is called once per frame void Update() { + if (ifStopRecording) GameObject.Find("ScreenRecorder").GetComponent().StopRecording(); if (ifDestroy) Destroy(gameObject); } } diff --git a/Assets/Scripts/Notes/HoldDrop.cs b/Assets/Scripts/Notes/HoldDrop.cs index 5ed048a..4eaef72 100644 --- a/Assets/Scripts/Notes/HoldDrop.cs +++ b/Assets/Scripts/Notes/HoldDrop.cs @@ -129,14 +129,14 @@ void Update() var holdTime = timing - lastFor; var holdDistance = holdTime * speed + 4.8f; if (holdTime > 0) { - GameObject.Find("TapEffects").GetComponent().PlayEffect(startPosition, isBreak); + GameObject.Find("NoteEffects").GetComponent().PlayEffect(startPosition, isBreak); if (isBreak) { - GameObject.Find("ObjectCount").GetComponent().breakCount++; + GameObject.Find("ObjectCounter").GetComponent().breakCount++; } else { - GameObject.Find("ObjectCount").GetComponent().holdCount++; + GameObject.Find("ObjectCounter").GetComponent().holdCount++; } Destroy(tapLine); Destroy(holdEffect); diff --git a/Assets/Scripts/Notes/NoteEffectManager.cs b/Assets/Scripts/Notes/NoteEffectManager.cs new file mode 100644 index 0000000..0795c0c --- /dev/null +++ b/Assets/Scripts/Notes/NoteEffectManager.cs @@ -0,0 +1,67 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class NoteEffectManager : MonoBehaviour +{ + public Sprite hex; + public Sprite star; + + GameObject[] tapEffects = new GameObject[8]; + Animator[] tapAnimators = new Animator[8]; + GameObject[] judgeEffects = new GameObject[8]; + Animator[] judgeAnimators = new Animator[8]; + + // Start is called before the first frame update + void Start() + { + GameObject tapEffectParent = transform.GetChild(0).gameObject; + GameObject judgeEffectParent = transform.GetChild(1).gameObject; + + for (int i = 0; i < tapEffectParent.transform.childCount; i++) + { + tapEffects[i] = tapEffectParent.transform.GetChild(i).gameObject; + tapAnimators[i] = tapEffects[i].GetComponent(); + tapEffects[i].SetActive(false); + } + + for (int i = 0; i < judgeEffectParent.transform.childCount; i++) + { + judgeEffects[i] = judgeEffectParent.transform.GetChild(i).gameObject; + judgeAnimators[i] = judgeEffects[i].GetComponent(); + } + + LoadSkin(); + } + + /// + /// 加载判定文本的皮肤 + /// + private void LoadSkin() + { + CustomSkin customSkin = GameObject.Find("Outline").GetComponent(); + + foreach (GameObject judgeEffect in judgeEffects) + { + judgeEffect.transform.GetChild(0).GetChild(0).gameObject.GetComponent().sprite = customSkin.JudgeText_Normal; + judgeEffect.transform.GetChild(0).GetChild(1).gameObject.GetComponent().sprite = customSkin.JudgeText_Break; + } + } + + // Update is called once per frame + public void PlayEffect(int position,bool isBreak) + { + var pos = position - 1; + tapEffects[pos].SetActive(true); + if (isBreak) + { + tapAnimators[pos].SetTrigger("break"); + judgeAnimators[pos].SetTrigger("break"); + } + else + { + tapAnimators[pos].SetTrigger("tap"); + judgeAnimators[pos].SetTrigger("perfect"); + } + } +} diff --git a/Assets/Scripts/Notes/TapEffectManager.cs.meta b/Assets/Scripts/Notes/NoteEffectManager.cs.meta similarity index 100% rename from Assets/Scripts/Notes/TapEffectManager.cs.meta rename to Assets/Scripts/Notes/NoteEffectManager.cs.meta diff --git a/Assets/Scripts/Notes/SlideDrop.cs b/Assets/Scripts/Notes/SlideDrop.cs index 961048e..4d938c7 100644 --- a/Assets/Scripts/Notes/SlideDrop.cs +++ b/Assets/Scripts/Notes/SlideDrop.cs @@ -169,11 +169,11 @@ void Update() // åªæœ‰ç»„内最åŽä¸€ä¸ªSlideå®Œæˆ æ‰ä¼šæ˜¾ç¤ºåˆ¤å®šæ¡å¹¶å¢žåŠ æ€»æ•° if (isBreak) { - GameObject.Find("ObjectCount").GetComponent().breakCount++; + GameObject.Find("ObjectCounter").GetComponent().breakCount++; } else { - GameObject.Find("ObjectCount").GetComponent().slideCount++; + GameObject.Find("ObjectCounter").GetComponent().slideCount++; } slideOK.SetActive(true); } diff --git a/Assets/Scripts/Notes/StarDrop.cs b/Assets/Scripts/Notes/StarDrop.cs index b912191..fdb5aff 100644 --- a/Assets/Scripts/Notes/StarDrop.cs +++ b/Assets/Scripts/Notes/StarDrop.cs @@ -44,7 +44,7 @@ public class StarDrop : MonoBehaviour SpriteRenderer lineSpriteRender; SpriteRenderer exSpriteRender; - ObjectCount objectCount; + ObjectCounter ObjectCounter; bool breakAnimStart = false; Animator animator; @@ -58,7 +58,7 @@ void Start() spriteRenderer = GetComponent(); exSpriteRender = transform.GetChild(0).GetComponent(); timeProvider = GameObject.Find("AudioTimeProvider").GetComponent(); - objectCount = GameObject.Find("ObjectCount").GetComponent(); + ObjectCounter = GameObject.Find("ObjectCounter").GetComponent(); int sortOrder = (int)(time * -100); spriteRenderer.sortingOrder = sortOrder; @@ -154,9 +154,9 @@ void Update() if (timing > 0) { if (!isNoHead) { - GameObject.Find("TapEffects").GetComponent().PlayEffect(startPosition, isBreak); - if (isBreak) objectCount.breakCount++; - else objectCount.tapCount++; + GameObject.Find("NoteEffects").GetComponent().PlayEffect(startPosition, isBreak); + if (isBreak) ObjectCounter.breakCount++; + else ObjectCounter.tapCount++; } Destroy(tapLine); Destroy(gameObject); diff --git a/Assets/Scripts/Notes/TapDrop.cs b/Assets/Scripts/Notes/TapDrop.cs index 1c6ef1f..66c3ea3 100644 --- a/Assets/Scripts/Notes/TapDrop.cs +++ b/Assets/Scripts/Notes/TapDrop.cs @@ -36,7 +36,7 @@ public class TapDrop : MonoBehaviour SpriteRenderer lineSpriteRender; SpriteRenderer exSpriteRender; - ObjectCount objectCount; + ObjectCounter ObjectCounter; bool breakAnimStart = false; Animator animator; @@ -50,7 +50,7 @@ void Start() spriteRenderer = GetComponent(); exSpriteRender = transform.GetChild(0).GetComponent(); timeProvider = GameObject.Find("AudioTimeProvider").GetComponent(); - objectCount = GameObject.Find("ObjectCount").GetComponent(); + ObjectCounter = GameObject.Find("ObjectCounter").GetComponent(); int sortOrder = (int)(time * -100); spriteRenderer.sortingOrder = sortOrder; @@ -110,9 +110,9 @@ void Update() if (timing > 0) { - GameObject.Find("TapEffects").GetComponent().PlayEffect(startPosition, isBreak); - if (isBreak) objectCount.breakCount++; - else objectCount.tapCount++; + GameObject.Find("NoteEffects").GetComponent().PlayEffect(startPosition, isBreak); + if (isBreak) ObjectCounter.breakCount++; + else ObjectCounter.tapCount++; Destroy(tapLine); Destroy(gameObject); diff --git a/Assets/Scripts/Notes/TapEffectManager.cs b/Assets/Scripts/Notes/TapEffectManager.cs deleted file mode 100644 index bf9fa27..0000000 --- a/Assets/Scripts/Notes/TapEffectManager.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class TapEffectManager : MonoBehaviour -{ - public Sprite hex; - public Sprite star; - - GameObject[] tapEffects = new GameObject[8]; - Animator[] animators = new Animator[8]; - - // Start is called before the first frame update - void Start() - { - for(int i = 0; i < transform.childCount; i++) - { - tapEffects[i] = transform.GetChild(i).gameObject; - animators[i] = tapEffects[i].GetComponent(); - tapEffects[i].SetActive(false); - } - } - - // Update is called once per frame - public void PlayEffect(int position,bool isBreak) - { - var pos = position - 1; - tapEffects[pos].SetActive(true); - if (isBreak) animators[pos].SetTrigger("break"); - else animators[pos].SetTrigger("tap"); - } -} diff --git a/Assets/Scripts/Notes/TouchDrop.cs b/Assets/Scripts/Notes/TouchDrop.cs index e0b1b85..2a315cc 100644 --- a/Assets/Scripts/Notes/TouchDrop.cs +++ b/Assets/Scripts/Notes/TouchDrop.cs @@ -18,10 +18,17 @@ public class TouchDrop : MonoBehaviour public GameObject multTouchEffect2; public GameObject multTouchEffect3; - public Sprite faneachSprite; + public Sprite fanNormalSprite; + public Sprite fanEachSprite; + + public Sprite pointNormalSprite; public Sprite pointEachSprite; - public Sprite multTouch2EachSprite; - public Sprite multTouch3EachSprite; + + public Sprite justSprite; + + public Sprite[] multTouchNormalSprite = new Sprite[2]; + public Sprite[] multTouchEachSprite = new Sprite[2]; + AudioTimeProvider timeProvider; MultTouchHandler multTouchHandler; @@ -55,12 +62,22 @@ void Start() { fansSprite[i] = fans[i].GetComponent(); } + if (isEach) { - SetfanSprite(faneachSprite); + SetfanSprite(fanEachSprite); fansSprite[4].sprite = pointEachSprite; - fansSprite[5].sprite = multTouch2EachSprite; - fansSprite[6].sprite = multTouch3EachSprite; + fansSprite[5].sprite = multTouchEachSprite[0]; + fansSprite[6].sprite = multTouchEachSprite[1]; + } + else + { + SetfanSprite(fanNormalSprite); + fansSprite[4].sprite = pointNormalSprite; + fansSprite[5].sprite = multTouchNormalSprite[0]; + fansSprite[6].sprite = multTouchNormalSprite[1]; } + justEffect.GetComponent().sprite = justSprite; + transform.position = GetAreaPos(startPosition, areaPosition); justEffect.SetActive(false); SetfanColor(new Color(1f, 1f, 1f, 0f)); @@ -80,7 +97,7 @@ void Update() { multTouchHandler.cancelTouch(this); Instantiate(tapEffect, transform.position, transform.rotation); - GameObject.Find("ObjectCount").GetComponent().touchCount++; + GameObject.Find("ObjectCounter").GetComponent().touchCount++; if (isFirework) { fireworkEffect.SetTrigger("Fire"); firework.transform.position = transform.position; diff --git a/Assets/Scripts/Notes/TouchHoldDrop.cs b/Assets/Scripts/Notes/TouchHoldDrop.cs index 033f6bb..47a5c7f 100644 --- a/Assets/Scripts/Notes/TouchHoldDrop.cs +++ b/Assets/Scripts/Notes/TouchHoldDrop.cs @@ -17,6 +17,9 @@ public class TouchHoldDrop : MonoBehaviour GameObject firework; Animator fireworkEffect; + public Sprite[] TouchHoldSprite = new Sprite[5]; + public Sprite TouchPointSprite; + public GameObject[] fans; SpriteRenderer[] fansSprite = new SpriteRenderer[6]; public SpriteMask mask; @@ -45,6 +48,14 @@ void Start() { fansSprite[i] = fans[i].GetComponent(); } + + for (int i = 0; i < 4; i++) + { + fansSprite[i].sprite = TouchHoldSprite[i]; + } + fansSprite[5].sprite = TouchHoldSprite[4]; // TouchHold Border + fansSprite[4].sprite = TouchPointSprite; + SetfanColor(new Color(1f, 1f, 1f, 0f)); mask.enabled = false; } @@ -60,7 +71,7 @@ void Update() if (timing > lastFor) { Instantiate(tapEffect, transform.position, transform.rotation); - GameObject.Find("ObjectCount").GetComponent().holdCount++; + GameObject.Find("ObjectCounter").GetComponent().holdCount++; if (isFirework) { fireworkEffect.SetTrigger("Fire"); diff --git a/Assets/Scripts/Notes/WifiDrop.cs b/Assets/Scripts/Notes/WifiDrop.cs index 9561f24..7672c6f 100644 --- a/Assets/Scripts/Notes/WifiDrop.cs +++ b/Assets/Scripts/Notes/WifiDrop.cs @@ -10,6 +10,7 @@ public class WifiDrop : MonoBehaviour SpriteRenderer[] spriteRenderer_star = new SpriteRenderer[3]; + public Sprite[] normalSlide = new Sprite[11]; public Sprite[] eachSlide = new Sprite[11]; public Sprite[] breakSlide = new Sprite[11]; public Sprite normalStar; @@ -96,6 +97,10 @@ void Start() { sr.sprite = eachSlide[i]; } + else + { + sr.sprite = normalSlide[i]; + } sbRender.Add(sr); sr.color = new Color(1f, 1f, 1f, 0f); @@ -168,11 +173,11 @@ void Update() { if (isBreak) { - GameObject.Find("ObjectCount").GetComponent().breakCount++; + GameObject.Find("ObjectCounter").GetComponent().breakCount++; } else { - GameObject.Find("ObjectCount").GetComponent().slideCount++; + GameObject.Find("ObjectCounter").GetComponent().slideCount++; } slideOK.SetActive(true); } diff --git a/Assets/Scripts/ScreenRecorder.cs b/Assets/Scripts/ScreenRecorder.cs new file mode 100644 index 0000000..6fcb65b --- /dev/null +++ b/Assets/Scripts/ScreenRecorder.cs @@ -0,0 +1,98 @@ +using System.Collections; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using System.IO; +using System.IO.Pipes; +using UnityEngine; +using System.Text; +using System.Linq; +using System.Diagnostics; +using UnityEngine.UI; + +public class ScreenRecorder : MonoBehaviour +{ + public void StartRecording(string maidata_path) + { + StartCoroutine(CaptureScreen(maidata_path)); + } + + public void StopRecording() + { + print("stop recording"); + isRecording = false; + } + + + bool isRecording = false; + IEnumerator CaptureScreen(string maidata_path) + { + if (Screen.width % 2 != 0) + { + GameObject.Find("ErrText").GetComponent().text = "ÎÞ·¨¿ªÊ¼±àÂ룬ÒòΪ·Ö±æÂÊ¿í¶È²»ÊÇżÊý¡£\nCan not start render because the width is not even.\nµ±Ç°·Ö±æÂÊ:"+Screen.width+"x"+Screen.height+"\n"; + } + if (File.Exists(maidata_path + "\\out.mp4")) + File.Delete(maidata_path + "\\out.mp4"); + byte[] data; + var texture = new Texture2D(0,0); + using (NamedPipeServerStream pipeServer = + new NamedPipeServerStream("majdataRec", PipeDirection.Out)) + { + var wavpath = "out.wav"; + var outputfile = "out.mp4"; + + var arguments = string.Format(File.ReadAllText(Application.streamingAssetsPath+ "\\ffarguments.txt"), + Screen.width, Screen.height, wavpath, outputfile ); + var startinfo = new ProcessStartInfo(Application.streamingAssetsPath + "\\ffmpeg.exe", arguments); + startinfo.WorkingDirectory = maidata_path; + print(arguments); + + var p = Process.Start(startinfo); + pipeServer.WaitForConnection(); + isRecording = true; + using (BinaryWriter bw = new BinaryWriter(pipeServer)) + { + do + { + yield return new WaitForEndOfFrame(); + try + { + texture.Reinitialize(0, 0); + texture = ScreenCapture.CaptureScreenshotAsTexture(); + /* int width = texture.width; + int height = texture.height;*/ + + data = texture.GetRawTextureData(); + + bw.Write(data, 0, data.Length); + bw.Flush(); + //Thread.Sleep(100); + } + catch { } + } + while (pipeServer.IsConnected && isRecording && !p.HasExited); + } + p.WaitForExit(); + + if (File.Exists(maidata_path + "/out.mp4") && p.ExitCode == 0) + { + GameObject.Find("ErrText").GetComponent().text += "äÖȾ³É¹¦£¬ÊÓƵÉú³ÉÔÚ" + maidata_path + "\\out.mp4\nRender Successed\nExitCode:" + p.ExitCode; + Process.Start("explorer", "/select,\"" + maidata_path + "\\out.mp4" + "\""); + } + else + GameObject.Find("ErrText").GetComponent().text += "±àÂëÆ÷ÒÑÍ˳ö\nFFmpeg Exited.\nExitCode:" + p.ExitCode; + } + } + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/ScreenRecorder.cs.meta b/Assets/Scripts/ScreenRecorder.cs.meta new file mode 100644 index 0000000..e87d7a5 --- /dev/null +++ b/Assets/Scripts/ScreenRecorder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d58a05adbb88e644cab548f31f077071 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/BGManager.cs b/Assets/Scripts/UI/BGManager.cs index bbcb4ff..e90eb7d 100644 --- a/Assets/Scripts/UI/BGManager.cs +++ b/Assets/Scripts/UI/BGManager.cs @@ -111,11 +111,22 @@ IEnumerator waitFumenStart() gameObject.transform.localScale = new Vector3(1f, scale); } // Update is called once per frame + float smoothRDelta = 0; void Update() { + //videoPlayer.externalReferenceTime = provider.AudioTime; - var delta = videoPlayer.clockTime - provider.AudioTime; - //print(delta); + float delta = (float)videoPlayer.clockTime - provider.AudioTime; + smoothRDelta += (Time.unscaledDeltaTime - smoothRDelta) * 0.01f; + if (provider.AudioTime < 0) return; + var realSpeed = Time.deltaTime / smoothRDelta; + + if (Time.captureFramerate != 0) + { + //print("speed="+realSpeed+" delta="+delta); + videoPlayer.playbackSpeed = realSpeed - delta; + return; + } if (delta < -0.01f) { videoPlayer.playbackSpeed = playSpeed + 0.2f; diff --git a/Assets/Scripts/UI/CustomSkin.cs b/Assets/Scripts/UI/CustomSkin.cs index 6954eae..35e759a 100644 --- a/Assets/Scripts/UI/CustomSkin.cs +++ b/Assets/Scripts/UI/CustomSkin.cs @@ -15,9 +15,9 @@ public class CustomSkin : MonoBehaviour public Sprite Slide; public Sprite Slide_Each; public Sprite Slide_Break; - //public Sprite Wifi; - //public Sprite Wifi_Each; - //public Sprite Wifi_Break; + public Sprite[] Wifi = new Sprite[11]; + public Sprite[] Wifi_Each = new Sprite[11]; + public Sprite[] Wifi_Break = new Sprite[11]; public Sprite Star; public Sprite Star_Double; @@ -34,6 +34,20 @@ public class CustomSkin : MonoBehaviour public Sprite Hold_Break; public Sprite[] Just = new Sprite[6]; + public Sprite JudgeText_Normal; + public Sprite JudgeText_Break; + + public Sprite Touch; + public Sprite Touch_Each; + public Sprite TouchPoint; + public Sprite TouchPoint_Each; + public Sprite TouchJust; + public Sprite[] TouchBorder = new Sprite[2]; + public Sprite[] TouchBorder_Each = new Sprite[2]; + + public Sprite[] TouchHold = new Sprite[5]; + + public Texture2D test; // Start is called before the first frame update void Start() @@ -52,6 +66,12 @@ void Start() Slide = SpriteLoader.LoadSpriteFromFile(path + "/slide.png"); Slide_Each = SpriteLoader.LoadSpriteFromFile(path + "/slide_each.png"); Slide_Break = SpriteLoader.LoadSpriteFromFile(path + "/slide_break.png"); + for (int i = 0; i < 11; i++) + { + Wifi[i] = SpriteLoader.LoadSpriteFromFile(path + "/wifi_" + i + ".png"); + Wifi_Each[i] = SpriteLoader.LoadSpriteFromFile(path + "/wifi_each_" + i + ".png"); + Wifi_Break[i] = SpriteLoader.LoadSpriteFromFile(path + "/wifi_break_" + i + ".png"); + } Star = SpriteLoader.LoadSpriteFromFile(path + "/star.png"); Star_Double = SpriteLoader.LoadSpriteFromFile(path + "/star_double.png"); @@ -74,6 +94,29 @@ void Start() Just[3] = SpriteLoader.LoadSpriteFromFile(path + "/just_curv_l.png"); Just[4] = SpriteLoader.LoadSpriteFromFile(path + "/just_str_l.png"); Just[5] = SpriteLoader.LoadSpriteFromFile(path + "/just_wifi_d.png"); + + JudgeText_Normal = SpriteLoader.LoadSpriteFromFile(path + "/judge_text_normal.png"); + JudgeText_Break = SpriteLoader.LoadSpriteFromFile(path + "/judge_text_break.png"); + + Touch = SpriteLoader.LoadSpriteFromFile(path + "/touch.png"); + Touch_Each = SpriteLoader.LoadSpriteFromFile(path + "/touch_each.png"); + TouchPoint = SpriteLoader.LoadSpriteFromFile(path + "/touch_point.png"); + TouchPoint_Each = SpriteLoader.LoadSpriteFromFile(path + "/touch_point_each.png"); + + TouchJust = SpriteLoader.LoadSpriteFromFile(path + "/touch_just.png"); + + TouchBorder[0] = SpriteLoader.LoadSpriteFromFile(path + "/touch_border_2.png"); + TouchBorder[1] = SpriteLoader.LoadSpriteFromFile(path + "/touch_border_3.png"); + TouchBorder_Each[0] = SpriteLoader.LoadSpriteFromFile(path + "/touch_border_2_each.png"); + TouchBorder_Each[1] = SpriteLoader.LoadSpriteFromFile(path + "/touch_border_3_each.png"); + + for (int i = 0; i < 4; i++) + { + TouchHold[i] = SpriteLoader.LoadSpriteFromFile(path + "/touchhold_" + i +".png"); + } + TouchHold[4] = SpriteLoader.LoadSpriteFromFile(path + "/touchhold_border.png"); + + Debug.Log(test); } // Update is called once per frame diff --git a/Assets/Scripts/UI/Floating.cs b/Assets/Scripts/UI/Floating.cs index ddc6a18..69f3919 100644 --- a/Assets/Scripts/UI/Floating.cs +++ b/Assets/Scripts/UI/Floating.cs @@ -21,6 +21,6 @@ void Start() void Update() { rectTransform.Rotate(new Vector3(0f, 0f, rotate)); - rectTransform.localPosition = startPos + new Vector3(Mathf.Sin(Time.realtimeSinceStartup * wx), Mathf.Sin(Time.realtimeSinceStartup * wy)); + rectTransform.localPosition = startPos + new Vector3(Mathf.Sin(Time.time * wx), Mathf.Sin(Time.time * wy)); } } diff --git a/Assets/Scripts/UI/ObjectCount.cs b/Assets/Scripts/UI/ObjectCounter.cs similarity index 75% rename from Assets/Scripts/UI/ObjectCount.cs rename to Assets/Scripts/UI/ObjectCounter.cs index ef994a5..1780c15 100644 --- a/Assets/Scripts/UI/ObjectCount.cs +++ b/Assets/Scripts/UI/ObjectCounter.cs @@ -3,14 +3,11 @@ using UnityEngine; using UnityEngine.UI; -public class ObjectCount : MonoBehaviour +public class ObjectCounter : MonoBehaviour { - Text text; + Text table; Text rate; Text combo; - GameObject comboObj; - - static bool isComboEnabled = false; public int tapCount; public int holdCount; @@ -27,21 +24,19 @@ public class ObjectCount : MonoBehaviour // Start is called before the first frame update void Start() { - text = GetComponent(); + table = GameObject.Find("ObjectCount").GetComponent(); rate = GameObject.Find("ObjectRate").GetComponent(); - comboObj = GameObject.Find("ComboText"); - combo = comboObj.GetComponent(); - comboObj.SetActive(false); + combo = GameObject.Find("ComboText").GetComponent(); + combo.gameObject.SetActive(false); } // Update is called once per frame void Update() { if (FiSumScore() == 0) return; - comboObj.SetActive(isComboEnabled); var comboN = tapCount + holdCount + slideCount + touchCount + breakCount; combo.text = comboN.ToString(); - text.text = string.Format( + table.text = string.Format( "TAP: {0} / {5}\n" + "HOD: {1} / {6}\n" + "SLD: {2} / {7}\n" + @@ -64,19 +59,9 @@ void Update() ); } - public void ToggleCombo() + public void ComboSetActive(bool isActive) { - if (FiSumScore() == 0) return; - if (isComboEnabled) - { - comboObj.SetActive(false); - isComboEnabled = false; - } - else - { - comboObj.SetActive(true); - isComboEnabled = true; - } + combo.gameObject.SetActive(isActive); } int FiSumScore() diff --git a/Assets/Scripts/UI/ObjectCount.cs.meta b/Assets/Scripts/UI/ObjectCounter.cs.meta similarity index 100% rename from Assets/Scripts/UI/ObjectCount.cs.meta rename to Assets/Scripts/UI/ObjectCounter.cs.meta diff --git a/Assets/Scripts/UI/ToggleFullScreen.cs b/Assets/Scripts/UI/ToggleFullScreen.cs index 2f9e641..8e66ff0 100644 --- a/Assets/Scripts/UI/ToggleFullScreen.cs +++ b/Assets/Scripts/UI/ToggleFullScreen.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Runtime.InteropServices; using UnityEngine; +using UnityEngine.UI; public class ToggleFullScreen : MonoBehaviour { @@ -22,24 +23,41 @@ public void ToggleFullscreen() } Screen.fullScreenMode = FullScreenMode.FullScreenWindow; } - - bool isWide = false; - public void ToggleWidth() + Dropdown dd; + public void DisplayDropdown() + { + dd.value = 999; + dd.gameObject.SetActive(true); + + } + public void SetResolution() { - if (!Screen.fullScreen) + var i = dd.value; + print(i); + switch (i) { - if (isWide) - { - Screen.SetResolution(Screen.height, Screen.height, false); - isWide = false; - } - else - { - Screen.SetResolution((int)(Screen.height * 1.778f), Screen.height, false); - isWide = true; - } - + case 0: + Screen.SetResolution(512, 512, false); + break; + case 1: + Screen.SetResolution(1080, 1080,false); + break; + case 2: + Screen.SetResolution(1280, 720, false); + break; + case 3: + Screen.SetResolution(2560, 1440, false); + break; + case 4: + Screen.SetResolution(3840, 2160, false); + break; } + dd.gameObject.SetActive(false); + } + public void Start() + { + dd = GameObject.Find("ResoDropdown").GetComponent(); + dd.gameObject.SetActive(false); } private void Update() { diff --git a/Assets/ShineMaterial.mat b/Assets/ShineMaterial.mat index 7933887..7bbd1b6 100644 --- a/Assets/ShineMaterial.mat +++ b/Assets/ShineMaterial.mat @@ -58,7 +58,7 @@ Material: m_Ints: [] m_Floats: - _Alpha: 1 - - _Brightness: 1 + - _Brightness: 1.3 - _BumpScale: 1 - _Contrast: 1 - _Cutoff: 0.5 diff --git a/Assets/Sprite/debug.meta b/Assets/Sprite/debug.meta new file mode 100644 index 0000000..a85504d --- /dev/null +++ b/Assets/Sprite/debug.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6e182023dfda1641b8c2e2305e2914e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprite/debug/outline.png b/Assets/Sprite/debug/outline.png new file mode 100644 index 0000000..f26dd68 Binary files /dev/null and b/Assets/Sprite/debug/outline.png differ diff --git a/Assets/Sprite/debug/outline.png.meta b/Assets/Sprite/debug/outline.png.meta new file mode 100644 index 0000000..cad8851 --- /dev/null +++ b/Assets/Sprite/debug/outline.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: a886d5ab56cf45a43a80470ce8e7e8e4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprite/wifi.png.meta b/Assets/Sprite/wifi.png.meta index d8714a6..7ec38e6 100644 --- a/Assets/Sprite/wifi.png.meta +++ b/Assets/Sprite/wifi.png.meta @@ -36,7 +36,7 @@ TextureImporter: 213: 5323578071713263555 second: wifi_10 externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -56,6 +56,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -64,9 +66,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -87,10 +89,14 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -128,6 +134,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -372,6 +390,18 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + wifi_4: 384146834060908940 + wifi_3: 107041130348426547 + wifi_0: 6010608223010618213 + wifi_5: -7039851822894693920 + wifi_1: -282332362840517431 + wifi_9: 5897176228441901949 + wifi_10: 5323578071713263555 + wifi_8: -2158619858076186491 + wifi_2: 3685890569525003487 + wifi_7: -6459911850397066103 + wifi_6: 6219522102249543970 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Sprite/wifi_break.png.meta b/Assets/Sprite/wifi_break.png.meta index 5a1c7b0..7aa312c 100644 --- a/Assets/Sprite/wifi_break.png.meta +++ b/Assets/Sprite/wifi_break.png.meta @@ -36,7 +36,7 @@ TextureImporter: 213: -1387646478963634914 second: wifi_break_10 externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -95,6 +96,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -120,6 +122,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -364,6 +378,18 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + wifi_break_8: -5714714075864894090 + wifi_break_9: 4221847290182326359 + wifi_break_1: -2499823243339350701 + wifi_break_0: -2016628678761655281 + wifi_break_5: -4777771625403694506 + wifi_break_3: 1725681396707737570 + wifi_break_4: -6063473975745692081 + wifi_break_2: -6546410876217497116 + wifi_break_7: 5363148054523604052 + wifi_break_10: -1387646478963634914 + wifi_break_6: -708685629431033037 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Sprite/wifi_each.png.meta b/Assets/Sprite/wifi_each.png.meta index fd2fe50..b6e58d7 100644 --- a/Assets/Sprite/wifi_each.png.meta +++ b/Assets/Sprite/wifi_each.png.meta @@ -36,7 +36,7 @@ TextureImporter: 213: -3748293275541971110 second: wifi_each_10 externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -56,6 +56,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -64,9 +66,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -87,10 +89,14 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -128,6 +134,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -372,6 +390,18 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + wifi_each_6: 1660827000066962834 + wifi_each_1: 4201695303700987197 + wifi_each_3: 5821571336286938200 + wifi_each_5: -3300150129828961110 + wifi_each_4: -5508730858329978074 + wifi_each_10: -3748293275541971110 + wifi_each_0: -3035267430650131031 + wifi_each_7: 5960795151959469272 + wifi_each_2: -2104979366251557822 + wifi_each_8: 6048690973988703305 + wifi_each_9: -439320201241764418 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta new file mode 100644 index 0000000..890f05b --- /dev/null +++ b/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 340f945198f98894aa42f1e6b5945a55 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/ffarguments.txt b/Assets/StreamingAssets/ffarguments.txt new file mode 100644 index 0000000..073f0bb --- /dev/null +++ b/Assets/StreamingAssets/ffarguments.txt @@ -0,0 +1 @@ +-y -f rawvideo -vcodec rawvideo -pix_fmt rgba -s {0}x{1} -r 60 -i \\.\pipe\majdataRec -i {2} -vf "vflip" -c:v libx264 -preset fast -pix_fmt yuv420p -c:a aac {3} \ No newline at end of file diff --git a/Assets/StreamingAssets/ffarguments.txt.meta b/Assets/StreamingAssets/ffarguments.txt.meta new file mode 100644 index 0000000..76914d2 --- /dev/null +++ b/Assets/StreamingAssets/ffarguments.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a8979e0dbe137df4daa757758f0c88b0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/ffmpeg.exe b/Assets/StreamingAssets/ffmpeg.exe new file mode 100644 index 0000000..af99a49 Binary files /dev/null and b/Assets/StreamingAssets/ffmpeg.exe differ diff --git a/Assets/StreamingAssets/ffmpeg.exe.meta b/Assets/StreamingAssets/ffmpeg.exe.meta new file mode 100644 index 0000000..ba2bcaf --- /dev/null +++ b/Assets/StreamingAssets/ffmpeg.exe.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dfa77896d8678ec4bbd9def2e0ffd7b6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 499b495..2ec48d4 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,18 +1,18 @@ { "dependencies": { - "com.unity.2d.animation": "6.0.5", - "com.unity.2d.pixel-perfect": "5.0.1", - "com.unity.2d.psdimporter": "5.0.4", + "com.unity.2d.animation": "7.0.9", + "com.unity.2d.pixel-perfect": "5.0.3", + "com.unity.2d.psdimporter": "6.0.6", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "6.0.1", + "com.unity.2d.spriteshape": "7.0.6", "com.unity.2d.tilemap": "1.0.0", - "com.unity.collab-proxy": "1.9.0", - "com.unity.ide.rider": "3.0.7", - "com.unity.ide.visualstudio": "2.0.11", - "com.unity.ide.vscode": "1.2.3", - "com.unity.test-framework": "1.1.29", + "com.unity.collab-proxy": "1.17.7", + "com.unity.ide.rider": "3.0.16", + "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ide.vscode": "1.2.5", + "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.5.6", + "com.unity.timeline": "1.6.4", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b7dbee0..9104ef8 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,12 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "6.0.5", + "version": "7.0.9", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "5.0.0", - "com.unity.mathematics": "1.1.0", + "com.unity.2d.common": "6.0.6", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" @@ -14,36 +13,38 @@ "url": "https://packages.unity.cn" }, "com.unity.2d.common": { - "version": "5.0.0", + "version": "6.0.6", "depth": 1, "source": "registry", "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.modules.uielements": "1.0.0" + "com.unity.mathematics": "1.1.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.burst": "1.5.1" }, "url": "https://packages.unity.cn" }, "com.unity.2d.path": { - "version": "5.0.0", + "version": "5.0.2", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.cn" }, "com.unity.2d.pixel-perfect": { - "version": "5.0.1", + "version": "5.0.3", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.cn" }, "com.unity.2d.psdimporter": { - "version": "5.0.4", + "version": "6.0.6", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "5.0.0", - "com.unity.2d.animation": "6.0.4", + "com.unity.2d.animation": "7.0.8", + "com.unity.2d.common": "6.0.5", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.cn" @@ -55,13 +56,13 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "6.0.1", + "version": "7.0.6", "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "5.0.0", - "com.unity.2d.path": "5.0.0", + "com.unity.2d.common": "6.0.4", + "com.unity.2d.path": "5.0.2", "com.unity.modules.physics2d": "1.0.0" }, "url": "https://packages.unity.cn" @@ -72,11 +73,22 @@ "source": "builtin", "dependencies": {} }, + "com.unity.burst": { + "version": "1.6.6", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1" + }, + "url": "https://packages.unity.cn" + }, "com.unity.collab-proxy": { - "version": "1.9.0", + "version": "1.17.7", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.services.core": "1.0.1" + }, "url": "https://packages.unity.cn" }, "com.unity.ext.nunit": { @@ -87,7 +99,7 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.rider": { - "version": "3.0.7", + "version": "3.0.16", "depth": 0, "source": "registry", "dependencies": { @@ -96,7 +108,7 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.visualstudio": { - "version": "2.0.11", + "version": "2.0.16", "depth": 0, "source": "registry", "dependencies": { @@ -105,21 +117,39 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.cn" }, "com.unity.mathematics": { - "version": "1.2.1", + "version": "1.2.6", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.cn" }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.0.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.cn" + }, + "com.unity.services.core": { + "version": "1.6.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.modules.androidjni": "1.0.0" + }, + "url": "https://packages.unity.cn" + }, "com.unity.test-framework": { - "version": "1.1.29", + "version": "1.1.31", "depth": 0, "source": "registry", "dependencies": { @@ -139,7 +169,7 @@ "url": "https://packages.unity.cn" }, "com.unity.timeline": { - "version": "1.5.6", + "version": "1.6.4", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/AutoStreamingSettings.asset b/ProjectSettings/AutoStreamingSettings.asset new file mode 100644 index 0000000..d3e071e --- /dev/null +++ b/ProjectSettings/AutoStreamingSettings.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1200 &1 +AutoStreamingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + mSearchMode: 15 + mCustomSearchFile: + mTextureSearchString: + mMeshSearchString: + mTextures: [] + mAudios: [] + mMeshes: [] + mScenes: [] + mConfigCCD: + useCCD: 0 + cosKey: + projectGuid: + bucketUuid: + bucketName: + badgeName: diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json new file mode 100644 index 0000000..e02ae33 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -0,0 +1,17 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "UsePlatformSDKLinker": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX32": 6, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json new file mode 100644 index 0000000..0293daf --- /dev/null +++ b/ProjectSettings/CommonBurstAotSettings.json @@ -0,0 +1,6 @@ +{ + "MonoBehaviour": { + "Version": 4, + "DisabledWarnings": "" + } +} diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000..5b5face --- /dev/null +++ b/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9ca6f5e..c462aba 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 23 productGUID: 1deee4445c6d36149ab22f31527bfb87 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -91,6 +91,11 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + autoStreaming: 0 + useAnimationStreaming: 0 + useFontStreaming: 0 + autoStreamingId: + instantGameAppId: bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -140,7 +145,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 4.0-SNAPSHOT + bundleVersion: v4.1.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -151,21 +156,24 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Standalone: com.DefaultCompany.MajdataView buildNumber: Standalone: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -221,6 +229,7 @@ PlayerSettings: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 @@ -281,6 +290,7 @@ PlayerSettings: m_Kind: 0 m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -316,11 +326,13 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 m_BuildTargetVRSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -332,6 +344,7 @@ PlayerSettings: m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -480,8 +493,11 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -577,6 +593,7 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} @@ -589,6 +606,7 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 + selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 @@ -625,6 +643,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -668,6 +687,7 @@ PlayerSettings: m_VersionName: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -675,4 +695,6 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + playerDataPath: + forceSRGBBlit: 1 virtualTexturingSupportEnabled: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4a6169b..edfab77 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.1.20f1c1 -m_EditorVersionWithRevision: 2021.1.20f1c1 (5286acd4817c) +m_EditorVersion: 2021.3.16f1c1 +m_EditorVersionWithRevision: 2021.3.16f1c1 (56dbfdd6697f) diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000..6f3e60f --- /dev/null +++ b/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,167 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "ignore": false, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config new file mode 100644 index 0000000..e69de29 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 1adcd12..94a5a19 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -5,6 +5,12 @@ EditorUserSettings: m_ObjectHideFlags: 0 serializedVersion: 4 m_ConfigSettings: + RecentlyUsedSceneGuid-0: + value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 + flags: 0 + RecentlyUsedSceneGuid-1: + value: 000102055c575d0c5e5f0d7a46765944414e497a7f7f24627d714d61e0b83560 + flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 @@ -19,9 +25,13 @@ EditorUserSettings: m_VCDebugCmd: 0 m_VCDebugOut: 0 m_SemanticMergeMode: 2 + m_DesiredImportWorkerCount: 3 + m_StandbyImportWorkerCount: 2 + m_IdleImportWorkerShutdownDelay: 60000 m_VCShowFailedCheckout: 1 m_VCOverwriteFailedCheckoutAssets: 1 m_VCProjectOverlayIcons: 1 m_VCHierarchyOverlayIcons: 1 m_VCOtherOverlayIcons: 1 m_VCAllowAsyncUpdate: 0 + m_ArtifactGarbageCollection: 1 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt new file mode 100644 index 0000000..745f186 --- /dev/null +++ b/UserSettings/Layouts/default-2021.dwlt @@ -0,0 +1,1133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 0 + y: 43 + width: 1920 + height: 989 + m_ShowMode: 4 + m_Title: Hierarchy + m_RootView: {fileID: 6} + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_Maximized: 1 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 9} + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1920 + height: 939 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 21 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1532 + y: 0 + width: 388 + height: 939 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 16} + m_Panes: + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 372 + height: 568 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 17} + m_Panes: + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ConsoleWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 568 + width: 1532 + height: 371 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 20} + m_Panes: + - {fileID: 15} + - {fileID: 20} + - {fileID: 12} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 2} + - {fileID: 8} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 989 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 969 + width: 1920 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 5} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1532 + height: 939 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 49 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1532 + height: 568 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 50 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 372 + y: 0 + width: 1160 + height: 568 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 18} + - {fileID: 19} + - {fileID: 14} + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: 1561878555887300916, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 641 + width: 1531 + height: 350 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -179708 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 663490763026382308, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 372 + y: 73 + width: 1157 + height: 547 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 1117506739050932553, guid: e31054d561f8c2c4ba786a3ce82f5ce9, type: 2} + m_ValueSerializationHelper: + - e00: 0.48755777 + e01: 0 + e02: 0 + e03: 114.38876 + e10: 0 + e11: 0.48755777 + e12: 0 + e13: 260.87326 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: e31054d561f8c2c4ba786a3ce82f5ce9, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 1117506739050932553, guid: e31054d561f8c2c4ba786a3ce82f5ce9, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 0 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12111, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 400, y: 100} + m_MaxSize: {x: 2048, y: 2048} + m_TitleContent: + m_Text: Asset Store + m_Image: {fileID: 357073275683767465, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 468 + y: 181 + width: 973 + height: 501 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -7501376956915960154, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 641 + width: 1531 + height: 350 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Scenes + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Scenes + m_LastFoldersGridSize: -1 + m_LastProjectPath: D:\repos\MajdataView\MajdataView + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 5c530000 + m_LastClickedID: 21340 + m_ExpandedIDs: 0000000032530000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 0000000032530000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: 6c530000 + m_LastClickedInstanceID: 21356 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 5} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 115 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -6905738622615590433, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1532 + y: 73 + width: 387 + height: 918 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: -590624980919486359, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73 + width: 371 + height: 547 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 1099f7ff5499f7ff929cf7ff969cf7ff72abfdffb6abfdfff4aefdfff8aefdff22fbffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 4} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: ba26194e3edc5044c9f12ec56e684443 +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 2318424515335265636, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 372 + y: 73 + width: 1158 + height: 547 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -101, y: -26} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 3 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 7 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 8 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 9 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 10 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 3 + layout: 4 + m_WindowGUID: ef0f86f0e70a64245a5f607c062d1615 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 1 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 0.4333515, y: -0.42842662, z: 0.050705917} + speed: 2 + m_Value: {x: 0.4333515, y: -0.42842662, z: 0.050705917} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_ExposureSliderValue: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + zGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: 0, y: 0, z: 0, w: 1} + speed: 2 + m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Size: + m_Target: 8.120378 + speed: 2 + m_Value: 8.120378 + m_Ortho: + m_Target: 1 + speed: 2 + m_Value: 1 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.01 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -2087823869225018852, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 372 + y: 73 + width: 1158 + height: 547 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1158, y: 526} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -579 + m_HBaseRangeMax: 579 + m_VBaseRangeMin: -263 + m_VBaseRangeMax: 263 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1158 + height: 526 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 579, y: 263} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -579 + y: -263 + width: 1158 + height: 526 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1158, y: 547} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000100000100 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &20 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: 111653112392082826, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 641 + width: 1531 + height: 350 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] diff --git a/ffmpeg-cli-param.txt b/ffmpeg-cli-param.txt new file mode 100644 index 0000000..18d5bf8 --- /dev/null +++ b/ffmpeg-cli-param.txt @@ -0,0 +1 @@ +./ffmpeg -y -f rawvideo -vcodec rawvideo -pix_fmt rgba -s 1920x1080 -r 60 -i \\.\pipe\test111sb -vf "vflip" -c:v libx264 -preset fast -an aaa.mp4 \ No newline at end of file