diff --git a/Assets/000_assets/material/M_SquareFrame 1.mat b/Assets/000_assets/material/M_SquareFrame 1.mat index 63b49c25..cda12869 100644 --- a/Assets/000_assets/material/M_SquareFrame 1.mat +++ b/Assets/000_assets/material/M_SquareFrame 1.mat @@ -213,7 +213,7 @@ Material: - _Dst: 10 - _DstBlend: 0 - _DstBlendAlpha: 0 - - _EdgeValue: 0.25054073 + - _EdgeValue: 0.49106154 - _EnvironmentReflections: 1 - _FNLfanxiangkaiguan: 0 - _Face: 1 @@ -258,7 +258,7 @@ Material: - _Mask_scale: 1 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.74945927 + - _Opacity: 0.50893843 - _Parallax: 0.005 - _Pass: 0 - _QueueOffset: 0 diff --git a/Assets/Dreamteck/Splines/Components/SplineRenderer.cs b/Assets/Dreamteck/Splines/Components/SplineRenderer.cs index 86e6fc9f..fbdc0221 100644 --- a/Assets/Dreamteck/Splines/Components/SplineRenderer.cs +++ b/Assets/Dreamteck/Splines/Components/SplineRenderer.cs @@ -103,7 +103,7 @@ namespace Dreamteck.Splines if (GameManager.instance.cameraManager.gameCamera != null) { - RenderWithCamera(GameManager.instance.cameraManager.gameCamera.gameCamera); + RenderWithCamera(GameManager.instance.cameraManager.gameCamera.cam); } else { diff --git a/Assets/Prefabs/BasePrefabsCollection.asset b/Assets/Prefabs/BasePrefabsCollection.asset index 1d1a0e04..ecfe607d 100644 --- a/Assets/Prefabs/BasePrefabsCollection.asset +++ b/Assets/Prefabs/BasePrefabsCollection.asset @@ -293,3 +293,7 @@ MonoBehaviour: type: 3} genericSwipeInputMark: {fileID: 7671065637303904002, guid: 215490c21a03d9f48b5438a1748b3147, type: 3} + inputEndMark: {fileID: 7671065637303904002, guid: 05a559edd4a4a2342986d2bdabd9afb4, + type: 3} + inputCanceledMark: {fileID: 7671065637303904002, guid: 131df1727ac92f04cb005d1b04066c86, + type: 3} diff --git a/Assets/Prefabs/Debug/Input/InputCanceledMark.prefab b/Assets/Prefabs/Debug/Input/InputCanceledMark.prefab new file mode 100644 index 00000000..f0006265 --- /dev/null +++ b/Assets/Prefabs/Debug/Input/InputCanceledMark.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7671065637303904002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5502985463212138770} + - component: {fileID: 2890788359140629188} + - component: {fileID: 7768496905287876572} + m_Layer: 5 + m_Name: InputCanceledMark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5502985463212138770 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7671065637303904002} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2890788359140629188 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7671065637303904002} + m_CullTransparentMesh: 1 +--- !u!114 &7768496905287876572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7671065637303904002} + 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: d25e2ce15dd1c67438e4b70f404fb197, type: 3} + 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 diff --git a/Assets/Prefabs/Debug/Input/InputCanceledMark.prefab.meta b/Assets/Prefabs/Debug/Input/InputCanceledMark.prefab.meta new file mode 100644 index 00000000..389e3d62 --- /dev/null +++ b/Assets/Prefabs/Debug/Input/InputCanceledMark.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 131df1727ac92f04cb005d1b04066c86 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Debug/Input/InputEndMark.prefab b/Assets/Prefabs/Debug/Input/InputEndMark.prefab new file mode 100644 index 00000000..955ab0ef --- /dev/null +++ b/Assets/Prefabs/Debug/Input/InputEndMark.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7671065637303904002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5502985463212138770} + - component: {fileID: 2890788359140629188} + - component: {fileID: 7768496905287876572} + m_Layer: 5 + m_Name: InputEndMark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5502985463212138770 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7671065637303904002} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2890788359140629188 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7671065637303904002} + m_CullTransparentMesh: 1 +--- !u!114 &7768496905287876572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7671065637303904002} + 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: 3b01fe90eb34c7c4bab30f287241c158, type: 3} + 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 diff --git a/Assets/Prefabs/Debug/Input/InputEndMark.prefab.meta b/Assets/Prefabs/Debug/Input/InputEndMark.prefab.meta new file mode 100644 index 00000000..5270e421 --- /dev/null +++ b/Assets/Prefabs/Debug/Input/InputEndMark.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 05a559edd4a4a2342986d2bdabd9afb4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GameElements/GameCamera.prefab b/Assets/Prefabs/GameElements/GameCamera.prefab index 44749f4c..302270c4 100644 --- a/Assets/Prefabs/GameElements/GameCamera.prefab +++ b/Assets/Prefabs/GameElements/GameCamera.prefab @@ -45,17 +45,46 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 79d811a12f27f43629797719fcbfc6ae, type: 3} m_Name: m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: elementGuid + Entry: 2 + Data: 00000000000000000000000000000000 + - Name: submoduleList + Entry: 7 + Data: 0|System.Collections.Generic.List`1[[Ichni.RhythmGame.SubmoduleBase, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tiltBackTweener + Entry: 6 + Data: elementName: tags: [] parentElement: {fileID: 0} childElementList: [] - gameCamera: {fileID: 1378655914364111770} + cam: {fileID: 1378655914364111770} rotationPoint: {fileID: 373065448631755357} positionPoint: {fileID: 2202765603615894048} cameraTransform: {fileID: 4681825519897212372} cameraViewType: 0 perspectiveAngle: 60 orthographicSize: 10 + perspectiveOffset: 0 --- !u!1 &261765279725222738 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/Beatmap.bytes index 03f21609..abb491d0 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/CommandScripts.bytes index c4840477..d4b3d5e1 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/CommandScripts.bytes and b/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/CommandScripts.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/ProjectInfo.bytes index 2356ea49..72d56926 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/SongInfo.bytes index 9d9ef32f..34b5dd7d 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/SongInfo.bytes +++ b/Assets/Resources/Beatmaps/Chapter0/Palingenesis of #ffffff/Longaevus/SongInfo.bytes @@ -1,3 +1,2 @@ -g}y8?&\*F'#EU*US32X~/#s;ҫI3!nt̽R6 HD5F.' ;dUV)u4{L+B]/NҞb> -4Ϻ/_1uMC@]lfy6DCrKatD$e;蟛 @yC2-q+S. -$ \ No newline at end of file +ӬLD"FyUV>HҥI-+MS G3SX#䍻 +n_G,PL0 @Zy-3t +fia\z/G!ŤG71qsUyȠnDf>Sa#5Ehh )4Uɉ9tYY/yV@BYS9_V}8\?},坎Ixj !QimQ7tVuËX,<- \ No newline at end of file diff --git a/Assets/Resources/Beatmaps/Chapter0/Register/Hard/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Register/Hard/ProjectInfo.bytes index fa3f53e7..9fbcf790 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Register/Hard/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Register/Hard/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Register/Hard/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Register/Hard/SongInfo.bytes index 26bf9e20..d84bf7b7 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Register/Hard/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Register/Hard/SongInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/Beatmap.bytes index c77c4684..7205a300 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/CommandScripts.bytes index 5fd9341d..582ec468 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/CommandScripts.bytes and b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/CommandScripts.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/ProjectInfo.bytes index 96c22dcc..c5b16f4d 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/ProjectInfo.bytes +++ b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/ProjectInfo.bytes @@ -1 +1 @@ -K!DǼDyn/q$ϭNon%𨐞(MHV0 : ] kyyYv)⮙Du#LKgK :'7/;{SPòxUys3*t3Kי>j3[r(Y7Ŵs#t[4TfN'>~]׌VOMݜut&-F;_Uя'NKxH)aO]V=Z*7!FBm-ARJ-ݐ!V \ No newline at end of file +m[!ݒXd>I<8=vF 8xG)ݕ{_HkU鴙V'eЙoA3([6 e٩KnHg.;'Β ŒEE,T \ No newline at end of file diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/SongInfo.bytes index d46c2c06..1decf40f 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Hard/SongInfo.bytes differ diff --git a/Assets/Resources/Chapter0.asset b/Assets/Resources/Chapter0.asset index 3184bcb8..9235a3f2 100644 --- a/Assets/Resources/Chapter0.asset +++ b/Assets/Resources/Chapter0.asset @@ -118,8 +118,8 @@ MonoBehaviour: groupGuidInternal: WwiseObjectReference: {fileID: 11400000, guid: 9aa2c62bfcfea9542b862909a62f0b2f, type: 2} - illustration: {fileID: 21300000, guid: b8695dede796de14d9d61422114e3766, type: 3} - illustratorName: + illustration: {fileID: 21300000, guid: 60937db3f47e497488e8083180a1ac47, type: 3} + illustratorName: AI additionalInformation: difficultyDataList: - difficultyIndex: 0 @@ -192,7 +192,7 @@ MonoBehaviour: groupGuidInternal: WwiseObjectReference: {fileID: 11400000, guid: cdcfc987ec0b27e4bb7e192797629f8e, type: 2} - illustration: {fileID: 21300000, guid: b8695dede796de14d9d61422114e3766, type: 3} + illustration: {fileID: 21300000, guid: 35af6ea6f4073e34894f630d7daebb8c, type: 3} illustratorName: additionalInformation: difficultyDataList: @@ -296,7 +296,7 @@ MonoBehaviour: groupGuidInternal: WwiseObjectReference: {fileID: 11400000, guid: f6ce23fa90b96714db981f3beee99a7b, type: 2} - illustration: {fileID: 21300000, guid: b8695dede796de14d9d61422114e3766, type: 3} + illustration: {fileID: 21300000, guid: ab29b4b183ba27e43bbfd92589405af7, type: 3} illustratorName: additionalInformation: difficultyDataList: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 22430e42..dd7fa03e 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -2266,7 +2266,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &237780457 RectTransform: m_ObjectHideFlags: 0 @@ -2295,7 +2295,7 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 237780456} m_Enabled: 1 - m_Alpha: 0 + m_Alpha: 1 m_Interactable: 0 m_BlocksRaycasts: 0 m_IgnoreParentGroups: 0 @@ -3002,6 +3002,143 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 340068461} m_CullTransparentMesh: 1 +--- !u!1 &342052442 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 342052446} + - component: {fileID: 342052445} + - component: {fileID: 342052444} + - component: {fileID: 342052443} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &342052443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 342052442} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 +--- !u!81 &342052444 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 342052442} + m_Enabled: 1 +--- !u!20 &342052445 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 342052442} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &342052446 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 342052442} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.4338784, y: -0.18502262, z: 310.91315} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &354327107 GameObject: m_ObjectHideFlags: 0 @@ -7418,6 +7555,7 @@ MonoBehaviour: flashDeSaturateIntensity: 1 flashContrast: 1 flashColor: {r: 1, g: 1, b: 1, a: 1} + blackFlashColor: {r: 0, g: 0, b: 0, a: 1} vignetteToggle: 0 vignetteColor: {r: 0, g: 0, b: 0, a: 1} vignetteIntensity: 1 @@ -11528,30 +11666,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 99971dd6462223c4596d435e8acdcfb8, type: 3} m_Name: m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: - - Name: gameInput - Entry: 7 - Data: 0|GameInput, Assembly-CSharp - - Name: - Entry: 8 - Data: minSwipeDistance: 100 swipeAngleThreshold: 1 playerInput: {fileID: 1332204029} - holdingTouch0: 0 - holdingTouch1: 0 - holdingTouch2: 0 - holdingTouch3: 0 - holdingSwipe0: 0 - holdingSwipe1: 0 --- !u!114 &1332204029 MonoBehaviour: m_ObjectHideFlags: 0 @@ -18137,9 +18254,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 41b74e1b6f336454599ff14343cbdbb2, type: 3} + m_Sprite: {fileID: 21300000, guid: 034ce3bb9f7346a42aca5cabd7bbe6c5, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -19807,3 +19924,4 @@ SceneRoots: - {fileID: 1806683416} - {fileID: 759709588} - {fileID: 570979741} + - {fileID: 342052446} diff --git a/Assets/Scripts/Game/Animations/Camera/CameraFieldOfView.cs b/Assets/Scripts/Game/Animations/Camera/CameraFieldOfView.cs index 0345bbdc..451ec25a 100644 --- a/Assets/Scripts/Game/Animations/Camera/CameraFieldOfView.cs +++ b/Assets/Scripts/Game/Animations/Camera/CameraFieldOfView.cs @@ -39,7 +39,7 @@ namespace Ichni.RhythmGame if (fieldOfView.returnType == FlexibleReturnType.MiddleExecuting) { targetGameCamera.perspectiveAngle = fieldOfView.value; - targetGameCamera.gameCamera.fieldOfView = fieldOfView.value; + targetGameCamera.cam.fieldOfView = fieldOfView.value; } } diff --git a/Assets/Scripts/Game/GameElements/GameCamera/GameCamera.cs b/Assets/Scripts/Game/GameElements/GameCamera/GameCamera.cs index 49b318ad..b53998e2 100644 --- a/Assets/Scripts/Game/GameElements/GameCamera/GameCamera.cs +++ b/Assets/Scripts/Game/GameElements/GameCamera/GameCamera.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using DG.Tweening; using Ichni.RhythmGame.Beatmap; using Ichni.UI; using UniRx; @@ -13,7 +14,7 @@ namespace Ichni.RhythmGame { public partial class GameCamera : GameElement, IHaveTransformSubmodule, IHaveTimeDurationSubmodule { - [FormerlySerializedAs("camera")] public new Camera gameCamera; + public Camera cam; public Transform rotationPoint; public Transform positionPoint; public Transform cameraTransform; @@ -40,7 +41,7 @@ namespace Ichni.RhythmGame gameCamera.parentElement = parentElement; gameCamera.cameraViewType = cameraViewType; - gameCamera.gameCamera.orthographic = cameraViewType == CameraViewType.Orthographic; + gameCamera.cam.orthographic = cameraViewType == CameraViewType.Orthographic; gameCamera.perspectiveAngle = perspectiveAngle; gameCamera.orthographicSize = orthographicSize; gameCamera.cameraTransform = gameCamera.transform; @@ -55,7 +56,7 @@ namespace Ichni.RhythmGame //gameCamera.perspectiveOffset = 11f * ratioDifference; } - gameCamera.gameCamera.fieldOfView = perspectiveAngle + gameCamera.perspectiveOffset; + gameCamera.cam.fieldOfView = perspectiveAngle + gameCamera.perspectiveOffset; return gameCamera; } @@ -63,7 +64,7 @@ namespace Ichni.RhythmGame { base.AfterInitialize(); //gameCamera.GetComponent().cameraStack.Add(cameraManager.uiCamera); - GameManager.instance.backgroundController.backgroundCanvas.worldCamera = gameCamera; + GameManager.instance.backgroundController.backgroundCanvas.worldCamera = cam; } public override void SetDefaultSubmodules() diff --git a/Assets/Scripts/Game/GameElements/GameCamera/GameCameraExtension.cs b/Assets/Scripts/Game/GameElements/GameCamera/GameCameraExtension.cs index e80c714e..7cf3ee26 100644 --- a/Assets/Scripts/Game/GameElements/GameCamera/GameCameraExtension.cs +++ b/Assets/Scripts/Game/GameElements/GameCamera/GameCameraExtension.cs @@ -24,7 +24,7 @@ namespace Ichni.RhythmGame public void ApplyExtension() { - gameCamera.gameCamera.farClipPlane = farClipRange; + gameCamera.cam.farClipPlane = farClipRange; } } diff --git a/Assets/Scripts/Game/GameElements/GeneralEffects/CameraOffsetEffect.cs b/Assets/Scripts/Game/GameElements/GeneralEffects/CameraOffsetEffect.cs index b04fc0ce..58f6b649 100644 --- a/Assets/Scripts/Game/GameElements/GeneralEffects/CameraOffsetEffect.cs +++ b/Assets/Scripts/Game/GameElements/GeneralEffects/CameraOffsetEffect.cs @@ -14,7 +14,7 @@ namespace Ichni.RhythmGame public Vector3 offsetValue; public AnimationCurve offsetCurve; - Transform gameCameraTransform => GameManager.instance.cameraManager.gameCamera.gameCamera.transform; + Transform gameCameraTransform => GameManager.instance.cameraManager.gameCamera.cam.transform; Tweener offsetTweener; public CameraOffsetEffect(float duration, Vector3 offsetValue, AnimationCurve offsetCurve) diff --git a/Assets/Scripts/Game/GameElements/GeneralEffects/CameraTiltEffect.cs b/Assets/Scripts/Game/GameElements/GeneralEffects/CameraTiltEffect.cs index 6da86d13..dfd8fc45 100644 --- a/Assets/Scripts/Game/GameElements/GeneralEffects/CameraTiltEffect.cs +++ b/Assets/Scripts/Game/GameElements/GeneralEffects/CameraTiltEffect.cs @@ -12,8 +12,9 @@ namespace Ichni.RhythmGame public Vector3 tiltValue; public AnimationCurve tiltCurve; - Transform gameCameraTransform => GameManager.instance.cameraManager.gameCamera.gameCamera.transform; + GameCamera gameCamera=> GameManager.instance.cameraManager.gameCamera; Tweener tiltTweener; + Tweener tiltBackTweener; public CameraTiltEffect(float duration, Vector3 tiltValue, AnimationCurve tiltCurve) { @@ -26,17 +27,17 @@ namespace Ichni.RhythmGame public override void Recover() { tiltTweener?.Kill(true); - gameCameraTransform.localEulerAngles = Vector3.zero; + tiltBackTweener?.Kill(true); + gameCamera.cam.transform.localEulerAngles = Vector3.zero; } public override void PreExecute() { - tiltTweener = gameCameraTransform.DOBlendableLocalRotateBy(tiltValue, duration, RotateMode.FastBeyond360).SetEase(tiltCurve).Play(); + tiltTweener = gameCamera.cam.transform.DOBlendableLocalRotateBy(tiltValue, duration, RotateMode.FastBeyond360).SetEase(tiltCurve).Play(); } public override void Adjust() { - } public override EffectBase_BM ConvertToBM() @@ -47,7 +48,7 @@ namespace Ichni.RhythmGame public override void Disrupt() { tiltTweener?.Kill(); - gameCameraTransform.DOLocalRotate(Vector3.zero, 0.4f).Play(); + tiltBackTweener = gameCamera.cam.transform.DOLocalRotate(Vector3.zero, 0.4f).SetEase(Ease.OutSine).Play(); } } diff --git a/Assets/Scripts/Game/GameElements/Notes/JudgeSubmodules/TouchAreaJudgeUnit.cs b/Assets/Scripts/Game/GameElements/Notes/JudgeSubmodules/TouchAreaJudgeUnit.cs index 57e8d502..fdea788d 100644 --- a/Assets/Scripts/Game/GameElements/Notes/JudgeSubmodules/TouchAreaJudgeUnit.cs +++ b/Assets/Scripts/Game/GameElements/Notes/JudgeSubmodules/TouchAreaJudgeUnit.cs @@ -48,7 +48,7 @@ namespace Ichni.RhythmGame float distance = Vector2.Distance(inputScreenPosition, noteScreenPosition); - if (distance <= areaRadius * CurrentScreenRatio()) + if (distance <= areaRadius) { if (inputUnit is InputUnitSwipe swipe && note is Flick flick) { @@ -86,7 +86,7 @@ namespace Ichni.RhythmGame public override NoteJudgeUnit ConvertToGameType(NoteBase attachedNote) { -#if UNITY_EDITOR || UNITY_STANDALONE +#if UNITY_STANDALONE return new FullScreenNearTimeJudgeUnit(attachedNote); #elif UNITY_ANDROID || UNITY_IOS return new TouchAreaJudgeUnit(attachedNote, areaRadius); diff --git a/Assets/Scripts/Game/GameElements/Notes/NoteObjects/Flick.cs b/Assets/Scripts/Game/GameElements/Notes/NoteObjects/Flick.cs index 29903ed7..105ccf34 100644 --- a/Assets/Scripts/Game/GameElements/Notes/NoteObjects/Flick.cs +++ b/Assets/Scripts/Game/GameElements/Notes/NoteObjects/Flick.cs @@ -144,7 +144,7 @@ namespace Ichni.RhythmGame return true; } - Camera gameCamera = GameManager.instance.cameraManager.gameCamera.gameCamera; + Camera gameCamera = GameManager.instance.cameraManager.gameCamera.cam; foreach (Vector2 localDir in availableFlickDirections) { diff --git a/Assets/Scripts/Game/GameElements/Notes/NoteObjects/Hold.cs b/Assets/Scripts/Game/GameElements/Notes/NoteObjects/Hold.cs index 78986a53..ab2c2011 100644 --- a/Assets/Scripts/Game/GameElements/Notes/NoteObjects/Hold.cs +++ b/Assets/Scripts/Game/GameElements/Notes/NoteObjects/Hold.cs @@ -345,9 +345,15 @@ namespace Ichni.RhythmGame if (!isFirstJudged && GameManager.instance.songTime > exactJudgeTime + judgeIntervals.afterMiss) { - Miss(exactJudgeTime + judgeIntervals.afterMiss); isFirstJudged = true; isFinalJudged = true; + + foreach (EffectBase e in noteVisual.effectSubmodule.effectCollection["StartHold"]) + { + e.Disrupt(); + } + + Miss(exactJudgeTime + judgeIntervals.afterMiss); RemoveFromCheckingList(); } } diff --git a/Assets/Scripts/Game/GameElements/Notes/NoteObjects/NoteBase.cs b/Assets/Scripts/Game/GameElements/Notes/NoteObjects/NoteBase.cs index a08ecbc2..38d27b08 100644 --- a/Assets/Scripts/Game/GameElements/Notes/NoteObjects/NoteBase.cs +++ b/Assets/Scripts/Game/GameElements/Notes/NoteObjects/NoteBase.cs @@ -292,7 +292,7 @@ namespace Ichni.RhythmGame { public Vector2 GetScreenPosition() { - return GameManager.instance.cameraManager.gameCamera.gameCamera.WorldToScreenPoint(noteVisual.noteVisualPosition); + return GameManager.instance.cameraManager.gameCamera.cam.WorldToScreenPoint(noteVisual.noteVisualPosition); } protected virtual void SetJudgeArea() diff --git a/Assets/Scripts/Game/GameElements/Track/TrackPoints/TrackPercentPoint.cs b/Assets/Scripts/Game/GameElements/Track/TrackPoints/TrackPercentPoint.cs index e3a23d15..0a7b0dba 100644 --- a/Assets/Scripts/Game/GameElements/Track/TrackPoints/TrackPercentPoint.cs +++ b/Assets/Scripts/Game/GameElements/Track/TrackPoints/TrackPercentPoint.cs @@ -50,11 +50,8 @@ namespace Ichni.RhythmGame if (trackPercent.returnType == FlexibleReturnType.MiddleExecuting) { float finalValue = trackPercent.value; + if (finalValue > 1 && finalValue > Mathf.Floor(finalValue)) finalValue -= Mathf.Floor(finalValue); - if (isBeyond1) - { - finalValue -= Mathf.Floor(finalValue); - } trackPositioner.SetPercent(finalValue); } diff --git a/Assets/Scripts/Manager/BasePrefabsCollection.cs b/Assets/Scripts/Manager/BasePrefabsCollection.cs index 893a9319..5fa0d246 100644 --- a/Assets/Scripts/Manager/BasePrefabsCollection.cs +++ b/Assets/Scripts/Manager/BasePrefabsCollection.cs @@ -55,6 +55,9 @@ public partial class BasePrefabsCollection : SerializedScriptableObject public GameObject directionalSwipeInputMark; public GameObject genericSwipeInputMark; + + public GameObject inputEndMark; + public GameObject inputCanceledMark; } public partial class BasePrefabsCollection diff --git a/Assets/Scripts/Manager/GameInputManager.cs b/Assets/Scripts/Manager/GameInputManager.cs index f0f3904a..e11e6210 100644 --- a/Assets/Scripts/Manager/GameInputManager.cs +++ b/Assets/Scripts/Manager/GameInputManager.cs @@ -9,6 +9,7 @@ using Lean.Pool; using Sirenix.OdinInspector; using TMPro; using UnityEngine.InputSystem.Controls; +using UnityEngine.InputSystem.EnhancedTouch; using UnityEngine.UI; using Touch = UnityEngine.InputSystem.EnhancedTouch.Touch; using TouchPhase = UnityEngine.InputSystem.TouchPhase; @@ -17,7 +18,7 @@ using TouchPhase = UnityEngine.InputSystem.TouchPhase; /// 为节奏游戏设计的输入管理器，处理多点触控并分发三种主要事件。 /// 【重要】此版本内置了编辑器内的鼠标模拟功能，无需手机即可测试。 /// -public class GameInputManager : SerializedMonoBehaviour +public class GameInputManager : MonoBehaviour { // ===================================================================== // 可配置参数 (Configurable Parameters) @@ -41,7 +42,7 @@ public class GameInputManager : SerializedMonoBehaviour public Vector2 StartPosition; public float StartTime; public Vector2 LastSwipeDirection = Vector2.zero; - public bool IsTapCandidate = true; + public bool isFirstSwipe = true; } private readonly Dictionary _activeTouches = new Dictionary(); @@ -55,7 +56,7 @@ public class GameInputManager : SerializedMonoBehaviour private void Awake() { -#if UNITY_EDITOR || UNITY_STANDALONE +#if UNITY_STANDALONE DOTween.SetTweensCapacity(200, 200); gameInput = new GameInput(); gameInput.Game.Enable(); @@ -65,6 +66,8 @@ public class GameInputManager : SerializedMonoBehaviour Debug.Log("已加载自定义按键绑定"); } RegisterActionsInputs(); +#else + Debug.Log("已启用真实触摸输入"); #endif } @@ -76,10 +79,19 @@ public class GameInputManager : SerializedMonoBehaviour } // 使用预处理指令区分平台 -#if UNITY_EDITOR || UNITY_STANDALONE +#if UNITY_STANDALONE HandleHolding(); #else ProcessRealTouchInput(); +#endif + } + + private void OnDisable() + { +#if UNITY_STANDALONE + +#else + #endif } @@ -103,21 +115,24 @@ public class GameInputManager : SerializedMonoBehaviour GameManager.instance.noteJudgeManager.SetNewInputUnitTouch(id, position); } - private void OnSwipe(int id, Vector2 position, bool isGeneric, Vector2 direction) + private void OnSwipe(int id, Vector2 position, bool isGeneric, bool isFirst, Vector2 direction) { if (SettingsManager.instance.gameSettings.debugMode) { - GenerateSwipeMark(id, position, isGeneric, direction); + GenerateSwipeMark(id, position, isGeneric, isFirst, direction); + + if(isFirst) Debug.Log($"划动开始 - ID: {id}, 位置: {position}, 方向: {direction}"); + else Debug.Log($"划动更新 - ID: {id}, 位置: {position}, 方向: {direction}"); } - GameManager.instance.noteJudgeManager.SetNewInputUnitSwipe(id, position, isGeneric, direction); + GameManager.instance.noteJudgeManager.SetNewInputUnitSwipe(id, position, isGeneric, isFirst, direction); } // ===================================================================== // 核心处理逻辑 (Core Processing Logic) // ===================================================================== -#if UNITY_EDITOR || UNITY_STANDALONE +#if UNITY_STANDALONE /// /// 【仅在编辑器中运行】处理鼠标输入并模拟触摸事件。 /// @@ -171,7 +186,7 @@ public class GameInputManager : SerializedMonoBehaviour } #endif -#if UNITY_EDITOR || UNITY_STANDALONE +#if UNITY_STANDALONE public bool holdingTouch0; public bool holdingTouch1; @@ -269,22 +284,6 @@ public class GameInputManager : SerializedMonoBehaviour holdingSwipe0 = false; } }; - - /*gameInput.Game.Swipe1.performed += ctx => - { - if (ctx.performed) - { - holdingSwipe1 = true; - } - }; - - gameInput.Game.Swipe1.canceled += ctx => - { - if (ctx.canceled) - { - holdingSwipe1 = false; - } - };*/ } private void HandleHolding() @@ -318,12 +317,6 @@ public class GameInputManager : SerializedMonoBehaviour Vector2 inputPosition = new Vector2(Screen.width * 0.5f, 200f); OnSwipe(0, inputPosition, true, Vector2.zero); } - - /*if (holdingSwipe1) - { - Vector2 inputPosition = new Vector2(600 + Screen.width * 0.5f, 200f); - OnSwipe(3, inputPosition, true, Vector2.zero); - }*/ } #endif @@ -357,6 +350,8 @@ public class GameInputManager : SerializedMonoBehaviour TouchId = touchId, StartPosition = position, StartTime = Time.time, + LastSwipeDirection = Vector2.zero, + isFirstSwipe = true }; _activeTouches[touchId] = newState; OnTap(touchId, position); @@ -367,7 +362,8 @@ public class GameInputManager : SerializedMonoBehaviour if (_activeTouches.TryGetValue(touchId, out TouchState movedState)) { OnTouch(touchId, position); - DetectSwipe(movedState, position); + DetectSwipe(movedState, _activeTouches[touchId].isFirstSwipe, position); + //_activeTouches[touchId].isFirstSwipe = false; } break; @@ -382,6 +378,10 @@ public class GameInputManager : SerializedMonoBehaviour if (_activeTouches.ContainsKey(touchId)) { _activeTouches.Remove(touchId); + if (SettingsManager.instance.gameSettings.debugMode) + { + GenerateEndMark(position); + } } break; @@ -389,6 +389,10 @@ public class GameInputManager : SerializedMonoBehaviour if (_activeTouches.ContainsKey(touchId)) { _activeTouches.Remove(touchId); + if (SettingsManager.instance.gameSettings.debugMode) + { + GenerateCanceledMark(position); + } } break; } @@ -397,7 +401,7 @@ public class GameInputManager : SerializedMonoBehaviour /// /// 检测划动逻辑 (无需修改) /// - private void DetectSwipe(TouchState state, Vector2 currentPosition) + private void DetectSwipe(TouchState state, bool isFirst, Vector2 currentPosition) { Vector2 swipeVector = currentPosition - state.StartPosition; if (swipeVector.magnitude < minSwipeDistance) return; @@ -407,7 +411,7 @@ public class GameInputManager : SerializedMonoBehaviour // 检查是否是新的划动方向 if (Vector2.Dot(direction, state.LastSwipeDirection) <= swipeAngleThreshold) { - OnSwipe(state.TouchId, state.StartPosition, false, direction); + OnSwipe(state.TouchId, state.StartPosition, false, isFirst, direction); state.LastSwipeDirection = direction; state.StartPosition = currentPosition; state.StartTime = Time.time; @@ -461,13 +465,13 @@ public class GameInputManager : SerializedMonoBehaviour ss.Play(); } - private void GenerateSwipeMark(int id, Vector2 pos, bool isGeneric, Vector2 direction) + private void GenerateSwipeMark(int id, Vector2 pos, bool isGeneric, bool isFirst, Vector2 direction) { GameObject markPrefab = isGeneric ? GameManager.instance.basePrefabs.genericSwipeInputMark : GameManager.instance.basePrefabs.directionalSwipeInputMark; - RectTransform mark = LeanPool.Spawn(markPrefab, GameManager.instance.judgeHintCanvas.transform). GetComponent(); + RectTransform mark = LeanPool.Spawn(markPrefab, GameManager.instance.judgeHintCanvas.transform).GetComponent(); RectTransform canvasRect = GameManager.instance.judgeHintCanvas.GetComponent(); if (RectTransformUtility.ScreenPointToLocalPointInRectangle(canvasRect, pos, null, out Vector2 uiPosition)) @@ -479,7 +483,7 @@ public class GameInputManager : SerializedMonoBehaviour Sequence ss = DOTween.Sequence(); ss.OnStart(() => { - mark.GetComponent().color = Color.white; + mark.GetComponent().color = isFirst ? Color.red : Color.white; mark.localScale = Vector3.zero; }); ss.Join(mark.GetComponent().DOFade(0, 0.25f)); @@ -488,4 +492,50 @@ public class GameInputManager : SerializedMonoBehaviour ss.SetUpdate(true); ss.Play(); } + + private void GenerateEndMark(Vector2 pos) + { + RectTransform canvasRect = GameManager.instance.judgeHintCanvas.GetComponent(); + RectTransform mark = LeanPool.Spawn(GameManager.instance.basePrefabs.inputEndMark, canvasRect).GetComponent(); + + if (RectTransformUtility.ScreenPointToLocalPointInRectangle(canvasRect, pos, null, out Vector2 uiPosition)) + { + mark.anchoredPosition = uiPosition; + } + + Sequence ss = DOTween.Sequence(); + ss.OnStart(() => + { + mark.GetComponent().color = Color.white; + mark.localScale = Vector3.one * 5f; + }); + ss.Join(mark.GetComponent().DOFade(0, 0.25f)); + ss.Join(mark.DOScale(0, 0.25f)); + ss.OnComplete(() => LeanPool.Despawn(mark.gameObject)); + ss.SetUpdate(true); + ss.Play(); + } + + private void GenerateCanceledMark(Vector2 pos) + { + RectTransform canvasRect = GameManager.instance.judgeHintCanvas.GetComponent(); + RectTransform mark = LeanPool.Spawn(GameManager.instance.basePrefabs.inputCanceledMark, canvasRect).GetComponent(); + + if (RectTransformUtility.ScreenPointToLocalPointInRectangle(canvasRect, pos, null, out Vector2 uiPosition)) + { + mark.anchoredPosition = uiPosition; + } + + Sequence ss = DOTween.Sequence(); + ss.OnStart(() => + { + mark.GetComponent().color = Color.white; + mark.localScale = Vector3.one * 5f; + }); + ss.Join(mark.GetComponent().DOFade(0, 0.25f)); + ss.Join(mark.DOScale(0, 0.25f)); + ss.OnComplete(() => LeanPool.Despawn(mark.gameObject)); + ss.SetUpdate(true); + ss.Play(); + } } diff --git a/Assets/Scripts/Manager/NoteJudgeManager.cs b/Assets/Scripts/Manager/NoteJudgeManager.cs index c8c857eb..17d917ac 100644 --- a/Assets/Scripts/Manager/NoteJudgeManager.cs +++ b/Assets/Scripts/Manager/NoteJudgeManager.cs @@ -188,9 +188,9 @@ namespace Ichni } } - public void SetNewInputUnitSwipe(int fingerId, Vector2 inputPosition, bool isGeneric, Vector2 delta) + public void SetNewInputUnitSwipe(int fingerId, Vector2 inputPosition, bool isGeneric, bool isFirst, Vector2 delta) { - InputUnitSwipe inputUnitSwipe = new InputUnitSwipe(fingerId, inputPosition, isGeneric, delta); + InputUnitSwipe inputUnitSwipe = new InputUnitSwipe(fingerId, inputPosition, isGeneric, isFirst, delta); if(!inputUnitSwipeList.Exists(x => x.fingerId == fingerId)) { inputUnitSwipeList.Add(inputUnitSwipe); @@ -304,12 +304,13 @@ namespace Ichni { public Vector2 swipeDirection; public bool isGeneric; - - public InputUnitSwipe(int fingerId, Vector2 inputPosition, bool isGeneric, Vector2 swipeDirection) + public bool isFirst; + public InputUnitSwipe(int fingerId, Vector2 inputPosition, bool isGeneric, bool isFirst, Vector2 swipeDirection) { this.fingerId = fingerId; this.inputPosition = inputPosition; this.isGeneric = isGeneric; + this.isFirst = isFirst; this.swipeDirection = swipeDirection.normalized; } } diff --git a/Assets/Scripts/Manager/PostProcessingManager.cs b/Assets/Scripts/Manager/PostProcessingManager.cs index 49fecdb0..faa3a859 100644 --- a/Assets/Scripts/Manager/PostProcessingManager.cs +++ b/Assets/Scripts/Manager/PostProcessingManager.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -22,6 +23,13 @@ namespace Ichni SetPixelateStrength(Screen.width, Screen.height); } + private void OnDisable() + { + FindAndCacheFeatureWithReflection(); + SetFeatureActive(false); + SetPixelateStrength(Screen.width, Screen.height); + } + private void FindAndCacheFeatureWithReflection() { var pipelineAsset = GraphicsSettings.currentRenderPipeline as UniversalRenderPipelineAsset; diff --git a/Assets/Scripts/SpaceConverter.cs b/Assets/Scripts/SpaceConverter.cs index aa7f5931..77cbaca5 100644 --- a/Assets/Scripts/SpaceConverter.cs +++ b/Assets/Scripts/SpaceConverter.cs @@ -12,7 +12,7 @@ namespace Ichni public static Vector2 WorldPointToScreenPoint(Vector3 worldPoint) { // Camera.main 世界摄像机 - Vector2 screenPoint = GameManager.instance.cameraManager.gameCamera.gameCamera.WorldToScreenPoint(worldPoint); + Vector2 screenPoint = GameManager.instance.cameraManager.gameCamera.cam.WorldToScreenPoint(worldPoint); return screenPoint; } @@ -26,7 +26,7 @@ namespace Ichni { // Camera.main 世界摄像机 Vector3 position = new Vector3(screenPoint.x, screenPoint.y, planeZ); - Vector3 worldPoint = GameManager.instance.cameraManager.gameCamera.gameCamera.ScreenToWorldPoint(position); + Vector3 worldPoint = GameManager.instance.cameraManager.gameCamera.cam.ScreenToWorldPoint(position); return worldPoint; } diff --git a/Assets/Settings/URP-HighFidelity-Renderer.asset b/Assets/Settings/URP-HighFidelity-Renderer.asset index 2b15516f..c5aa8fff 100644 --- a/Assets/Settings/URP-HighFidelity-Renderer.asset +++ b/Assets/Settings/URP-HighFidelity-Renderer.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f41bcf9b1f0eb6446907e2c52c9f2d39, type: 3} m_Name: PixelateFeature m_EditorClassIdentifier: - m_Active: 1 + m_Active: 0 settings: pixelateShader: {fileID: 4800000, guid: 272e7eef87baea8408e583d2670e66dd, type: 3} pixelateStrengthX: 1794.0509 @@ -30,7 +30,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3} m_Name: SSAO m_EditorClassIdentifier: - m_Active: 1 + m_Active: 0 m_Settings: AOMethod: 1 Downsample: 0 diff --git a/Assets/Sprites/Illustrations/Chapter 0/AI.meta b/Assets/Sprites/Illustrations/Chapter 0/AI.meta new file mode 100644 index 00000000..2789c92b --- /dev/null +++ b/Assets/Sprites/Illustrations/Chapter 0/AI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a45507093910f304ba3700880233ff37 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Illustrations/Chapter 0/AI/00047-1476550617.png b/Assets/Sprites/Illustrations/Chapter 0/AI/00047-1476550617.png new file mode 100644 index 00000000..66d7b6a8 Binary files /dev/null and b/Assets/Sprites/Illustrations/Chapter 0/AI/00047-1476550617.png differ diff --git a/Assets/Sprites/Illustrations/Chapter 0/illustration-anime-character-rain.jpg.meta b/Assets/Sprites/Illustrations/Chapter 0/AI/00047-1476550617.png.meta similarity index 98% rename from Assets/Sprites/Illustrations/Chapter 0/illustration-anime-character-rain.jpg.meta rename to Assets/Sprites/Illustrations/Chapter 0/AI/00047-1476550617.png.meta index 5ad7917d..a117d7eb 100644 --- a/Assets/Sprites/Illustrations/Chapter 0/illustration-anime-character-rain.jpg.meta +++ b/Assets/Sprites/Illustrations/Chapter 0/AI/00047-1476550617.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0e51a07826521334291c8c2bd2e5c764 +guid: ab29b4b183ba27e43bbfd92589405af7 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Sprites/Illustrations/Chapter 0/AI/00059-2643385900.png b/Assets/Sprites/Illustrations/Chapter 0/AI/00059-2643385900.png new file mode 100644 index 00000000..7932089c Binary files /dev/null and b/Assets/Sprites/Illustrations/Chapter 0/AI/00059-2643385900.png differ diff --git a/Assets/Sprites/Illustrations/Chapter 0/beautiful-anime-character-cartoon-scene.jpg.meta b/Assets/Sprites/Illustrations/Chapter 0/AI/00059-2643385900.png.meta similarity index 98% rename from Assets/Sprites/Illustrations/Chapter 0/beautiful-anime-character-cartoon-scene.jpg.meta rename to Assets/Sprites/Illustrations/Chapter 0/AI/00059-2643385900.png.meta index 9b5a6538..4af59112 100644 --- a/Assets/Sprites/Illustrations/Chapter 0/beautiful-anime-character-cartoon-scene.jpg.meta +++ b/Assets/Sprites/Illustrations/Chapter 0/AI/00059-2643385900.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 362e902a96cac7449910aa293e0790f8 +guid: 35af6ea6f4073e34894f630d7daebb8c TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Sprites/Illustrations/Chapter 0/AI/00069-2218831294.png b/Assets/Sprites/Illustrations/Chapter 0/AI/00069-2218831294.png new file mode 100644 index 00000000..18a31444 Binary files /dev/null and b/Assets/Sprites/Illustrations/Chapter 0/AI/00069-2218831294.png differ diff --git a/Assets/Sprites/Illustrations/Chapter 0/illustration-anime-character-rain (1).jpg.meta b/Assets/Sprites/Illustrations/Chapter 0/AI/00069-2218831294.png.meta similarity index 98% rename from Assets/Sprites/Illustrations/Chapter 0/illustration-anime-character-rain (1).jpg.meta rename to Assets/Sprites/Illustrations/Chapter 0/AI/00069-2218831294.png.meta index 57e7385f..877d8ea8 100644 --- a/Assets/Sprites/Illustrations/Chapter 0/illustration-anime-character-rain (1).jpg.meta +++ b/Assets/Sprites/Illustrations/Chapter 0/AI/00069-2218831294.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2c311733b4094534fba92ff3c09c8243 +guid: 60937db3f47e497488e8083180a1ac47 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Sprites/Illustrations/Chapter 0/beautiful-anime-character-cartoon-scene.jpg b/Assets/Sprites/Illustrations/Chapter 0/beautiful-anime-character-cartoon-scene.jpg deleted file mode 100644 index 3a8543b6..00000000 Binary files a/Assets/Sprites/Illustrations/Chapter 0/beautiful-anime-character-cartoon-scene.jpg and /dev/null differ diff --git a/Assets/Sprites/Illustrations/Chapter 0/illustration-anime-character-rain (1).jpg b/Assets/Sprites/Illustrations/Chapter 0/illustration-anime-character-rain (1).jpg deleted file mode 100644 index 437e19b3..00000000 Binary files a/Assets/Sprites/Illustrations/Chapter 0/illustration-anime-character-rain (1).jpg and /dev/null differ diff --git a/Assets/Sprites/Illustrations/Chapter 0/illustration-anime-character-rain.jpg b/Assets/Sprites/Illustrations/Chapter 0/illustration-anime-character-rain.jpg deleted file mode 100644 index d1d5c753..00000000 Binary files a/Assets/Sprites/Illustrations/Chapter 0/illustration-anime-character-rain.jpg and /dev/null differ diff --git a/Assets/Sprites/Illustrations/Characters.meta b/Assets/Sprites/Illustrations/Characters.meta new file mode 100644 index 00000000..4ef7ac42 --- /dev/null +++ b/Assets/Sprites/Illustrations/Characters.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b29d0af8288b0a144befb86be86c409c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Illustrations/Characters/Gemini_Generated_Image_d3qj4dd3qj4dd3qj.png b/Assets/Sprites/Illustrations/Characters/Gemini_Generated_Image_d3qj4dd3qj4dd3qj.png new file mode 100644 index 00000000..b9ede20b Binary files /dev/null and b/Assets/Sprites/Illustrations/Characters/Gemini_Generated_Image_d3qj4dd3qj4dd3qj.png differ diff --git a/Assets/Sprites/Illustrations/Characters/Gemini_Generated_Image_d3qj4dd3qj4dd3qj.png.meta b/Assets/Sprites/Illustrations/Characters/Gemini_Generated_Image_d3qj4dd3qj4dd3qj.png.meta new file mode 100644 index 00000000..2f31675c --- /dev/null +++ b/Assets/Sprites/Illustrations/Characters/Gemini_Generated_Image_d3qj4dd3qj4dd3qj.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 034ce3bb9f7346a42aca5cabd7bbe6c5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/UITextures/Story/Soullies (1).png b/Assets/Sprites/Illustrations/Characters/Soullies (1).png similarity index 100% rename from Assets/Sprites/UITextures/Story/Soullies (1).png rename to Assets/Sprites/Illustrations/Characters/Soullies (1).png diff --git a/Assets/Sprites/UITextures/Story/Soullies (1).png.meta b/Assets/Sprites/Illustrations/Characters/Soullies (1).png.meta similarity index 100% rename from Assets/Sprites/UITextures/Story/Soullies (1).png.meta rename to Assets/Sprites/Illustrations/Characters/Soullies (1).png.meta diff --git a/Assets/StreamingAssets/ThemeBundles/Android/Android b/Assets/StreamingAssets/ThemeBundles/Android/Android index ea210af0..5837927f 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Android/Android and b/Assets/StreamingAssets/ThemeBundles/Android/Android differ diff --git a/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest b/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest index f8937214..664498ab 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 461089163 +CRC: 2763453641 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse index e0882aeb..3614db5f 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse and b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse differ diff --git a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest index b0c418e6..c7d5c696 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 4198872729 +CRC: 3298516730 Hashes: AssetFileHash: serializedVersion: 2 - Hash: d0b1b33aba71130de3edfc257de509ce + Hash: 286ccb43734b1a2ae551e015efbf8719 TypeTreeHash: serializedVersion: 2 Hash: ebe44d746e8b5a627d40c64d51ea8467 IncrementalBuildHash: serializedVersion: 2 - Hash: d0b1b33aba71130de3edfc257de509ce + Hash: 286ccb43734b1a2ae551e015efbf8719 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/JudgeTrigger.cs b/Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/JudgeTrigger.cs index f6e4b7bb..25804b2c 100644 --- a/Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/JudgeTrigger.cs +++ b/Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/JudgeTrigger.cs @@ -35,7 +35,7 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic private bool IsMouseOver() { //Raycast to check if mouse is over the object - Ray ray = GameManager.instance.cameraManager.gameCamera.gameCamera.ScreenPointToRay(Mouse.current.position.ReadValue()); + Ray ray = GameManager.instance.cameraManager.gameCamera.cam.ScreenPointToRay(Mouse.current.position.ReadValue()); if (Physics.Raycast(ray, out RaycastHit hit)) { if (hit.collider == triggerCollider) diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintBlue.mat b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintBlue.mat index 0638a429..1e0f7d1b 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintBlue.mat +++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintBlue.mat @@ -69,7 +69,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Exposure: 1 + - _Exposure: 0.8 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintDark.mat b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintDark.mat index 1a684c05..e8f53982 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintDark.mat +++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintDark.mat @@ -69,7 +69,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Exposure: 1 + - _Exposure: 0.8 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintNormal.mat b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintNormal.mat index 3987f093..dbc2ff3b 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintNormal.mat +++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintNormal.mat @@ -69,7 +69,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Exposure: 1 + - _Exposure: 0.8 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintRed.mat b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintRed.mat index 09fb5455..4cae062f 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintRed.mat +++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintRed.mat @@ -69,7 +69,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Exposure: 1 + - _Exposure: 0.8 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintWhite.mat b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintWhite.mat index 2eb7d6f2..0ff1ebf9 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintWhite.mat +++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/DTM_Skybox_BlueprintWhite.mat @@ -69,7 +69,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Exposure: 1 + - _Exposure: 0.8 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 4d1a5670..2c43b890 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,10 +15,10 @@ EditorUserSettings: value: 5550060701065c085e5c5924162609444f4f4b297e70226674284564b1b8326d flags: 0 RecentlyUsedSceneGuid-3: - value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d + value: 0006570300050d0a550b087144275c4412164f7f7d7970327c7e1961b1b4616f flags: 0 RecentlyUsedSceneGuid-4: - value: 0006570300050d0a550b087144275c4412164f7f7d7970327c7e1961b1b4616f + value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 0761dd3b..e360719b 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1706.6667 height: 869.3334 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 97 + controlID: 121 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1112 + width: 1197.3334 height: 819.3333 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 50 + controlID: 43 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -166,12 +166,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1112 + width: 1197.3334 height: 562.6667 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 51 + controlID: 44 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -190,13 +190,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 304.66666 + width: 266.66666 height: 562.6667 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 13} + - {fileID: 12} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -209,24 +209,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 304.66666 + x: 266.66666 y: 0 - width: 807.3334 + width: 930.66675 height: 562.6667 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 22} m_Panes: + - {fileID: 13} - {fileID: 14} - - {fileID: 15} - - {fileID: 12} - m_Selected: 0 - m_LastSelected: 2 + - {fileID: 22} + m_Selected: 2 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -244,16 +244,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 562.6667 - width: 1112 + width: 1197.3334 height: 256.66663 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 15} m_Panes: + - {fileID: 15} - {fileID: 16} - {fileID: 17} - {fileID: 18} - - {fileID: 19} m_Selected: 0 m_LastSelected: 1 --- !u!114 &11 @@ -271,122 +271,20 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1112 + x: 1197.3334 y: 0 - width: 594.6666 + width: 509.33325 height: 819.3333 - m_MinSize: {x: 276, y: 71} + m_MinSize: {x: 276, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 20} m_Panes: + - {fileID: 19} - {fileID: 20} - {fileID: 21} - - {fileID: 22} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !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: 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: 4621777727084837110, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 304.6667 - y: 72.66667 - width: 805.3334 - height: 541.6667 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow - m_SerializedViewValues: - - D:\Projects\ichni Official\Library\PlayModeViewStates\1f8d8eaf9e615074b80df4194a8c66b1 - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} - 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: 03000000000000000000000006000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -640 - m_HBaseRangeMax: 640 - m_VBaseRangeMin: -360 - m_VBaseRangeMax: 360 - 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: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 805.3334 - height: 520.6667 - m_Scale: {x: 0.6291667, y: 0.6291667} - m_Translation: {x: 402.6667, y: 260.33334} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -640 - y: -413.7748 - width: 1280 - height: 827.5496 - m_MinimalGUI: 1 - m_defaultScale: 0.6291667 - m_LastWindowPixelSize: {x: 1208, y: 812.5} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} - m_showToolbar: 1 ---- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -409,7 +307,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 72.66667 - width: 303.66666 + width: 265.66666 height: 541.6667 m_SerializedDataModeController: m_DataMode: 0 @@ -426,7 +324,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 02fbffff + m_ExpandedIDs: 8cb6ffff98beffff1af9ffff02fbffff949a0000d6ee000084ef000020f0000040f20000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -450,7 +348,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &14 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -471,9 +369,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 304.6667 + x: 266.6667 y: 72.66667 - width: 805.3334 + width: 928.66675 height: 541.6667 m_SerializedDataModeController: m_DataMode: 0 @@ -489,7 +387,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -177.33337, y: -26.666687} + snapOffset: {x: -179, y: -26.666687} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings @@ -801,7 +699,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 48, y: 25} + snapOffset: {x: 48, y: 10.666687} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay @@ -867,14 +765,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 959.324, y: 1210.0786, z: -1889.387} + m_Target: {x: 849.8244, y: 156.46439, z: 0.07204684} speed: 2 - m_Value: {x: 959.324, y: 1210.0786, z: -1889.387} + m_Value: {x: 849.8195, y: 156.45961, z: 0.0717944} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -920,17 +818,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.22918688, y: 0.38780272, z: -0.100184545, w: -0.8871629} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.22918688, y: 0.38780275, z: -0.10018455, w: -0.8871629} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 1.1256989 + m_Target: 0.535748 speed: 2 - m_Value: 1.1256989 + m_Value: 0.56099266 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -944,14 +842,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.048790682, y: 0.0010958355, z: -0.00005346032, w: -0.99881446} + 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 &15 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -972,9 +870,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 304.6667 + x: 266.6667 y: 72.66667 - width: 806 + width: 928.66675 height: 541.6667 m_SerializedDataModeController: m_DataMode: 0 @@ -1058,7 +956,7 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &16 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1081,7 +979,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 635.3334 - width: 1111 + width: 1196.3334 height: 235.66663 m_SerializedDataModeController: m_DataMode: 0 @@ -1104,7 +1002,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Sprites/UITextures/Story + - Assets/Sprites/Illustrations/Characters m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1112,16 +1010,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Sprites/UITextures/Story + - Assets/Sprites/Illustrations/Characters m_LastFoldersGridSize: 16 m_LastProjectPath: D:\Projects\ichni Official m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 724.3334} - m_SelectedIDs: e6a80000 - m_LastClickedID: 43238 - m_ExpandedIDs: 00000000aca70000aea70000b0a70000b2a70000b4a70000b6a70000b8a70000baa70000bca70000bea70000c0a70000c2a70000c4a70000c6a70000c8a70000caa70000cca70000cea70000d0a70000d2a70000d4a70000d6a70000d8a70000daa70000dca70000dea70000e0a70000e2a70000e4a70000e6a70000e8a70000eaa70000eca70000eea70000f0a70000f2a70000f4a70000f6a70000f8a70000faa70000fca70000fea7000000a8000002a8000004a800008ea80000d4a80000e6a8000000ca9a3b + scrollPos: {x: 0, y: 548.3334} + m_SelectedIDs: 18e00000 + m_LastClickedID: 57368 + m_ExpandedIDs: 0000000006a2000008a200000aa200000ca200000ea2000010a2000012a2000014a2000016a2000018a200001aa200001ca200001ea2000020a2000022a2000024a2000026a2000028a200002aa200002ca200002ea2000030a2000032a2000034a2000036a2000038a200003aa200003ca200003ea2000040a2000042a2000044a2000046a2000048a200004aa200004ca2000058a20000d6a20000e6a20000eca2000016b7000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1149,7 +1047,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000aca70000aea70000b0a70000b2a70000b4a70000b6a70000b8a70000baa70000bca70000bea70000c0a70000c2a70000c4a70000c6a70000c8a70000caa70000cca70000cea70000d0a70000d2a70000d4a70000d6a70000d8a70000daa70000dca70000dea70000e0a70000e2a70000e4a70000e6a70000e8a70000eaa70000eca70000eea70000f0a70000f2a70000f4a70000f6a70000f8a70000faa70000fca70000fea7000000a8000002a8000004a80000 + m_ExpandedIDs: 0000000006a2000008a200000aa200000ca200000ea2000010a2000012a2000014a2000016a2000018a200001aa200001ca200001ea2000020a2000022a2000024a2000026a2000028a200002aa200002ca200002ea2000030a2000032a2000034a2000036a2000038a200003aa200003ca200003ea2000040a2000042a2000044a2000046a2000048a200004aa200004ca200004ea2000050a2000052a2000054a2000056a2000058a200005aa200005ca20000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1176,19 +1074,19 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000d2c101005ac60100bec80100b6c80100000000000cd901003ada010074b30100d4a10600f8a300000e8e00003e91000044900000e8920000c6d400005aa10000909600007ca300009a9d00004ab90000fa9e0000aaab00006ea60000 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000d2c101005ac60100bec80100b6c80100000000000cd901003ada010074b30100d4a10600f8a300000e8e00003e91000044900000e8920000c6d400005aa10000909600007ca300009a9d00004ab90000fa9e0000aaab00006ea6000014ab000022e0000028e00000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: "\u5267\u60C5" - m_OriginalName: "\u5267\u60C5" + m_Name: Gemini_Generated_Image_d3qj4dd3qj4dd3qj + m_OriginalName: Gemini_Generated_Image_d3qj4dd3qj4dd3qj m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 41114 + m_UserData: 57384 m_IsWaitingForDelay: 0 m_IsRenaming: 0 m_OriginalEventType: 0 @@ -1205,7 +1103,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &17 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1228,7 +1126,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 635.3334 - width: 1111 + width: 1196.3334 height: 235.66663 m_SerializedDataModeController: m_DataMode: 0 @@ -1240,7 +1138,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &18 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1278,7 +1176,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_LastSelectedObjectID: 52388 ---- !u!114 &19 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1334,7 +1232,7 @@ MonoBehaviour: m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 0} m_SearchString: ---- !u!114 &20 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1355,9 +1253,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1112 + x: 1197.3334 y: 72.66667 - width: 593.6666 + width: 508.33325 height: 798.3333 m_SerializedDataModeController: m_DataMode: 0 @@ -1369,7 +1267,8 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 - m_ObjectsLockedBeforeSerialization: [] + m_ObjectsLockedBeforeSerialization: + - {fileID: 11400000, guid: f36a8d771b3945a4c9968628b65ac876, type: 2} m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: m_CachedPref: 181.66656 @@ -1380,9 +1279,9 @@ MonoBehaviour: m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: - m_IsLocked: 0 + m_IsLocked: 1 m_PreviewWindow: {fileID: 0} ---- !u!114 &21 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1403,9 +1302,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1104 + x: 1197.3334 y: 72.66667 - width: 601.6666 + width: 508.33325 height: 798.3333 m_SerializedDataModeController: m_DataMode: 0 @@ -1430,7 +1329,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &22 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1465,3 +1364,105 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 +--- !u!114 &22 +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: 4621777727084837110, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 266.6667 + y: 72.66667 + width: 928.66675 + height: 541.6667 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - D:\Projects\ichni Official\Library\PlayModeViewStates\5d367d67919082841bd25ba0b3a8ed87 + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + 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: 03000000000000000000000006000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -640 + m_HBaseRangeMax: 640 + m_VBaseRangeMin: -360 + m_VBaseRangeMax: 360 + 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: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 928.66675 + height: 520.6667 + m_Scale: {x: 0.72314817, y: 0.72314817} + m_Translation: {x: 464.33337, y: 260.33334} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -642.0999 + y: -360 + width: 1284.1998 + height: 720 + m_MinimalGUI: 1 + m_defaultScale: 0.72314817 + m_LastWindowPixelSize: {x: 1393.0001, y: 812.5} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} + m_showToolbar: 1