diff --git a/Assets/RawResources/Art/切除三个模块.psb.meta b/Assets/RawResources/Art/切除三个模块.psb.meta index 83c9979bc..41c31bb60 100644 --- a/Assets/RawResources/Art/切除三个模块.psb.meta +++ b/Assets/RawResources/Art/切除三个模块.psb.meta @@ -109,10 +109,48 @@ ScriptedImporter: spriteBone: [] spriteOutline: [] vertices: [] - spritePhysicsOutline: [] + spritePhysicsOutline: + - outline: + - {x: 318, y: -256} + - {x: 374, y: -200} + - {x: 378, y: -200} + - {x: 410, y: -168} + - {x: 414, y: -160} + - {x: 454, y: -160} + - {x: 462, y: -156} + - {x: 466, y: -144} + - {x: 466, y: 160} + - {x: 458, y: 180} + - {x: 450, y: 188} + - {x: 406, y: 192} + - {x: 394, y: 204} + - {x: 390, y: 204} + - {x: 294, y: 300} + - {x: 262, y: 328} + - {x: -290, y: 328} + - {x: -322, y: 312} + - {x: -330, y: 300} + - {x: -330, y: 259.5} + - {x: -373, y: 258.5} + - {x: -398, y: 252} + - {x: -402, y: 244} + - {x: -466, y: 244} + - {x: -474, y: 236} + - {x: -474, y: -236} + - {x: -466, y: -244} + - {x: -450, y: -252} + - {x: -394, y: -252} + - {x: -366, y: -284} + - {x: -354, y: -296} + - {x: -346, y: -296} + - {x: -330, y: -316} + - {x: -318, y: -320} + - {x: 250, y: -320} + - {x: 262, y: -316} + - {x: 318, y: -260} indices: edges: [] - tessellationDetail: 0 + tessellationDetail: 0.8 uvTransform: {x: 1218, y: 4340} spritePosition: {x: 2750, y: 572} - name: "\u60C5\u7EEA\u6A21\u5757 " @@ -130,10 +168,57 @@ ScriptedImporter: spriteBone: [] spriteOutline: [] vertices: [] - spritePhysicsOutline: [] + spritePhysicsOutline: + - outline: + - {x: 372, y: -282} + - {x: 348, y: -242} + - {x: 324, y: -206} + - {x: 388, y: -206} + - {x: 404, y: -190} + - {x: 400, y: -182} + - {x: 400, y: 238} + - {x: 408, y: 242} + - {x: 408, y: 258} + - {x: 404, y: 270} + - {x: 304, y: 366} + - {x: 256, y: 406} + - {x: 232, y: 410} + - {x: 188, y: 386} + - {x: 164, y: 370} + - {x: 152, y: 386} + - {x: 24, y: 386} + - {x: 20, y: 382} + - {x: -352, y: 382} + - {x: -364, y: 378} + - {x: -388, y: 350} + - {x: -388, y: 290} + - {x: -380, y: 238} + - {x: -392, y: 234} + - {x: -396, y: 170} + - {x: -392, y: 134} + - {x: -416, y: 98} + - {x: -416, y: -150} + - {x: -412, y: -166} + - {x: -372, y: -210} + - {x: -368, y: -242} + - {x: -336, y: -306} + - {x: -316, y: -326} + - {x: -296, y: -334} + - {x: -96, y: -334} + - {x: -64, y: -330} + - {x: -52, y: -318} + - {x: -52, y: -290} + - {x: 68.5, y: -290.5} + - {x: 68, y: -374} + - {x: 92, y: -398} + - {x: 128, y: -402} + - {x: 252, y: -402} + - {x: 312, y: -366} + - {x: 340, y: -338} + - {x: 368, y: -302} indices: edges: [] - tessellationDetail: 0 + tessellationDetail: 0.5 uvTransform: {x: 4, y: 5144} spritePosition: {x: 272, y: 466} - name: "\u8BB0\u5FC6\u6A21\u5757" @@ -151,10 +236,43 @@ ScriptedImporter: spriteBone: [] spriteOutline: [] vertices: [] - spritePhysicsOutline: [] + spritePhysicsOutline: + - outline: + - {x: 552, y: -210} + - {x: 572, y: -162} + - {x: 584, y: -118} + - {x: 588, y: -94} + - {x: 588, y: 74} + - {x: 592, y: 82} + - {x: 564, y: 194} + - {x: 540, y: 234} + - {x: 500, y: 298} + - {x: 472, y: 330} + - {x: 444, y: 350} + - {x: 376, y: 390} + - {x: 360, y: 394} + - {x: -176, y: 394} + - {x: -188, y: 386} + - {x: -240, y: 314} + - {x: -236, y: 82} + - {x: -240, y: 78} + - {x: -244, y: 38} + - {x: -264, y: 18} + - {x: -556, y: 18} + - {x: -596, y: -18} + - {x: -600, y: -30} + - {x: -600, y: -342} + - {x: -576, y: -370} + - {x: -548, y: -382} + - {x: -136, y: -382} + - {x: -132, y: -386} + - {x: 356, y: -386} + - {x: 392, y: -378} + - {x: 444, y: -342} + - {x: 520, y: -262} indices: edges: [] - tessellationDetail: 0 + tessellationDetail: 0.5 uvTransform: {x: 4, y: 4340} spritePosition: {x: 1152, y: 835} - name: "\u5934\u90E8" @@ -281,7 +399,7 @@ ScriptedImporter: documentAlignment: 7 importHiddenLayers: 0 layerMappingOption: 2 - generatePhysicsShape: 1 + generatePhysicsShape: 0 paperDollMode: 0 keepDupilcateSpriteName: 1 skeletonAssetReferenceID: diff --git a/Assets/Scenes/OpenFixScene.unity b/Assets/Scenes/OpenFixScene.unity index f011a282e..5b55f0139 100644 --- a/Assets/Scenes/OpenFixScene.unity +++ b/Assets/Scenes/OpenFixScene.unity @@ -356,13 +356,9 @@ MonoBehaviour: deepInClock: {fileID: 1426096886} fadeInPlayable: {fileID: 66799945} fadeInAnima: {fileID: 208159566} - deepIn: {fileID: 1596144633} + deepIn: {fileID: 0} lightRoom: {fileID: 511308398} screen: {fileID: 1330982894} - cuttingManager: {fileID: 0} - cutEmoSpriteRenderer: {fileID: 0} - cutMemorySpriteRenderer: {fileID: 0} - cutLogicSpriteRenderer: {fileID: 0} --- !u!320 &66799945 PlayableDirector: m_ObjectHideFlags: 0 @@ -391,13 +387,12 @@ Transform: m_GameObject: {fileID: 66799943} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 22.12, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 208159569} - {fileID: 511308397} - - {fileID: 1596144635} - {fileID: 1426096887} - {fileID: 1330982895} - {fileID: 1485531489} @@ -648,7 +643,7 @@ Transform: m_GameObject: {fileID: 125118530} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: -3.77, y: -0.36, z: 0} + m_LocalPosition: {x: -4.01, y: -0.57, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3351,7 +3346,7 @@ Transform: m_GameObject: {fileID: 667704760} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.302, y: -0.23, z: 0} + m_LocalPosition: {x: -0.885, y: -0.288, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4868,7 +4863,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 352170d4b370c3143ad956fb754fc87f, type: 2} + - {fileID: 2100000, guid: 0c27139e24b9c7640bb94ff1668b5c4d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6108,90 +6103,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1047017824 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1047017825} - - component: {fileID: 1047017826} - m_Layer: 0 - m_Name: Renderer1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1047017825 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1047017824} - 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: 1596144635} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1047017826 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1047017824} - 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: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 19 - m_Sprite: {fileID: 21300000, guid: 2b9ab64eaef31264199b9cd3cdef0652, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1056483152 GameObject: m_ObjectHideFlags: 0 @@ -7883,7 +7794,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1330982895 Transform: m_ObjectHideFlags: 0 @@ -8166,7 +8077,7 @@ Transform: m_GameObject: {fileID: 1426096885} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -6.15, y: 14.98, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -9075,120 +8986,6 @@ Transform: - {fileID: 1516254114} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1596144632 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1596144635} - - component: {fileID: 1596144633} - - component: {fileID: 1596144634} - m_Layer: 0 - m_Name: DeepIn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1596144633 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596144632} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 885cefce8d27b9c44b433278584f254d, type: 3} - m_Name: - m_EditorClassIdentifier: - spriteArr: - - {fileID: 21300000, guid: 2b9ab64eaef31264199b9cd3cdef0652, type: 3} - - {fileID: 21300000, guid: 1971bbfa20ea0d14e983e26011be594c, type: 3} - - {fileID: 21300000, guid: 3f969e1f0cc170549be1f3837d5a363d, type: 3} - - {fileID: 21300000, guid: deb8eb32e0390cf419b754655c7461d1, type: 3} - - {fileID: 21300000, guid: 49efe4bbed8d7da42ac13ca1ce3d70bc, type: 3} - - {fileID: 21300000, guid: 39fef532867ce7849b382b3ec15e0c0a, type: 3} - - {fileID: 21300000, guid: 071006eee544c2c439689ae279265459, type: 3} - - {fileID: 21300000, guid: f634d4872fd21b54b8796beb78c25c03, type: 3} - - {fileID: 21300000, guid: 75513e9ed2ae78c4996f0aeb4486f05c, type: 3} - - {fileID: 21300000, guid: 545a5771b5c79e442868ce6a99b4b148, type: 3} - - {fileID: 21300000, guid: 5d94c888748e7594ba79ea7637c2833e, type: 3} - - {fileID: 21300000, guid: 66085339cceb37945ad68984ba1c36cf, type: 3} - - {fileID: 21300000, guid: 46409852478e37948991147b3df33d09, type: 3} - - {fileID: 21300000, guid: 9530e0a2f1a55cb4d9e08580d53e1505, type: 3} - duration: 1 ---- !u!212 &1596144634 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596144632} - 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: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 21 - m_Sprite: {fileID: 21300000, guid: 7052c85408cbb6941ac2d297f94a8110, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 17.860466, y: 10.046512} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1596144635 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596144632} - 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: 1047017825} - m_Father: {fileID: 66799946} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1612743779 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FixSystemNew/Open/OpenSystem.cs b/Assets/Scripts/FixSystemNew/Open/OpenSystem.cs index 9c80eaa9b..2d8ab1c88 100644 --- a/Assets/Scripts/FixSystemNew/Open/OpenSystem.cs +++ b/Assets/Scripts/FixSystemNew/Open/OpenSystem.cs @@ -17,12 +17,6 @@ namespace AibisDream public SpriteDeepIn deepIn; public LightRoom lightRoom; public GameObject screen; - public CuttingManager cuttingManager; - - public SpriteRenderer cutEmoSpriteRenderer; - public SpriteRenderer cutMemorySpriteRenderer; - public SpriteRenderer cutLogicSpriteRenderer; - private bool isCuttingMode = false; private void Awake() @@ -31,16 +25,7 @@ namespace AibisDream FixSystemCenter.SystemDic.Register(this); var virtualCam = transform.Find("Op Camera").GetComponent(); CameraKit.Instance.RegisterCamera(CameraEnum.Op, virtualCam); - var virtualCam1 = transform.Find("Cut Emo Camera").GetComponent(); - var virtualCam2 = transform.Find("Cut Memory Camera").GetComponent(); - var virtualCam3 = transform.Find("Cut Logic Camera").GetComponent(); - var virtualCam4 = transform.Find("Cut Emo Deep Camera").GetComponent(); - CameraKit.Instance.RegisterCamera(CameraEnum.CutEmo, virtualCam1); - CameraKit.Instance.RegisterCamera(CameraEnum.CutMemory, virtualCam2); - CameraKit.Instance.RegisterCamera(CameraEnum.CutLogic, virtualCam3); - CameraKit.Instance.RegisterCamera(CameraEnum.CutEmoDeep, virtualCam4); - - + // 组装 deepInClock.OnClockReached += PlayFadeIn; fadeInPlayable.stopped += PlayDeepIn;