diff --git a/Assets/RawResources/Art/CG/时间切换.meta b/Assets/RawResources/Art/CG/时间切换.meta new file mode 100644 index 000000000..2dcc38bef --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d0014d34f5d914442a27f0b37436dfd3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Art/CG/时间切换/day.anim b/Assets/RawResources/Art/CG/时间切换/day.anim new file mode 100644 index 000000000..e177cd01d --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/day.anim @@ -0,0 +1,81 @@ +%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: day + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 1931711126660797183, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - time: 0.6 + value: {fileID: 557128007507151412, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - time: 1.2 + value: {fileID: 7818624593967659410, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - time: 1.8000001 + value: {fileID: 1931711126660797183, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + attribute: m_Sprite + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + m_SampleRate: 100 + 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: 0 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 1931711126660797183, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - {fileID: 557128007507151412, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - {fileID: 7818624593967659410, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - {fileID: 1931711126660797183, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/RawResources/Art/CG/时间切换/day.anim.meta b/Assets/RawResources/Art/CG/时间切换/day.anim.meta new file mode 100644 index 000000000..3313c3ac7 --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/day.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b9e29c0fb1cb3d64bb1d68822c2462f4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Art/CG/时间切换/evening.anim b/Assets/RawResources/Art/CG/时间切换/evening.anim new file mode 100644 index 000000000..73f6a2a2a --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/evening.anim @@ -0,0 +1,81 @@ +%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: evening + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 368852046130056288, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - time: 0.6 + value: {fileID: 744660647468183574, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - time: 1.2 + value: {fileID: 4510117881843004658, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - time: 1.8000001 + value: {fileID: 368852046130056288, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + attribute: m_Sprite + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + m_SampleRate: 100 + 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: 0 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 368852046130056288, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - {fileID: 744660647468183574, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - {fileID: 4510117881843004658, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - {fileID: 368852046130056288, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/RawResources/Art/CG/时间切换/evening.anim.meta b/Assets/RawResources/Art/CG/时间切换/evening.anim.meta new file mode 100644 index 000000000..d456acbc4 --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/evening.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0f9d5fa77c479b4ca12e78ef1575043 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Art/CG/时间切换/morning.anim b/Assets/RawResources/Art/CG/时间切换/morning.anim new file mode 100644 index 000000000..db6352bce --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/morning.anim @@ -0,0 +1,81 @@ +%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: morning + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -7849584325033050978, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - time: 0.6 + value: {fileID: -5931125750173974104, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - time: 1.2 + value: {fileID: 4575991954449924851, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - time: 1.8000001 + value: {fileID: -7849584325033050978, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + attribute: m_Sprite + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + m_SampleRate: 100 + 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: 0 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -7849584325033050978, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - {fileID: -5931125750173974104, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - {fileID: 4575991954449924851, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - {fileID: -7849584325033050978, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/RawResources/Art/CG/时间切换/morning.anim.meta b/Assets/RawResources/Art/CG/时间切换/morning.anim.meta new file mode 100644 index 000000000..70cece434 --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/morning.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c5151d3aee7e174fb23223fe38d10cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Art/CG/时间切换/night.anim b/Assets/RawResources/Art/CG/时间切换/night.anim new file mode 100644 index 000000000..5e5eaa6c9 --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/night.anim @@ -0,0 +1,81 @@ +%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: night + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1695518933349628278, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - time: 0.6 + value: {fileID: -7557123068265923505, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - time: 1.2 + value: {fileID: 4799320229902462110, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - time: 1.8000001 + value: {fileID: -1695518933349628278, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + attribute: m_Sprite + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + m_SampleRate: 100 + 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: 0 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1695518933349628278, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - {fileID: -7557123068265923505, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - {fileID: 4799320229902462110, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + - {fileID: -1695518933349628278, guid: ad6f826667f95fc4c829acc6adada539, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/RawResources/Art/CG/时间切换/night.anim.meta b/Assets/RawResources/Art/CG/时间切换/night.anim.meta new file mode 100644 index 000000000..fc23199d6 --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/night.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c86c9ee06b41b14499fe4a3d26e706d2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Art/CG/时间切换/时间切换.controller b/Assets/RawResources/Art/CG/时间切换/时间切换.controller new file mode 100644 index 000000000..61fce4747 --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/时间切换.controller @@ -0,0 +1,125 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-7045685338805211133 +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: -611917820797815250} + m_Position: {x: 360, y: 110, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, 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: -611917820797815250} +--- !u!206 &-2191674656697638170 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 3c5151d3aee7e174fb23223fe38d10cd, type: 2} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: b9e29c0fb1cb3d64bb1d68822c2462f4, type: 2} + m_Threshold: 0.33333334 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: e0f9d5fa77c479b4ca12e78ef1575043, type: 2} + m_Threshold: 0.6666667 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: c86c9ee06b41b14499fe4a3d26e706d2, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + m_BlendParameter: TimeState + m_BlendParameterY: Blend + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!1102 &-611917820797815250 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + 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: -2191674656697638170} + 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: "\u65F6\u95F4\u5207\u6362" + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: TimeState + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -7045685338805211133} + 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} diff --git a/Assets/RawResources/Art/CG/时间切换/时间切换.controller.meta b/Assets/RawResources/Art/CG/时间切换/时间切换.controller.meta new file mode 100644 index 000000000..4f68c6666 --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/时间切换.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70b736c8bb25fe248a7c578db2901e15 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Art/CG/时间切换/长焦时间切换.json b/Assets/RawResources/Art/CG/时间切换/长焦时间切换.json new file mode 100644 index 000000000..888eea360 --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/长焦时间切换.json @@ -0,0 +1,149 @@ +{ "frames": { + "长焦时间切换 0.aseprite": { + "frame": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "sourceSize": { "w": 288, "h": 162 }, + "duration": 600 + }, + "长焦时间切换 1.aseprite": { + "frame": { "x": 288, "y": 0, "w": 288, "h": 162 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "sourceSize": { "w": 288, "h": 162 }, + "duration": 600 + }, + "长焦时间切换 2.aseprite": { + "frame": { "x": 576, "y": 0, "w": 288, "h": 162 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "sourceSize": { "w": 288, "h": 162 }, + "duration": 600 + }, + "长焦时间切换 3.aseprite": { + "frame": { "x": 864, "y": 0, "w": 288, "h": 162 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "sourceSize": { "w": 288, "h": 162 }, + "duration": 600 + }, + "长焦时间切换 4.aseprite": { + "frame": { "x": 1152, "y": 0, "w": 288, "h": 162 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "sourceSize": { "w": 288, "h": 162 }, + "duration": 600 + }, + "长焦时间切换 5.aseprite": { + "frame": { "x": 1440, "y": 0, "w": 288, "h": 162 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "sourceSize": { "w": 288, "h": 162 }, + "duration": 600 + }, + "长焦时间切换 6.aseprite": { + "frame": { "x": 1728, "y": 0, "w": 288, "h": 162 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "sourceSize": { "w": 288, "h": 162 }, + "duration": 600 + }, + "长焦时间切换 7.aseprite": { + "frame": { "x": 0, "y": 162, "w": 288, "h": 162 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "sourceSize": { "w": 288, "h": 162 }, + "duration": 600 + }, + "长焦时间切换 8.aseprite": { + "frame": { "x": 288, "y": 162, "w": 288, "h": 162 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "sourceSize": { "w": 288, "h": 162 }, + "duration": 600 + }, + "长焦时间切换 9.aseprite": { + "frame": { "x": 576, "y": 162, "w": 288, "h": 162 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "sourceSize": { "w": 288, "h": 162 }, + "duration": 600 + }, + "长焦时间切换 10.aseprite": { + "frame": { "x": 864, "y": 162, "w": 288, "h": 162 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "sourceSize": { "w": 288, "h": 162 }, + "duration": 600 + }, + "长焦时间切换 11.aseprite": { + "frame": { "x": 1152, "y": 162, "w": 288, "h": 162 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 288, "h": 162 }, + "sourceSize": { "w": 288, "h": 162 }, + "duration": 600 + } + }, + "meta": { + "app": "http://www.aseprite.org/", + "version": "1.2.15-x64", + "image": "长焦时间切换.png", + "format": "RGBA8888", + "size": { "w": 2048, "h": 512 }, + "scale": "1", + "frameTags": [ + { "name": "night", "from": 0, "to": 2, "direction": "forward" }, + { "name": "day", "from": 3, "to": 5, "direction": "forward" }, + { "name": "morning", "from": 6, "to": 8, "direction": "forward" }, + { "name": "evening", "from": 9, "to": 11, "direction": "forward" } + ], + "layers": [ + { "name": "1夕阳A", "group": "夕阳A", "opacity": 255, "blendMode": "normal" }, + { "name": "2夕阳A", "group": "夕阳A", "opacity": 255, "blendMode": "normal" }, + { "name": "3夕阳A", "group": "夕阳A", "opacity": 255, "blendMode": "normal" }, + { "name": "4夕阳A", "group": "夕阳A", "opacity": 255, "blendMode": "normal" }, + { "name": "5夕阳A", "group": "夕阳A", "opacity": 255, "blendMode": "normal" }, + { "name": "6夕阳A", "group": "夕阳A", "opacity": 255, "blendMode": "normal" }, + { "name": "7夕阳A", "group": "夕阳A", "opacity": 255, "blendMode": "normal" }, + { "name": "夕阳A" }, + { "name": "1夕阳or黎明", "group": "夕阳or黎明", "opacity": 255, "blendMode": "normal" }, + { "name": "2夕阳or黎明", "group": "夕阳or黎明", "opacity": 255, "blendMode": "normal" }, + { "name": "3夕阳or黎明", "group": "夕阳or黎明", "opacity": 255, "blendMode": "normal" }, + { "name": "4夕阳or黎明", "group": "夕阳or黎明", "opacity": 255, "blendMode": "normal" }, + { "name": "5夕阳or黎明", "group": "夕阳or黎明", "opacity": 255, "blendMode": "normal" }, + { "name": "6夕阳or黎明", "group": "夕阳or黎明", "opacity": 255, "blendMode": "normal" }, + { "name": "7夕阳or黎明", "group": "夕阳or黎明", "opacity": 255, "blendMode": "normal" }, + { "name": "夕阳or黎明" }, + { "name": "1白天", "group": "白天", "opacity": 255, "blendMode": "normal" }, + { "name": "2白天", "group": "白天", "opacity": 255, "blendMode": "normal" }, + { "name": "3白天", "group": "白天", "opacity": 255, "blendMode": "normal" }, + { "name": "4白天", "group": "白天", "opacity": 255, "blendMode": "normal" }, + { "name": "5白天", "group": "白天", "opacity": 255, "blendMode": "normal" }, + { "name": "6白天", "group": "白天", "opacity": 255, "blendMode": "normal" }, + { "name": "7白天", "group": "白天", "opacity": 255, "blendMode": "normal" }, + { "name": "白天" }, + { "name": "1夜晚", "group": "夜晚", "opacity": 255, "blendMode": "normal" }, + { "name": "2夜晚", "group": "夜晚", "opacity": 255, "blendMode": "normal" }, + { "name": "3夜晚", "group": "夜晚", "opacity": 255, "blendMode": "normal" }, + { "name": "4夜晚", "group": "夜晚", "opacity": 255, "blendMode": "normal" }, + { "name": "5夜晚", "group": "夜晚", "opacity": 255, "blendMode": "normal" }, + { "name": "6夜晚", "group": "夜晚", "opacity": 255, "blendMode": "normal" }, + { "name": "7夜晚", "group": "夜晚", "opacity": 255, "blendMode": "normal" }, + { "name": "夜晚" } + ], + "slices": [ + ] + } +} diff --git a/Assets/Scripts/Clue/Clue.prefab.meta b/Assets/RawResources/Art/CG/时间切换/长焦时间切换.json.meta similarity index 62% rename from Assets/Scripts/Clue/Clue.prefab.meta rename to Assets/RawResources/Art/CG/时间切换/长焦时间切换.json.meta index 5567612cd..f9cbe22f2 100644 --- a/Assets/Scripts/Clue/Clue.prefab.meta +++ b/Assets/RawResources/Art/CG/时间切换/长焦时间切换.json.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 39448b90e97cec44b86e851370a1335b -PrefabImporter: +guid: 27100b8296a6031419fb51548a9791ff +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/RawResources/Art/CG/时间切换/长焦时间切换.png b/Assets/RawResources/Art/CG/时间切换/长焦时间切换.png new file mode 100644 index 000000000..ef8a471ba --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/长焦时间切换.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1816bc7afafeaf5ea77970cbe603dc9dca1c9788a817e97eec0fdb50f1c601a +size 96179 diff --git a/Assets/RawResources/Art/CG/时间切换/长焦时间切换.png.meta b/Assets/RawResources/Art/CG/时间切换/长焦时间切换.png.meta new file mode 100644 index 000000000..7a30da73e --- /dev/null +++ b/Assets/RawResources/Art/CG/时间切换/长焦时间切换.png.meta @@ -0,0 +1,430 @@ +fileFormatVersion: 2 +guid: ad6f826667f95fc4c829acc6adada539 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 20 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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 + - serializedVersion: 3 + buildTarget: Server + 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: + - serializedVersion: 2 + name: "\u957F\u7126\u65F6\u95F4\u5207\u6362 0.aseprite" + rect: + serializedVersion: 2 + x: 0 + y: 350 + width: 288 + height: 162 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9646a1ba338d9884fb9f69ab861e14c8 + internalID: -1695518933349628278 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u957F\u7126\u65F6\u95F4\u5207\u6362 1.aseprite" + rect: + serializedVersion: 2 + x: 288 + y: 350 + width: 288 + height: 162 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b38c17f1734d9ad4ab7c3c041e736929 + internalID: -7557123068265923505 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u957F\u7126\u65F6\u95F4\u5207\u6362 2.aseprite" + rect: + serializedVersion: 2 + x: 576 + y: 350 + width: 288 + height: 162 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 40daf977e01567d40a9536a275df5c60 + internalID: 4799320229902462110 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u957F\u7126\u65F6\u95F4\u5207\u6362 3.aseprite" + rect: + serializedVersion: 2 + x: 864 + y: 350 + width: 288 + height: 162 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 383c5435e0072cb45ba16fe99311469e + internalID: 1931711126660797183 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u957F\u7126\u65F6\u95F4\u5207\u6362 4.aseprite" + rect: + serializedVersion: 2 + x: 1152 + y: 350 + width: 288 + height: 162 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1e60e0a2bea7c904dbf9914fda47fe54 + internalID: 557128007507151412 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u957F\u7126\u65F6\u95F4\u5207\u6362 5.aseprite" + rect: + serializedVersion: 2 + x: 1440 + y: 350 + width: 288 + height: 162 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d27831f8e0536cb47ac0b83c59dc8b49 + internalID: 7818624593967659410 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u957F\u7126\u65F6\u95F4\u5207\u6362 6.aseprite" + rect: + serializedVersion: 2 + x: 1728 + y: 350 + width: 288 + height: 162 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c2541ee863c3b7743a54706a4e89ac9f + internalID: -7849584325033050978 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u957F\u7126\u65F6\u95F4\u5207\u6362 7.aseprite" + rect: + serializedVersion: 2 + x: 0 + y: 188 + width: 288 + height: 162 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2e2c8561f32cebe4d85049d6780f5324 + internalID: -5931125750173974104 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u957F\u7126\u65F6\u95F4\u5207\u6362 8.aseprite" + rect: + serializedVersion: 2 + x: 288 + y: 188 + width: 288 + height: 162 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8fc0b6e950959ec4aa4949caa01015e4 + internalID: 4575991954449924851 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u957F\u7126\u65F6\u95F4\u5207\u6362 9.aseprite" + rect: + serializedVersion: 2 + x: 576 + y: 188 + width: 288 + height: 162 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 752a5aa423aea0f4a84d93690c95a8a9 + internalID: 368852046130056288 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u957F\u7126\u65F6\u95F4\u5207\u6362 10.aseprite" + rect: + serializedVersion: 2 + x: 864 + y: 188 + width: 288 + height: 162 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e0322829aab64fa41b59a8ca8fa68e45 + internalID: 744660647468183574 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u957F\u7126\u65F6\u95F4\u5207\u6362 11.aseprite" + rect: + serializedVersion: 2 + x: 1152 + y: 188 + width: 288 + height: 162 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5126041eeb887d24dad1ffe48a024111 + internalID: 4510117881843004658 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u957F\u7126\u65F6\u95F4\u5207\u6362 0.aseprite": -1695518933349628278 + "\u957F\u7126\u65F6\u95F4\u5207\u6362 1.aseprite": -7557123068265923505 + "\u957F\u7126\u65F6\u95F4\u5207\u6362 10.aseprite": 744660647468183574 + "\u957F\u7126\u65F6\u95F4\u5207\u6362 11.aseprite": 4510117881843004658 + "\u957F\u7126\u65F6\u95F4\u5207\u6362 2.aseprite": 4799320229902462110 + "\u957F\u7126\u65F6\u95F4\u5207\u6362 3.aseprite": 1931711126660797183 + "\u957F\u7126\u65F6\u95F4\u5207\u6362 4.aseprite": 557128007507151412 + "\u957F\u7126\u65F6\u95F4\u5207\u6362 5.aseprite": 7818624593967659410 + "\u957F\u7126\u65F6\u95F4\u5207\u6362 6.aseprite": -7849584325033050978 + "\u957F\u7126\u65F6\u95F4\u5207\u6362 7.aseprite": -5931125750173974104 + "\u957F\u7126\u65F6\u95F4\u5207\u6362 8.aseprite": 4575991954449924851 + "\u957F\u7126\u65F6\u95F4\u5207\u6362 9.aseprite": 368852046130056288 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index da3f0f738..ee15263ea 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -5660,6 +5660,7 @@ RectTransform: - {fileID: 927888434} - {fileID: 773911910} - {fileID: 237007960} + - {fileID: 2091099326} m_Father: {fileID: 2091451641} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -5887,6 +5888,103 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bd2f44edfbd942b49bb7a37f80d7a5eb, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &319430488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 319430489} + - component: {fileID: 319430492} + - component: {fileID: 319430491} + - component: {fileID: 319430490} + m_Layer: 5 + m_Name: "\u7ED3\u675F\u65F6\u95F4" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &319430489 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 319430488} + 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: 2091099326} + 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: 1440, y: 810} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &319430490 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 319430488} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 70b736c8bb25fe248a7c578db2901e15, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &319430491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 319430488} + 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: 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 &319430492 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 319430488} + m_CullTransparentMesh: 1 --- !u!1 &328282763 GameObject: m_ObjectHideFlags: 0 @@ -11212,6 +11310,103 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 651726652} m_CullTransparentMesh: 1 +--- !u!1 &672000072 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 672000073} + - component: {fileID: 672000076} + - component: {fileID: 672000075} + - component: {fileID: 672000074} + m_Layer: 5 + m_Name: "\u8D77\u59CB\u65F6\u95F4" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &672000073 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672000072} + 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: 2091099326} + 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: 1440, y: 810} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &672000074 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672000072} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 70b736c8bb25fe248a7c578db2901e15, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &672000075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672000072} + 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: 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 &672000076 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672000072} + m_CullTransparentMesh: 1 --- !u!224 &673669948 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 414774860242993632, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} @@ -29716,6 +29911,75 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2089816827} m_CullTransparentMesh: 1 +--- !u!1 &2091099325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2091099326} + - component: {fileID: 2091099328} + - component: {fileID: 2091099327} + m_Layer: 5 + m_Name: Time Transition + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2091099326 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2091099325} + 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: 319430489} + - {fileID: 672000073} + m_Father: {fileID: 300534481} + 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!225 &2091099327 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2091099325} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &2091099328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2091099325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7e5f2e6362ee0647b133fa6eb0b2bc3, type: 3} + m_Name: + m_EditorClassIdentifier: + targetAnimator: {fileID: 319430490} + originAnimator: {fileID: 672000074} + canvasGroup: {fileID: 2091099327} + fadeTime: 2 + holdTime: 1.5 + inoutTime: 0.5 --- !u!1 &2091451637 GameObject: m_ObjectHideFlags: 0 @@ -55218,6 +55482,10 @@ PrefabInstance: propertyPath: m_Name value: Favorites objectReference: {fileID: 0} + - target: {fileID: 4040749114382236603, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4947548532371034966, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} propertyPath: m_Sprite value: @@ -55236,7 +55504,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6036241349967455381, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7117798419024193216, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/Scenes/动画测试.unity b/Assets/Scenes/动画测试.unity index 4ef8828f2..79116d786 100644 --- a/Assets/Scenes/动画测试.unity +++ b/Assets/Scenes/动画测试.unity @@ -123,181 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &264892729 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 264892730} - m_Layer: 0 - m_Name: Slots - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &264892730 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 264892729} - serializedVersion: 2 - 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: 1693830861} - m_Father: {fileID: 1618964975} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &319206166 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 319206167} - m_Layer: 0 - m_Name: ActorRoot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &319206167 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 319206166} - serializedVersion: 2 - 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: 1618964975} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1618964974 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1618964975} - - component: {fileID: 1618964976} - - component: {fileID: 1618964977} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1618964975 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618964974} - serializedVersion: 2 - 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: 264892730} - - {fileID: 319206167} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1618964976 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618964974} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3700d4c1c99441a7979e423de3700aad, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1618964977 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618964974} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ad8285f6dc2406249bd2c4be2571999d, type: 3} - m_Name: - m_EditorClassIdentifier: - testActorName: "\u8C03\u9152\u59B9\u6D4B\u8BD5" - testSlotName: "\u6D4B\u8BD5" - showHelp: 1 ---- !u!1 &1693830860 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1693830861} - - component: {fileID: 1693830862} - m_Layer: 0 - m_Name: "\u5427\u53F0\u5DE6\u4FA7" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1693830861 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693830860} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.7441864, y: -5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 264892730} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1693830862 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693830860} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1988b7c536404a3d89fd441651bd40ea, type: 3} - m_Name: - m_EditorClassIdentifier: - slotName: "\u6D4B\u8BD5" - sortingLayer: 0 - sortingOrder: 11 - hasDefaultActor: 0 - defaultActorType: 0 - defaultActorName: --- !u!1 &1704186012 GameObject: m_ObjectHideFlags: 0 @@ -435,9 +260,178 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 +--- !u!1 &272991492081474684 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2843127191470731710} + - component: {fileID: 818781385789349401} + m_Layer: 0 + m_Name: "\u6563\u70ED\u6761" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &818781385789349401 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 272991492081474684} + 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: 68be8df20be94e145a988ffd28471dbc, 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: 941243827 + m_SortingLayer: 13 + m_SortingOrder: 22 + m_Sprite: {fileID: 5951678037050918710, guid: 55cd0936d4127454daab7f6f9ed577d6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.604651, y: 1.0697675} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!212 &1465959569886126184 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1603604610868569386} + 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: a97c105638bdf8b4a8650670310a4cd3, 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 29 + m_Sprite: {fileID: 5951678037050918710, guid: 55cd0936d4127454daab7f6f9ed577d6, 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.372093, y: 3.5813954} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1603604610868569386 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3962550709504959177} + - component: {fileID: 1465959569886126184} + m_Layer: 0 + m_Name: "\u8FDB\u6C14\u7CFB\u7EDF_1" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2843127191470731710 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 272991492081474684} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.4100006, y: -1.3649998, z: 0} + 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!4 &3962550709504959177 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1603604610868569386} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.43, y: 0.22, z: 0} + 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!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1704186015} - - {fileID: 1618964975} + - {fileID: 3962550709504959177} + - {fileID: 2843127191470731710} diff --git a/Assets/Scripts/Clue/Clue.prefab b/Assets/Scripts/Clue/Clue.prefab deleted file mode 100644 index c83427132..000000000 --- a/Assets/Scripts/Clue/Clue.prefab +++ /dev/null @@ -1,425 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1239992625708463932 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8979978761608158211} - - component: {fileID: 3102909921202409320} - - component: {fileID: 2418256019729501183} - m_Layer: 5 - m_Name: tapeImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8979978761608158211 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239992625708463932} - 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: 5654435520340008870} - - {fileID: 2478567823517841785} - m_Father: {fileID: 1082758174103785188} - 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: 500, y: 200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3102909921202409320 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239992625708463932} - m_CullTransparentMesh: 1 ---- !u!114 &2418256019729501183 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239992625708463932} - 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: 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!1 &4771150320465409425 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5654435520340008870} - - component: {fileID: 5028417658404604514} - - component: {fileID: 9063892309565505720} - m_Layer: 5 - m_Name: Name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5654435520340008870 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4771150320465409425} - 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: 8979978761608158211} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 100, y: 43} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5028417658404604514 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4771150320465409425} - m_CullTransparentMesh: 1 ---- !u!114 &9063892309565505720 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4771150320465409425} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6285052556030698184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1082758174103785188} - - component: {fileID: 667495066540441723} - - component: {fileID: 4617005232398659396} - - component: {fileID: -187472991724126242} - m_Layer: 5 - m_Name: Clue - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1082758174103785188 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6285052556030698184} - 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: 8979978761608158211} - 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!114 &667495066540441723 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6285052556030698184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d792e0af9bafc174d8a2566cf81b2c6a, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4617005232398659396 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6285052556030698184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d5f46e915536ee40a8c605a443e9584, type: 3} - m_Name: - m_EditorClassIdentifier: - clueImageUI: {fileID: 0} - categoryText: {fileID: 7996457287399970462} - nameText: {fileID: 9063892309565505720} ---- !u!225 &-187472991724126242 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6285052556030698184} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &8357767152308717046 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2478567823517841785} - - component: {fileID: 2670877364425164846} - - component: {fileID: 7996457287399970462} - m_Layer: 5 - m_Name: Soruce - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2478567823517841785 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8357767152308717046} - 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: 8979978761608158211} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 100, y: -32} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2670877364425164846 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8357767152308717046} - m_CullTransparentMesh: 1 ---- !u!114 &7996457287399970462 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8357767152308717046} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Scripts/Dialog System/BaseYarnCommand.cs b/Assets/Scripts/Dialog System/BaseYarnCommand.cs index d98534902..cd13630ac 100644 --- a/Assets/Scripts/Dialog System/BaseYarnCommand.cs +++ b/Assets/Scripts/Dialog System/BaseYarnCommand.cs @@ -182,6 +182,13 @@ namespace AibisDream panel.CloseSignBoard(); } + [YarnCommand("time_flows_on")] + public static IEnumerator TimeFlowsOn(string originState, string targetState) + { + var panel = UIManager.Instance.GetPanel(); + return panel.TimeFlowsOn(originState, targetState); + } + #endregion } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Panel/PlayTool.meta b/Assets/Scripts/UI/Panel/PlayTool.meta new file mode 100644 index 000000000..29cf937e3 --- /dev/null +++ b/Assets/Scripts/UI/Panel/PlayTool.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18afdd8f7574fac41954f72a3d6c79ea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Panel/PlayTool/TimeTurner.cs b/Assets/Scripts/UI/Panel/PlayTool/TimeTurner.cs new file mode 100644 index 000000000..260430db6 --- /dev/null +++ b/Assets/Scripts/UI/Panel/PlayTool/TimeTurner.cs @@ -0,0 +1,69 @@ +using UnityEngine; +using System.Collections; +using DG.Tweening; +using UnityEngine.UI; + +namespace AibisDream.UI +{ + public class TimeTurner : MonoBehaviour + { + [Header("索引")] + [SerializeField] private Animator targetAnimator; + [SerializeField] private Animator originAnimator; + [SerializeField] private CanvasGroup canvasGroup; + + [Header("参数")] + [SerializeField] private float fadeTime = 2f; + [SerializeField] private float holdTime = 1f; + [SerializeField] private float inoutTime = 0.5f; + + public IEnumerator TurnTimeTo(string originState, string targetState) + { + var originImage = originAnimator.GetComponent(); + // 设置起始状态 + float originParam = StateToParam(originState); + float targetParam = StateToParam(targetState); + + targetAnimator.SetFloat("TimeState", targetParam); + originAnimator.SetFloat("TimeState", originParam); + + canvasGroup.alpha = 0; + originImage.color = Color.white; + targetAnimator.gameObject.SetActive(true); + originAnimator.gameObject.SetActive(true); + + // 淡入 + yield return canvasGroup.DOFade(1, inoutTime).WaitForCompletion();; + // 等待静止时间 + yield return new WaitForSeconds(holdTime); + + // 淡出起始状态 + yield return originAnimator.GetComponent().DOFade(0, fadeTime).WaitForCompletion(); + + // 等待静止时间 + yield return new WaitForSeconds(holdTime); + // 淡出 + yield return canvasGroup.DOFade(0, inoutTime).WaitForCompletion(); + + targetAnimator.gameObject.SetActive(false); + originAnimator.gameObject.SetActive(false); + } + + private float StateToParam(string stateName) + { + switch (stateName.ToLower()) + { + case "morning": + return 0; + case "day": + return 0.33f; + case "evening": + return 0.66f; + case "night": + return 1; + default: + throw new System.Exception($"Invalid state name: {stateName}"); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Panel/PlayTool/TimeTurner.cs.meta b/Assets/Scripts/UI/Panel/PlayTool/TimeTurner.cs.meta new file mode 100644 index 000000000..627abd33b --- /dev/null +++ b/Assets/Scripts/UI/Panel/PlayTool/TimeTurner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e7e5f2e6362ee0647b133fa6eb0b2bc3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Panel/PlayToolPanel.cs b/Assets/Scripts/UI/Panel/PlayToolPanel.cs index 468c7b724..f3011f503 100644 --- a/Assets/Scripts/UI/Panel/PlayToolPanel.cs +++ b/Assets/Scripts/UI/Panel/PlayToolPanel.cs @@ -29,6 +29,7 @@ namespace AibisDream.UI private ModalWindowProgressBar _window; private ModalWindow _warningWindow; private SignBoard _signBoard; + private TimeTurner _timeTurner; #endregion @@ -48,6 +49,7 @@ namespace AibisDream.UI _redFlash = transform.Find("Red Flash").GetComponent(); _warningWindow = transform.Find("警告窗口").GetComponent(); _signBoard = transform.GetComponentInChildren(); + _timeTurner = transform.GetComponentInChildren(); } public IEnumerator FadeInAsync(float duration = 1) @@ -184,6 +186,17 @@ namespace AibisDream.UI _showObjPanel.SetActive(false); } + // ------------------------------- 时间流转 ------------------------------- + public IEnumerator TimeFlowsOn(string originState, string targetState) + { + // 黑屏淡入 + yield return _fadeImage.FadeInAsync(1); + // 时间流转 + yield return _timeTurner.TurnTimeTo(originState, targetState); + // 黑屏淡出 + yield return _fadeImage.FadeOutAsync(1); + } + #region 感觉这个面板应该常驻 public void Show() diff --git a/Assets/Shader/Material/Glow.mat b/Assets/Shader/Material/Graph Test.mat similarity index 57% rename from Assets/Shader/Material/Glow.mat rename to Assets/Shader/Material/Graph Test.mat index 6e50795a7..7050436ed 100644 --- a/Assets/Shader/Material/Glow.mat +++ b/Assets/Shader/Material/Graph Test.mat @@ -7,8 +7,8 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Glow - m_Shader: {fileID: 4800000, guid: b0bd1ee8b33058241997d11113fc44e9, type: 3} + m_Name: Graph Test + m_Shader: {fileID: -6465566751694194690, guid: 2714a01ce30569c4caacdf75b5c5fd8a, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -39,23 +39,38 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _ColorMask: 15 + - _Alpha: 1 - _EnableExternalAlpha: 0 - - _OffsetScale: 1.5 - - _Opacity: 0.269 - - _Range: 0.806 - - _ReadMask: 255 - - _Size: 11.09 - - _Spread: 0.727 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _WriteMask: 255 m_Colors: + - _Base_Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _GlowColor: {r: 0, g: 0.8, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!114 &2866685674835353830 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/Shader/Material/Glow.mat.meta b/Assets/Shader/Material/Graph Test.mat.meta similarity index 79% rename from Assets/Shader/Material/Glow.mat.meta rename to Assets/Shader/Material/Graph Test.mat.meta index e112db92f..a9858bb75 100644 --- a/Assets/Shader/Material/Glow.mat.meta +++ b/Assets/Shader/Material/Graph Test.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 59a6c85d502fc92409cf316395722b46 +guid: 68be8df20be94e145a988ffd28471dbc NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Shader/Shader/Graph Test.shadergraph b/Assets/Shader/Shader/Graph Test.shadergraph new file mode 100644 index 000000000..bb5bdc430 --- /dev/null +++ b/Assets/Shader/Shader/Graph Test.shadergraph @@ -0,0 +1,1078 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "c9e00573a1464c4d9a8a0628d7a37bc4", + "m_Properties": [ + { + "m_Id": "1381d7ff7b0f4d39b5b1e0f2789f8bd9" + }, + { + "m_Id": "815d77a2b0a84795b91943d33e44be96" + }, + { + "m_Id": "57df81b91a0c497db49bbc53d3f365d1" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "b38e64d4570a428fb193c01cd14a4d7f" + } + ], + "m_Nodes": [ + { + "m_Id": "af8b552edea34e6d8a1e8bae0c7b9d03" + }, + { + "m_Id": "3d41c11a6837434aa7a6b9a86512d44a" + }, + { + "m_Id": "65ce6a55d1ca432194d196b6a71c0316" + }, + { + "m_Id": "4026d6172a9e40c38cd4418adfbc0c14" + }, + { + "m_Id": "d1682abde8f9488695a652e42000db0c" + }, + { + "m_Id": "0208d6dbd72c4bcf9fa91653c984b8bd" + }, + { + "m_Id": "ef21f8b213fa44d7930d8030d391b800" + }, + { + "m_Id": "f0d8dafdc0514e32b436c3d738048722" + }, + { + "m_Id": "ff54c9c257f84a6d99862138bff3c4df" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "0208d6dbd72c4bcf9fa91653c984b8bd" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "d1682abde8f9488695a652e42000db0c" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d1682abde8f9488695a652e42000db0c" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f0d8dafdc0514e32b436c3d738048722" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f0d8dafdc0514e32b436c3d738048722" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4026d6172a9e40c38cd4418adfbc0c14" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ff54c9c257f84a6d99862138bff3c4df" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f0d8dafdc0514e32b436c3d738048722" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [ + { + "m_Id": "af8b552edea34e6d8a1e8bae0c7b9d03" + }, + { + "m_Id": "3d41c11a6837434aa7a6b9a86512d44a" + }, + { + "m_Id": "65ce6a55d1ca432194d196b6a71c0316" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 218.0 + }, + "m_Blocks": [ + { + "m_Id": "4026d6172a9e40c38cd4418adfbc0c14" + }, + { + "m_Id": "ef21f8b213fa44d7930d8030d391b800" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_ActiveTargets": [ + { + "m_Id": "3c8680f5187f42fc9023c3caa2896071" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "0208d6dbd72c4bcf9fa91653c984b8bd", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -853.3333129882813, + "y": 348.66668701171877, + "width": 130.0, + "height": 36.0 + } + }, + "m_Slots": [ + { + "m_Id": "4b6c83ba8bbd4728a98c9e3b2c379cae" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "815d77a2b0a84795b91943d33e44be96" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0a90bac56966444993a4375c46b59aa5", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "1316274c2ec14985a7f599acac094794", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "1381d7ff7b0f4d39b5b1e0f2789f8bd9", + "m_Guid": { + "m_GuidSerialized": "a118ac2e-fc08-46fa-8c74-e59438626042" + }, + "m_Name": "Base Color", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Base Color", + "m_DefaultReferenceName": "_Base_Color", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 2, + "m_Hidden": false, + "m_Value": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "19239f82f584487d91439ec863c513a0", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "1a450c203202498eaf4cc8f26ea4ffcc", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "20f5b5da141a43cfbfdc06424c5de338", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "3c8680f5187f42fc9023c3caa2896071", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "dc594225d52e43aeb38b87ea27a5c4b4" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "3d41c11a6837434aa7a6b9a86512d44a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "4c678c8b1b6f41608d1880a44acf7dc2" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "4026d6172a9e40c38cd4418adfbc0c14", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 10.0, + "y": 260.0, + "width": 200.0, + "height": 42.66668701171875 + } + }, + "m_Slots": [ + { + "m_Id": "c6c16e62cf4a4c2bbbd00aef9ff25b57" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "4b6c83ba8bbd4728a98c9e3b2c379cae", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "4c678c8b1b6f41608d1880a44acf7dc2", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "4c88bd60be8743dba7dfeecf89b02e30", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "570b65d8f37545728f67334710881de8", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "57df81b91a0c497db49bbc53d3f365d1", + "m_Guid": { + "m_GuidSerialized": "0d852b73-2704-4b14-a101-387c0587a682" + }, + "m_Name": "Alpha", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Alpha", + "m_DefaultReferenceName": "_Alpha", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "65ce6a55d1ca432194d196b6a71c0316", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "1a450c203202498eaf4cc8f26ea4ffcc" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "815d77a2b0a84795b91943d33e44be96", + "m_Guid": { + "m_GuidSerialized": "e55ba3bc-0cd4-4e00-842c-f35840a0a007" + }, + "m_Name": "MainTex", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "MainTex", + "m_DefaultReferenceName": "_MainTex", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "8b250a03ea9b4988a6b501c454730673", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "924de5637076436eaeafe8a2968e3c84", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "92b7002a092941538df3dde48628a2bf", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "953c1a28ced7445ebebf589aae6505ec", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "af8b552edea34e6d8a1e8bae0c7b9d03", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "4c88bd60be8743dba7dfeecf89b02e30" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "b00fb966e7f04253a4edbe48fef1ccd0", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "b38e64d4570a428fb193c01cd14a4d7f", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "1381d7ff7b0f4d39b5b1e0f2789f8bd9" + }, + { + "m_Id": "815d77a2b0a84795b91943d33e44be96" + }, + { + "m_Id": "57df81b91a0c497db49bbc53d3f365d1" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "c148c8b8ed9f486ba1c17b112c5c8730", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "c6c16e62cf4a4c2bbbd00aef9ff25b57", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.6132075786590576, + "y": 0.16583596169948579, + "z": 0.16583596169948579 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "d1682abde8f9488695a652e42000db0c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -634.6666870117188, + "y": 320.66668701171877, + "width": 209.3333740234375, + "height": 438.66668701171877 + } + }, + "m_Slots": [ + { + "m_Id": "b00fb966e7f04253a4edbe48fef1ccd0" + }, + { + "m_Id": "953c1a28ced7445ebebf589aae6505ec" + }, + { + "m_Id": "0a90bac56966444993a4375c46b59aa5" + }, + { + "m_Id": "1316274c2ec14985a7f599acac094794" + }, + { + "m_Id": "f3022f279da441edae2268dc9094e1a3" + }, + { + "m_Id": "c148c8b8ed9f486ba1c17b112c5c8730" + }, + { + "m_Id": "19239f82f584487d91439ec863c513a0" + }, + { + "m_Id": "8b250a03ea9b4988a6b501c454730673" + } + ], + "synonyms": [ + "tex2d" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 0, + "m_NormalMapSpace": 1, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "d17172b29a1248258b3eaec6b622b07d", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalSpriteUnlitSubTarget", + "m_ObjectId": "dc594225d52e43aeb38b87ea27a5c4b4" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "ef21f8b213fa44d7930d8030d391b800", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "20f5b5da141a43cfbfdc06424c5de338" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "f0d8dafdc0514e32b436c3d738048722", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -344.66668701171877, + "y": 196.66664123535157, + "width": 209.3333740234375, + "height": 304.0 + } + }, + "m_Slots": [ + { + "m_Id": "570b65d8f37545728f67334710881de8" + }, + { + "m_Id": "d17172b29a1248258b3eaec6b622b07d" + }, + { + "m_Id": "924de5637076436eaeafe8a2968e3c84" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f3022f279da441edae2268dc9094e1a3", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "ff54c9c257f84a6d99862138bff3c4df", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -613.3333129882813, + "y": 74.33332824707031, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "92b7002a092941538df3dde48628a2bf" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "1381d7ff7b0f4d39b5b1e0f2789f8bd9" + } +} + diff --git a/Assets/Shader/Shader/Graph Test.shadergraph.meta b/Assets/Shader/Shader/Graph Test.shadergraph.meta new file mode 100644 index 000000000..497203a39 --- /dev/null +++ b/Assets/Shader/Shader/Graph Test.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2714a01ce30569c4caacdf75b5c5fd8a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/Shader/Shader/PhotoshopGlow_Mipmap.shader b/Assets/Shader/Shader/PhotoshopGlow_Mipmap.shader deleted file mode 100644 index 3142bc468..000000000 --- a/Assets/Shader/Shader/PhotoshopGlow_Mipmap.shader +++ /dev/null @@ -1,189 +0,0 @@ -Shader "Custom/PhotoshopGlow_Mipmap" -{ - Properties - { - [Header(General)] - [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} - _Color ("Tint", Color) = (1,1,1,1) - - [Header(Glow Settings)] - [HDR] _GlowColor ("Glow Color", Color) = (0, 0.8, 1, 1) - _Opacity ("Opacity (不透明度)", Range(0, 1)) = 1.0 - - // 核心参数 - _Size ("Size (大小/模糊度)", Range(0, 20)) = 5.0 - _Spread ("Spread (扩展/硬度)", Range(0, 1)) = 0.2 - _Range ("Range (等高线范围)", Range(0.1, 1.5)) = 0.6 - - // 性能微调：控制采样距离的倍率 - _OffsetScale ("Blur Offset Scale", Float) = 1.5 - - // UI Mask 支持 - [HideInInspector] _StencilComp ("Stencil Comparison", Float) = 8 - [HideInInspector] _Stencil ("Stencil ID", Float) = 0 - [HideInInspector] _StencilOp ("Stencil Operation", Float) = 0 - [HideInInspector] _WriteMask ("Stencil Write Mask", Float) = 255 - [HideInInspector] _ReadMask ("Stencil Read Mask", Float) = 255 - [HideInInspector] _ColorMask ("Color Mask", Float) = 15 - } - - SubShader - { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - "PreviewType"="Plane" - "CanUseSpriteAtlas"="True" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_ReadMask] - WriteMask [_WriteMask] - } - - Cull Off - Lighting Off - ZWrite Off - Blend SrcAlpha OneMinusSrcAlpha - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma target 3.0 // 必须使用 Target 3.0+ 以支持 tex2Dlod - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - - struct appdata_t - { - float4 vertex : POSITION; - float4 color : COLOR; - float2 texcoord : TEXCOORD0; - }; - - struct v2f - { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - float4 worldPosition : TEXCOORD1; - }; - - sampler2D _MainTex; - float4 _MainTex_ST; - float4 _MainTex_TexelSize; // xy = 1/size, zw = size - - fixed4 _Color; - fixed4 _GlowColor; - float _Opacity; - float _Size; - float _Spread; - float _Range; - float _OffsetScale; - - v2f vert(appdata_t IN) - { - v2f OUT; - OUT.worldPosition = IN.vertex; - OUT.vertex = UnityObjectToClipPos(OUT.worldPosition); - OUT.texcoord = TRANSFORM_TEX(IN.texcoord, _MainTex); - OUT.color = IN.color * _Color; - return OUT; - } - - // --- 核心逻辑 --- - // 获取基于 Mipmap 的模糊 Alpha - float GetMipmapGlowAlpha(float2 uv) - { - // 1. 计算要使用的 Mipmap 层级 - // _Size 越大，我们采样的层级越高 (图像越小越模糊) - // log2 是为了让线性参数对应层级的指数变化 - float level = min(_Size * 0.5, 7.0); - - // 2. 计算偏移量 - // 随着层级升高，像素变大，我们需要更宽的采样距离来混合 - // _MainTex_TexelSize.xy 是原始像素大小 - // pow(2, level) 估算了当前层级的像素相对于原图放大了多少倍 - float pixelScale = pow(2.0, level); - float2 offset = _MainTex_TexelSize.xy * pixelScale * _OffsetScale; - - // 3. 5点采样法 (中心 + X型偏移) - // tex2Dlod 的第四个参数格式为 float4(uv.x, uv.y, 0, lod_level) - float a = 0; - - // 中心点 (权重最高) - a += tex2Dlod(_MainTex, float4(uv, 0, level)).a * 0.4; - - // 四个角 (用于抹平 Mipmap 的块状锯齿) - a += tex2Dlod(_MainTex, float4(uv + float2( offset.x, offset.y), 0, level)).a * 0.15; - a += tex2Dlod(_MainTex, float4(uv + float2(-offset.x, -offset.y), 0, level)).a * 0.15; - a += tex2Dlod(_MainTex, float4(uv + float2(-offset.x, offset.y), 0, level)).a * 0.15; - a += tex2Dlod(_MainTex, float4(uv + float2( offset.x, -offset.y), 0, level)).a * 0.15; - - return a; - } - - fixed4 frag(v2f IN) : SV_Target - { - // 1. 获取原图 (LOD 0) - fixed4 mainColor = tex2D(_MainTex, IN.texcoord) * IN.color; - - // 2. 如果 Size 很小，直接跳过计算优化性能 - float glowAlpha = 0; - if (_Size > 0.1) - { - glowAlpha = GetMipmapGlowAlpha(IN.texcoord); - } - else - { - glowAlpha = mainColor.a; - } - - // 3. 应用 Spread (扩展/阈值增益) - // 算法：将 alpha 值推向 1.0 - // 修正公式：Alpha / (1 - Spread) - float spreadFactor = max(1.0 - _Spread, 0.001); - glowAlpha = saturate(glowAlpha / spreadFactor); - - // 4. 应用 Range (等高线/Gamma校正) - // 调整光晕的衰减曲线 - float rangePower = 1.0 / max(_Range, 0.01); - glowAlpha = pow(glowAlpha, rangePower); - - // 5. 应用全局不透明度 - glowAlpha *= _Opacity; - - // 6. 合成 - // 逻辑：外发光应该位于原图下方 - // 如果原图有像素，显示原图；原图透明处，显示发光 - fixed4 glowOutput = _GlowColor; - glowOutput.a = glowAlpha; - - fixed4 finalColor; - - // 预乘混合逻辑： - // 最终RGB = 原图RGB + 发光RGB * (1 - 原图Alpha) - finalColor.rgb = mainColor.rgb * mainColor.a + glowOutput.rgb * glowOutput.a * (1.0 - mainColor.a); - - // 最终Alpha = max(原图Alpha, 发光Alpha) - finalColor.a = max(mainColor.a, glowOutput.a); - - // UI Mask 裁剪支持 - #ifdef UNITY_UI_CLIP_RECT - finalColor.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect); - #endif - - return finalColor; - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Shader/Shader/PhotoshopGlow_Mipmap.shader.meta b/Assets/Shader/Shader/PhotoshopGlow_Mipmap.shader.meta deleted file mode 100644 index bc0aa8565..000000000 --- a/Assets/Shader/Shader/PhotoshopGlow_Mipmap.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: b0bd1ee8b33058241997d11113fc44e9 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: