diff --git a/Assets/Resources/Prefabs/Basic Function/Body Module System.prefab b/Assets/Resources/Prefabs/Basic Function/Body Module System.prefab index fda7ea9cb..5ba94df48 100644 --- a/Assets/Resources/Prefabs/Basic Function/Body Module System.prefab +++ b/Assets/Resources/Prefabs/Basic Function/Body Module System.prefab @@ -72,6 +72,37 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 6930201427787644562} +--- !u!1 &555303476111083303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1569079734487556461} + m_Layer: 0 + m_Name: Cable Root Pos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1569079734487556461 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 555303476111083303} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.505, y: 1.36, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2117906688623379083} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2195061089379433005 GameObject: m_ObjectHideFlags: 0 @@ -105,6 +136,7 @@ Transform: - {fileID: 1743353464033058114} - {fileID: 3859112564590585838} - {fileID: 7241028875149812054} + - {fileID: 1569079734487556461} m_Father: {fileID: 3722350651361937496} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3270961982482695146 @@ -753,7 +785,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cc956cb4eb967a4498d7eeef575ceb63, type: 3} m_Name: m_EditorClassIdentifier: - startTransform: {fileID: 0} + startTransform: {fileID: 1569079734487556461} physicLine: {fileID: 7228667174001650778} --- !u!114 &7228667174001650778 MonoBehaviour: diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 1cc194744..8d595414b 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -8519,90 +8519,6 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 296974215} ---- !u!1 &713182790 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 713182791} - - component: {fileID: 713182792} - m_Layer: 0 - m_Name: "\u80CC\u666F (1)" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &713182791 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713182790} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 9.954, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2201082112471799953} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &713182792 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713182790} - 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: 1 - m_Sprite: {fileID: 8789638399658599085, guid: 2338fddc038248b4b934bef72357cd13, 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!1 &746183473 GameObject: m_ObjectHideFlags: 0 @@ -14272,90 +14188,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1345326841} m_CullTransparentMesh: 1 ---- !u!1 &1372315258 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1372315259} - - component: {fileID: 1372315260} - m_Layer: 0 - m_Name: "\u5E95\u677F (1)" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1372315259 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1372315258} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.0099983215, y: 9.96, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 224310790} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1372315260 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1372315258} - 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: 40 - m_Sprite: {fileID: 21300000, guid: eeacb401ba1d3a84ba11456049b9e7f8, 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!1 &1372381513 GameObject: m_ObjectHideFlags: 0 @@ -21230,7 +21062,6 @@ Transform: - {fileID: 5501319149006720954} - {fileID: 1469111891809021300} - {fileID: 7448274329680035559} - - {fileID: 713182791} m_Father: {fileID: 224310790} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2451745036249974255 @@ -22265,9 +22096,7 @@ PrefabInstance: value: -0.0617 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 5144952586376398311, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} - - {fileID: 2411966172391820548, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} insertIndex: -1 @@ -22275,9 +22104,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} insertIndex: -1 addedObject: {fileID: 2201082112471799953} - - targetCorrespondingSourceObject: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} - insertIndex: -1 - addedObject: {fileID: 1372315259} - targetCorrespondingSourceObject: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} insertIndex: -1 addedObject: {fileID: 632022511} diff --git a/Assets/Scenes/ShitouHeadiFixScene.unity b/Assets/Scenes/ShitouHeadiFixScene.unity index 414945b2a..a447bfaf4 100644 --- a/Assets/Scenes/ShitouHeadiFixScene.unity +++ b/Assets/Scenes/ShitouHeadiFixScene.unity @@ -1324,6 +1324,81 @@ Material: - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - _ShineColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!1 &205211357 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 205211358} + - component: {fileID: 205211360} + - component: {fileID: 205211359} + m_Layer: 9 + m_Name: "\u6253\u5B54\u5E26\u534A\u900F\u660E\u80CC\u666F" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &205211358 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 205211357} + 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: 1806259810} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &205211359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 205211357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &205211360 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 205211357} + m_CullTransparentMesh: 1 --- !u!1 &234518459 GameObject: m_ObjectHideFlags: 0 @@ -2123,83 +2198,6 @@ MonoBehaviour: z: 0 cantStopRunning: 0 showPicPath: ---- !u!1 &249875585 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 249875586} - - component: {fileID: 249875588} - - component: {fileID: 249875587} - m_Layer: 9 - m_Name: eyeView - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &249875586 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 249875585} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 514025342} - - {fileID: 2113990135} - m_Father: {fileID: 1806259810} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &249875587 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 249875585} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &249875588 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 249875585} - m_CullTransparentMesh: 1 --- !u!1 &278169530 GameObject: m_ObjectHideFlags: 0 @@ -2922,95 +2920,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 449592432} m_CullTransparentMesh: 1 ---- !u!1 &514025341 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 514025342} - - component: {fileID: 514025345} - - component: {fileID: 514025344} - - component: {fileID: 514025343} - m_Layer: 9 - m_Name: RawImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &514025342 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514025341} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 249875586} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &514025343 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514025341} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ee158225ee1e59f4791627785501d950, type: 3} - m_Name: - m_EditorClassIdentifier: - shaderTypes: 0 - normalStrength: 5 - normalSmoothing: 1 - computingNormal: 0 ---- !u!114 &514025344 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514025341} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 1116278707} - 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_Texture: {fileID: 8400000, guid: 981468ee83926cb46878b414e91dbcfa, type: 2} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &514025345 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514025341} - m_CullTransparentMesh: 1 --- !u!1 &518207315 GameObject: m_ObjectHideFlags: 0 @@ -4016,7 +3925,7 @@ MonoBehaviour: m_EditorClassIdentifier: punchTapeMachine: {fileID: 630669620} punchTape: {fileID: 414060536} - blackPanel: {fileID: 0} + blackPanel: {fileID: 205211357} stepDistance: 24 stepPatterns: - 0.1 @@ -5906,256 +5815,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!21 &1116278707 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AllIn1SpriteShader/AllIn1SpriteShader - m_Shader: {fileID: 4800000, guid: a36b7719ff0465b42ab1407d67672c5f, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - CHANGECOLOR2_ON - - CHANGECOLOR3_ON - - CHANGECOLOR_ON - - GLITCH_ON - - HSV_ON - - ROUNDWAVEUV_ON - - WARP_ON - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _ColorRampTex: - m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ColorRampTexGradient: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ColorSwapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DistortTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _FadeBurnTex: - m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _FadeTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _GlowTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OutlineDistortTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OutlineTex: - m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OverlayTex: - m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ShineMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Alpha: 1 - - _AlphaCutoffValue: 0.25 - - _AlphaOutlineBlend: 1 - - _AlphaOutlineGlow: 5 - - _AlphaOutlineMinAlpha: 0 - - _AlphaOutlinePower: 1 - - _AlphaRoundThreshold: 0.5 - - _BillboardY: 0 - - _BlurHD: 0 - - _BlurIntensity: 10 - - _Brightness: 0 - - _ChromAberrAlpha: 0.4 - - _ChromAberrAmount: 1 - - _ClipUvDown: 0 - - _ClipUvLeft: 0 - - _ClipUvRight: 0 - - _ClipUvUp: 0 - - _ColorChangeLuminosity: 0 - - _ColorChangeTolerance: 1 - - _ColorChangeTolerance2: 1 - - _ColorChangeTolerance3: 1 - - _ColorRampBlend: 1 - - _ColorRampLuminosity: 0 - - _ColorRampOutline: 0 - - _ColorSwapBlend: 1 - - _ColorSwapBlueLuminosity: 0.5 - - _ColorSwapGreenLuminosity: 0.5 - - _ColorSwapRedLuminosity: -0.64 - - _Contrast: 1 - - _CullingOption: 0 - - _DistortAmount: 0.29 - - _DistortTexXSpeed: 5 - - _DistortTexYSpeed: 5 - - _EditorDrawers: 6 - - _FadeAmount: -0.1 - - _FadeBurnGlow: 2 - - _FadeBurnTransition: 0.075 - - _FadeBurnWidth: 0.025 - - _FishEyeUvAmount: 0 - - _FlickerAlpha: 0 - - _FlickerFreq: 0.2 - - _FlickerPercent: 0.05 - - _GhostBlend: 1 - - _GhostColorBoost: 0 - - _GhostTransparency: 0 - - _GlitchAmount: 0 - - _GlitchSize: 1 - - _Glow: 10 - - _GlowGlobal: 1 - - _GradBlend: 1 - - _GradBoostX: 1.2 - - _GradBoostY: 1.2 - - _GradIsRadial: 0 - - _GrassManualAnim: 1 - - _GrassManualToggle: 0 - - _GrassRadialBend: 0.1 - - _GrassSpeed: 2 - - _GrassWind: 20 - - _GreyscaleBlend: 1 - - _GreyscaleLuminosity: 0 - - _GreyscaleOutline: 0 - - _HandDrawnAmount: 10 - - _HandDrawnSpeed: 5 - - _HitEffectBlend: 1 - - _HitEffectGlow: 5 - - _HologramBlend: 1 - - _HologramMaxAlpha: 0.75 - - _HologramMinAlpha: 0.1 - - _HologramStripesAmount: 0.1 - - _HologramStripesSpeed: 4.5 - - _HologramUnmodAmount: 0 - - _HsvBright: 1 - - _HsvSaturation: 1 - - _HsvShift: 0 - - _InnerOutlineAlpha: 1 - - _InnerOutlineGlow: 4 - - _InnerOutlineThickness: 1 - - _MaxXUV: 1 - - _MaxYUV: 1 - - _MinXUV: 0 - - _MinYUV: 0 - - _MotionBlurAngle: 0.1 - - _MotionBlurDist: 1.25 - - _MyDstMode: 10 - - _MySrcMode: 5 - - _NegativeAmount: 0 - - _OffsetUvX: 0 - - _OffsetUvY: 0 - - _OnlyInnerOutline: 0 - - _OnlyOutline: 0 - - _OutlineAlpha: 1 - - _OutlineDistortAmount: 0.5 - - _OutlineDistortTexXSpeed: 5 - - _OutlineDistortTexYSpeed: 5 - - _OutlineGlow: 1.5 - - _OutlinePixelWidth: 1 - - _OutlineTexXSpeed: 10 - - _OutlineTexYSpeed: 0 - - _OutlineWidth: 0.004 - - _OverlayBlend: 1 - - _OverlayGlow: 1 - - _OverlayTextureScrollXSpeed: 0.25 - - _OverlayTextureScrollYSpeed: 0.25 - - _PinchUvAmount: 0.35 - - _PixelateSize: 32 - - _PosterizeGamma: 0.1 - - _PosterizeNumColors: 33.6 - - _PosterizeOutline: 0 - - _RadialClip: 45 - - _RadialClip2: 0 - - _RadialStartAngle: 90 - - _RandomSeed: 0 - - _RectSize: 1.67 - - _RotateUvAmount: 0 - - _RoundWaveSpeed: 2 - - _RoundWaveStrength: 0 - - _ShadowAlpha: 0.5 - - _ShadowX: 0.1 - - _ShadowY: -0.05 - - _ShakeUvSpeed: 2.5 - - _ShakeUvX: 1.5 - - _ShakeUvY: 1 - - _ShineGlow: 1 - - _ShineLocation: 0.5 - - _ShineRotate: 0 - - _ShineWidth: 0.1 - - _TextureScrollXSpeed: 1 - - _TextureScrollYSpeed: 0 - - _TwistUvAmount: 1 - - _TwistUvPosX: 0.5 - - _TwistUvPosY: 0.5 - - _TwistUvRadius: 0.75 - - _WarpScale: 0.5 - - _WarpSpeed: 8 - - _WarpStrength: 0 - - _WaveAmount: 12.9 - - _WaveSpeed: 10 - - _WaveStrength: 7.5 - - _WaveX: 0 - - _WaveY: 0.5 - - _ZTestMode: 4 - - _ZWrite: 0 - - _ZoomUvAmount: 1.58 - m_Colors: - - _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorChangeNewCol: {r: 0, g: 0.6392157, b: 1, a: 1} - - _ColorChangeNewCol2: {r: 0.42745098, g: 1, b: 0, a: 1} - - _ColorChangeNewCol3: {r: 1, g: 0.10939591, b: 0, a: 1} - - _ColorChangeTarget: {r: 0.3490566, g: 0.3490566, b: 0.3490566, a: 1} - - _ColorChangeTarget2: {r: 0.34901962, g: 0.34901962, b: 0.34901962, a: 1} - - _ColorChangeTarget3: {r: 0.34901962, g: 0.34901962, b: 0.34901962, a: 1} - - _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1} - - _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1} - - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1} - - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} - - _GlowColor: {r: 1, g: 1, b: 1, a: 1} - - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1} - - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1} - - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1} - - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1} - - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} - - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1} - - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1} - - _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1} - - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - - _OverlayColor: {r: 1, g: 1, b: 1, a: 1} - - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - - _ShineColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!1001 &1131988501 PrefabInstance: m_ObjectHideFlags: 0 @@ -9137,10 +8796,9 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1073913009} - - {fileID: 249875586} - {fileID: 97812097} - - {fileID: 1893180058} - {fileID: 630669620} + - {fileID: 205211358} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -9223,81 +8881,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1825293087} m_CullTransparentMesh: 1 ---- !u!1 &1893180057 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1893180058} - - component: {fileID: 1893180060} - - component: {fileID: 1893180059} - m_Layer: 9 - m_Name: UFView - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1893180058 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1893180057} - 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: 1806259810} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1893180059 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1893180057} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1893180060 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1893180057} - m_CullTransparentMesh: 1 --- !u!1 &1916903674 GameObject: m_ObjectHideFlags: 0 @@ -10951,98 +10534,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2100543005} m_CullTransparentMesh: 1 ---- !u!1 &2113990134 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2113990135} - - component: {fileID: 2113990138} - - component: {fileID: 2113990137} - - component: {fileID: 2113990136} - m_Layer: 9 - m_Name: MemoryRender - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2113990135 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2113990134} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 249875586} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2113990136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2113990134} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: f131fcf03c5768740a21933ac33c6b8f, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 676ba63759d65334093043ad8d0d8e25, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2113990137 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2113990134} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ee158225ee1e59f4791627785501d950, type: 3} - m_Name: - m_EditorClassIdentifier: - shaderTypes: 0 - normalStrength: 5 - normalSmoothing: 1 - computingNormal: 0 ---- !u!222 &2113990138 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2113990134} - m_CullTransparentMesh: 1 --- !u!21 &2117202632 Material: serializedVersion: 8 diff --git a/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs index dea7763e9..ac4fbaf5a 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs @@ -1,7 +1,4 @@ using UnityEngine; -using UnityEngine.Events; -using UnityEngine.PlayerLoop; -using Yarn.Unity; namespace AibisDream.FixSystem { @@ -15,9 +12,6 @@ namespace AibisDream.FixSystem public PhysicCable PhysicCableRef { get; private set; } public Transform CableRootPos { get; private set; } - public Transform ControlPoint { get; private set; } - public ISocket InitSocket { get; private set; } - public BodyModuleSystem BodyModuleSystem { get; private set; } #endregion @@ -59,7 +53,6 @@ namespace AibisDream.FixSystem PlugRef = transform.Find("Plug").GetComponent(); CableRef = transform.Find("Cable").GetComponent(); CableRootPos = transform.Find("Cable Root Pos").transform; - InitSocket = transform.Find("Init Socket").GetComponent(); PhysicCableRef = transform.Find("PhysicCable").GetComponent(); BodyModuleSystem = transform.parent.GetComponent(); @@ -67,19 +60,12 @@ namespace AibisDream.FixSystem private void InitSystem() { - - //PhysicCableRef.Init(); - PlugRef.InitPlug(InitSocket); - } - public void Update() - { - + // 初始状态Plug垂下 + PlugRef.InitPlug(); } public void ResetPlug() { - // 已经在初始插孔里了，不用动 - if (curSocket == InitSocket) return; // 不在初始插孔里，就从当前插孔拔出来，插回初始插孔 PlugRef.PullUpSocket(); PlugRef.ReturnToStartPosition(); diff --git a/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs b/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs index 5f8ae98b4..d9eb0f112 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs @@ -2,7 +2,6 @@ using AibisDream.Kit; using AibisDream.Utility; using DG.Tweening; -using MeadowGames.UINodeConnect4.GraphicRenderer; using UnityEngine; using UnityEngine.EventSystems; @@ -17,8 +16,7 @@ namespace AibisDream.FixSystem private readonly Vector3 _pickupOffset = new(0, 0, 0); private readonly Quaternion _pickupRotationOffset = Quaternion.Euler(0, 0, 30); - private readonly Quaternion initRotation = Quaternion.Euler(0, 0, 180); - + private readonly Quaternion _initRotation = Quaternion.Euler(0, 0, 180); #endregion @@ -32,7 +30,7 @@ namespace AibisDream.FixSystem #endregion private bool _isDragging; - private bool _isPhysicCableActive=false; + private bool _isPhysicCableActive; private void Awake() { @@ -48,7 +46,7 @@ namespace AibisDream.FixSystem _plugRootPos = transform.Find("Plug Root Pos"); _trigger = GetComponent(); } - + private void EventRegister() { _trigger.Register(EventTriggerType.Drag, OnDrag); @@ -56,17 +54,16 @@ namespace AibisDream.FixSystem _trigger.Register(EventTriggerType.PointerUp, OnPointerUp); } - public void InitPlug(ISocket initSocket) + public void InitPlug() { ReturnToStartPosition(); } - - + /// /// 插入某个socket /// /// 目标socket - public void InsertSocket(ISocket targetSocket) + private void InsertSocket(ISocket targetSocket) { // 修改插头位置 transform.position = targetSocket.GetSocketPos(); @@ -93,18 +90,18 @@ namespace AibisDream.FixSystem { // 修改线头位置 _cableSystem.CableRef.SetEndPos(_plugRootPos); - + _cableSystem.curSocket?.PlugOut(); AudioManager.Instance.PlaySfx("event:/FollowInput/plugout"); _sprite.enabled = true; - + if (_cableSystem.curSocket is BodyModule) { // 从模块拔出时触发事件 EnumEventSystem.Global.Send(EventEnum.PlugOut); _cableSystem.curBodyModule = null; } - + _cableSystem.curSocket = null; } @@ -112,10 +109,10 @@ namespace AibisDream.FixSystem { // 系统被锁定就返回 if (!_cableSystem.IsPlugAvailable()) return; - + // 未被拖拽也返回 if (!_isDragging) return; - + if (eventData is PointerEventData pointerData) { transform.position = CommonUtil.GetMouseWorldPos(pointerData.position, transform); @@ -155,17 +152,14 @@ namespace AibisDream.FixSystem } else { - // 没找到就插回初始位置 + // 没找到就回到初始位置 ReturnToStartPosition(); } } public void ReturnToStartPosition() { - transform.DOMove(_startPos, 0.1f).OnComplete(() => - { - SwitchToPhysicCableState(); - }); + transform.DOMove(_startPos, 0.1f).OnComplete(SwitchToPhysicCableState); } private void AdjustPlugPos() @@ -173,26 +167,24 @@ namespace AibisDream.FixSystem transform.position += _pickupOffset; transform.rotation = _pickupRotationOffset; } + private void PlugPosBack() { transform.position -= _pickupOffset; - transform.rotation = initRotation; + transform.rotation = _initRotation; } + private void SwitchToPhysicCableState() { - // 隐藏 Cable 的 LineRenderer PlugPosBack(); - _cableSystem.PhysicCableRef.Init(transform.position); + _cableSystem.PhysicCableRef.Init(transform.position); _cableSystem.CableRef.GetComponent().enabled = false; // 激活 PhysicCable - _cableSystem.PhysicCableRef.GetComponent().enabled = true; + _cableSystem.PhysicCableRef.GetComponent().enabled = true; _isPhysicCableActive = true; - } - - private void Update() { if (_isPhysicCableActive) diff --git a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs index 5b430f17c..6d81b0613 100644 --- a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs +++ b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs @@ -125,14 +125,7 @@ public class EyeSystem : MonoBehaviour DialogController.Instance.SetVariable("$currentEyeTarget", target.name); StartCoroutine(EyeEffectFadeOut()); - if (target.targetTransform != null) - { - cameraManager.MoveCameraTo(target.targetTransform, 1f); - } - else - { - cameraManager.MoveCameraTo(target.transform, 1f); - } + cameraManager.MoveCameraTo(target.targetTransform ? target.targetTransform : target.transform, 1f); if (currentTarget != null) { @@ -220,10 +213,8 @@ public class EyeSystem : MonoBehaviour [YarnCommand("set_EyeColorState")] public void SetEyeColorStateForYarn(string state) { - EyeData.EyeColorState eyeState; - // Try to parse the string as an EyeColorState - if (!Enum.TryParse(state, true, out eyeState)) + if (!Enum.TryParse(state, true, out EyeData.EyeColorState eyeState)) { throw new ArgumentException("Invalid eye state: " + state, nameof(state)); } @@ -239,23 +230,18 @@ public class EyeSystem : MonoBehaviour { case EyeData.EyeColorState.CanImagineColor: eyeStateEffect = new CanImagineColorEffect(); - //isFirstSetTargetAfterStateChange = true; break; case EyeData.EyeColorState.CannotImagineColor: eyeStateEffect = new CannotImagineColorEffect(); - //isFirstSetTargetAfterStateChange = true; break; case EyeData.EyeColorState.EyeDisorder: eyeStateEffect = new EyeDisorderEffect(); - //isFirstSetTargetAfterStateChange = true; break; case EyeData.EyeColorState.CanSeeColor: eyeStateEffect = new CanSeeColorEffect(); - //isFirstSetTargetAfterStateChange = false; break; case EyeData.EyeColorState.HaveChip: eyeStateEffect = new HaveChip(); - //isFirstSetTargetAfterStateChange = false; break; default: throw new ArgumentException("Unknown eye state: " + state.ToString(), nameof(state));