diff --git a/Assets/Prefab/UI/ReminderList.prefab b/Assets/Prefab/UI/ReminderList.prefab index af849a8..1f8a961 100644 --- a/Assets/Prefab/UI/ReminderList.prefab +++ b/Assets/Prefab/UI/ReminderList.prefab @@ -34,8 +34,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -35} - m_SizeDelta: {x: 300, y: 70} + m_AnchoredPosition: {x: 150, y: -125} + m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3012417534690017725 CanvasRenderer: @@ -135,6 +135,179 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &822359878908772403 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4059104893231262176} + m_Layer: 5 + m_Name: ConnectStatus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4059104893231262176 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 822359878908772403} + 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: 7043549758376481937} + - {fileID: 620627455863619519} + - {fileID: 7315864762014354113} + m_Father: {fileID: 1135667794185554838} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -25} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1144664868487155538 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5165864255128733072} + - component: {fileID: 1655944854461298112} + - component: {fileID: 1156774591386606920} + m_Layer: 5 + m_Name: RightPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5165864255128733072 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1144664868487155538} + 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: 1135667794185554838} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -275} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1655944854461298112 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1144664868487155538} + m_CullTransparentMesh: 1 +--- !u!114 &1156774591386606920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1144664868487155538} + 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: "\u53F3\u952E - \u8BBE\u7F6EB" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 538fd603dd2dddd4daf31aa55f44c7e5, type: 2} + m_sharedMaterial: {fileID: -3917370665499528571, guid: 538fd603dd2dddd4daf31aa55f44c7e5, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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 &1372230259415100561 GameObject: m_ObjectHideFlags: 0 @@ -169,8 +342,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -35} - m_SizeDelta: {x: 300, y: 70} + m_AnchoredPosition: {x: 150, y: -75} + m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2700352142702063085 CanvasRenderer: @@ -304,8 +477,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -175} - m_SizeDelta: {x: 300, y: 70} + m_AnchoredPosition: {x: 150, y: -325} + m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5755484673904213804 CanvasRenderer: @@ -439,8 +612,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -175} - m_SizeDelta: {x: 300, y: 70} + m_AnchoredPosition: {x: 150, y: -375} + m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9173588578390262910 CanvasRenderer: @@ -540,6 +713,411 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3812510885889878341 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7043549758376481937} + - component: {fileID: 3159326276110394941} + - component: {fileID: 9008575835382515155} + m_Layer: 5 + m_Name: Need + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7043549758376481937 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3812510885889878341} + 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: 4059104893231262176} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 99.7, y: -25} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3159326276110394941 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3812510885889878341} + m_CullTransparentMesh: 1 +--- !u!114 &9008575835382515155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3812510885889878341} + 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: 4 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 538fd603dd2dddd4daf31aa55f44c7e5, type: 2} + m_sharedMaterial: {fileID: -3917370665499528571, guid: 538fd603dd2dddd4daf31aa55f44c7e5, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4293475103 + m_fontColor: {r: 0.12156864, g: 0.23237322, b: 0.9137255, 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: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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 &4783406006381964244 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 620627455863619519} + - component: {fileID: 6249100782382585413} + - component: {fileID: 342191857092773249} + m_Layer: 5 + m_Name: ConnectStatus (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &620627455863619519 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4783406006381964244} + 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: 4059104893231262176} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 148.2096, y: -25} + m_SizeDelta: {x: 33.5506, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6249100782382585413 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4783406006381964244} + m_CullTransparentMesh: 1 +--- !u!114 &342191857092773249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4783406006381964244} + 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: "\uFF1A" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 538fd603dd2dddd4daf31aa55f44c7e5, type: 2} + m_sharedMaterial: {fileID: -3917370665499528571, guid: 538fd603dd2dddd4daf31aa55f44c7e5, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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 &5444423419614263499 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7315864762014354113} + - component: {fileID: 6110796898801314197} + - component: {fileID: 8297405809658920440} + m_Layer: 5 + m_Name: Current + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7315864762014354113 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5444423419614263499} + 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: 4059104893231262176} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 184, y: -25} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6110796898801314197 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5444423419614263499} + m_CullTransparentMesh: 1 +--- !u!114 &8297405809658920440 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5444423419614263499} + 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: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 538fd603dd2dddd4daf31aa55f44c7e5, type: 2} + m_sharedMaterial: {fileID: -3917370665499528571, guid: 538fd603dd2dddd4daf31aa55f44c7e5, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279900901 + m_fontColor: {r: 0.89757407, g: 0.1004024, b: 0.1004024, 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: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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 &5826797658906340627 GameObject: m_ObjectHideFlags: 0 @@ -570,9 +1148,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4059104893231262176} - {fileID: 930174563945914406} - {fileID: 7029993173035865934} + - {fileID: 2091149848487178319} - {fileID: 1105326741592270637} + - {fileID: 5165864255128733072} - {fileID: 7955482942286597510} - {fileID: 8695974536346969846} m_Father: {fileID: 0} @@ -598,8 +1179,13 @@ MonoBehaviour: reminderInteractPrefab: {fileID: 1372230259415100561} reminderReadPrefab: {fileID: 485939746293016442} reminderConnectPrefab: {fileID: 1566038821549990303} - reminderSetPointPrefab: {fileID: 8649771482720941180} + reminderSetLeftPointPrefab: {fileID: 8649771482720941180} + reminderSetRightPointPrefab: {fileID: 1144664868487155538} reminderDeleteLinePrefab: {fileID: 2108696256597691169} + reminderEditPrefab: {fileID: 8396293817574355725} + ConnectStatus: {fileID: 822359878908772403} + NeedCountText: {fileID: 9008575835382515155} + CurrentCountText: {fileID: 8297405809658920440} --- !u!114 &750214604344451669 MonoBehaviour: m_ObjectHideFlags: 0 @@ -626,7 +1212,7 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &8649771482720941180 +--- !u!1 &8396293817574355725 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -634,23 +1220,23 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1105326741592270637} - - component: {fileID: 1743228210522502908} - - component: {fileID: 8217458606352480243} + - component: {fileID: 2091149848487178319} + - component: {fileID: 7667799326884049671} + - component: {fileID: 1790400372739452475} m_Layer: 5 - m_Name: Point + m_Name: Edit m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!224 &1105326741592270637 +--- !u!224 &2091149848487178319 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8649771482720941180} + m_GameObject: {fileID: 8396293817574355725} 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} @@ -660,24 +1246,24 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -105} - m_SizeDelta: {x: 300, y: 70} + m_AnchoredPosition: {x: 150, y: -175} + m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1743228210522502908 +--- !u!222 &7667799326884049671 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8649771482720941180} + m_GameObject: {fileID: 8396293817574355725} m_CullTransparentMesh: 1 ---- !u!114 &8217458606352480243 +--- !u!114 &1790400372739452475 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8649771482720941180} + m_GameObject: {fileID: 8396293817574355725} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -691,7 +1277,142 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5DE6\u952E - \u8BBE\u7F6EA \n\u53F3\u952E - \u8BBE\u7F6EB" + m_text: "E - \u7F16\u8F91" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 538fd603dd2dddd4daf31aa55f44c7e5, type: 2} + m_sharedMaterial: {fileID: -3917370665499528571, guid: 538fd603dd2dddd4daf31aa55f44c7e5, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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 &8649771482720941180 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1105326741592270637} + - component: {fileID: 1743228210522502908} + - component: {fileID: 8217458606352480243} + m_Layer: 5 + m_Name: LeftPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1105326741592270637 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8649771482720941180} + 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: 1135667794185554838} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -225} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1743228210522502908 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8649771482720941180} + m_CullTransparentMesh: 1 +--- !u!114 &8217458606352480243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8649771482720941180} + 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: "\u5DE6\u952E - \u8BBE\u7F6EA " m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 538fd603dd2dddd4daf31aa55f44c7e5, type: 2} m_sharedMaterial: {fileID: -3917370665499528571, guid: 538fd603dd2dddd4daf31aa55f44c7e5, diff --git a/Assets/Scenes/Core.unity b/Assets/Scenes/Core.unity index 67d22e5..f6d2119 100644 --- a/Assets/Scenes/Core.unity +++ b/Assets/Scenes/Core.unity @@ -133,7 +133,7 @@ PrefabInstance: - target: {fileID: 593212677835339430, guid: 9e2e93bf07726014bac5a458c32e697f, type: 3} propertyPath: defaultDuration - value: 30 + value: 90 objectReference: {fileID: 0} - target: {fileID: 3918776012077598679, guid: 9e2e93bf07726014bac5a458c32e697f, type: 3} diff --git a/Assets/Scenes/Test.unity b/Assets/Scenes/Test.unity index 4c9a672..38f46a9 100644 --- a/Assets/Scenes/Test.unity +++ b/Assets/Scenes/Test.unity @@ -216,6 +216,84 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: be07db3098b709a40a6965f50f8c9640, type: 3} +--- !u!1001 &382252025 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalPosition.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.18 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4435893386940746007, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_IsKinematic + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7979385610396712053, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_Name + value: BaseSphere (1) + objectReference: {fileID: 0} + - target: {fileID: 9140300362975493256, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: isOpenInEditor + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9fc63211af583b946b1f381e4bf38ddf, type: 3} --- !u!1 &410087039 GameObject: m_ObjectHideFlags: 0 @@ -1989,11 +2067,6 @@ PrefabInstance: propertyPath: m_Name value: MovingPlatform objectReference: {fileID: 0} - - target: {fileID: 7403824303730881351, guid: 5ee760c56bad73f48a453ce5657e05b8, - type: 3} - propertyPath: isEnableConnect - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7628753614903997363, guid: 5ee760c56bad73f48a453ce5657e05b8, type: 3} propertyPath: m_LocalPosition.x @@ -2868,6 +2941,7 @@ SceneRoots: - {fileID: 7779342506646282638} - {fileID: 8980111935536418165} - {fileID: 1035971231385273297} + - {fileID: 382252025} - {fileID: 366996911271636373} - {fileID: 6191742170513974480} - {fileID: 1240498723} diff --git a/Assets/Scenes/UIScene.unity b/Assets/Scenes/UIScene.unity index 4c1ad92..70becad 100644 --- a/Assets/Scenes/UIScene.unity +++ b/Assets/Scenes/UIScene.unity @@ -510,7 +510,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1009976182 MonoBehaviour: m_ObjectHideFlags: 0 @@ -719,7 +719,6 @@ RectTransform: - {fileID: 165485610} - {fileID: 120768280} - {fileID: 1822383180} - - {fileID: 2062822976} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1556,41 +1555,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2365583844921983821} m_PrefabAsset: {fileID: 0} ---- !u!1 &2062822975 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2062822976} - m_Layer: 5 - m_Name: CenterReminderViewer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2062822976 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2062822975} - 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: 1067459529} - 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!1001 &1937221272884345375 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Gameplay/Connect/ConnectionLine.cs b/Assets/Script/Gameplay/Connect/ConnectionLine.cs index 18dd0cd..6d70bf8 100644 --- a/Assets/Script/Gameplay/Connect/ConnectionLine.cs +++ b/Assets/Script/Gameplay/Connect/ConnectionLine.cs @@ -76,6 +76,9 @@ namespace Script.Gameplay.Connect _pointB.ConnectionLines.Remove(this); } + public int NeedSignalCount { get; set; } + public int CurrentNeedSignalCount { get; set; } + public void OnSignalReceived(bool active, GameObject sender) { SendSignal(active,this.gameObject); diff --git a/Assets/Script/Gameplay/Facility/BaseFacilityController.cs b/Assets/Script/Gameplay/Facility/BaseFacilityController.cs index 25a6d7f..c535616 100644 --- a/Assets/Script/Gameplay/Facility/BaseFacilityController.cs +++ b/Assets/Script/Gameplay/Facility/BaseFacilityController.cs @@ -11,10 +11,10 @@ namespace Script.Gameplay.Facility [SerializeField] protected bool isEnableInteract = true; [SerializeField] protected bool isEnableEdit = true; [SerializeField] protected bool isEnableConnect = true; - [SerializeField] protected string componentName; - [SerializeField] protected int needSignalCount = 1; [SerializeField] protected bool isOpenInEditor = true; - protected int CurrentSignalCount = 0; + [SerializeField] protected int needSignalCount = 1; + [SerializeField] protected int currentSignalCount = 0; + [SerializeField] protected string componentName; public virtual bool IsEnableInteract { @@ -44,6 +44,17 @@ namespace Script.Gameplay.Facility get => isEnableConnect; set => isEnableConnect = value; } + public virtual int NeedSignalCount + { + get => needSignalCount; + set => needSignalCount = value; + } + + public virtual int CurrentNeedSignalCount + { + get => currentSignalCount; + set => currentSignalCount = value; + } public string ComponentName { @@ -96,14 +107,14 @@ namespace Script.Gameplay.Facility { if (active) { - CurrentSignalCount++; + CurrentNeedSignalCount++; } else { - CurrentSignalCount = Mathf.Max(0, CurrentSignalCount - 1); + CurrentNeedSignalCount = Mathf.Max(0, CurrentNeedSignalCount- 1); } - if (CurrentSignalCount < needSignalCount) + if (CurrentNeedSignalCount < NeedSignalCount) { return; } diff --git a/Assets/Script/Gameplay/Facility/DoorInteractController.cs b/Assets/Script/Gameplay/Facility/DoorInteractController.cs index 924c9c4..b92bc68 100644 --- a/Assets/Script/Gameplay/Facility/DoorInteractController.cs +++ b/Assets/Script/Gameplay/Facility/DoorInteractController.cs @@ -52,6 +52,7 @@ namespace Script.Gameplay.Facility public override void OnSignalReceived(bool active, GameObject sender) { + base.OnSignalReceived(active, sender); Interact(sender); } } diff --git a/Assets/Script/Gameplay/Interface/ISignalReceiver.cs b/Assets/Script/Gameplay/Interface/ISignalReceiver.cs index 4e6313f..90a8119 100644 --- a/Assets/Script/Gameplay/Interface/ISignalReceiver.cs +++ b/Assets/Script/Gameplay/Interface/ISignalReceiver.cs @@ -3,6 +3,8 @@ namespace Script.Gameplay.Interface { public interface ISignalReceiver { + public int NeedSignalCount { get; set; } + public int CurrentNeedSignalCount { get; set; } public void OnSignalReceived(bool active, GameObject sender); } } \ No newline at end of file diff --git a/Assets/Script/Gameplay/Player/PlayerConnectController.cs b/Assets/Script/Gameplay/Player/PlayerConnectController.cs index 0ae3a6e..790fadc 100644 --- a/Assets/Script/Gameplay/Player/PlayerConnectController.cs +++ b/Assets/Script/Gameplay/Player/PlayerConnectController.cs @@ -43,11 +43,11 @@ namespace Script.Gameplay.Player { if (currentTarget != null) { - OnGazeEnter?.Invoke((currentTarget as MonoBehaviour)?.gameObject); + OnGazeEnterConnectable?.Invoke((currentTarget as MonoBehaviour)?.gameObject); } if (previousTarget != null) { - OnGazeExit?.Invoke((previousTarget as MonoBehaviour)?.gameObject); + OnGazeExitConnectable?.Invoke((previousTarget as MonoBehaviour)?.gameObject); } } } @@ -60,8 +60,8 @@ namespace Script.Gameplay.Player private IConnectable inputTarget; public event Action OnSetPointA; public event Action OnSetPointB; - public event Action OnGazeEnter; - public event Action OnGazeExit; + public event Action OnGazeEnterConnectable; + public event Action OnGazeExitConnectable; void Start() { diff --git a/Assets/Script/Gameplay/Player/PlayerEditController.cs b/Assets/Script/Gameplay/Player/PlayerEditController.cs index 65b14e6..4adc0fe 100644 --- a/Assets/Script/Gameplay/Player/PlayerEditController.cs +++ b/Assets/Script/Gameplay/Player/PlayerEditController.cs @@ -3,6 +3,7 @@ using UnityEngine; using Script.Gameplay.Interface; using Script.Gameplay.Input; using System; +using System.Collections.Generic; using Script.Gameplay.Global; namespace Script.Gameplay.Player @@ -12,11 +13,34 @@ namespace Script.Gameplay.Player [SerializeField] private FirstPersonRaycaster raycaster; // 新增：第一人称射线检测器 public bool IsEnableEditing = true; // 是否启用编辑功能 private bool isEditing = false; // 当前是否处于编辑状态 + public event Action OnGazeEnterEditableComponent; + public event Action OnGazeExitEditableComponent; public event Action OnBeginEditTarget; public event Action OnEndEditTarget; + private GameObject previousTarget; // 上一次注视的对象（用于注视进入/离开事件） private GameObject currentTarget; // 射线命中的当前可编辑对象（用于按键交互） - private GameObject previousGazedTarget; // 上一次注视的对象（用于注视进入/离开事件） + + public GameObject CurrentTarget + { + get => currentTarget; + set + { + previousTarget = currentTarget; + currentTarget = value; + if (previousTarget != currentTarget) + { + if (currentTarget != null) + { + OnGazeEnterEditableComponent?.Invoke((currentTarget)?.gameObject); + } + if (previousTarget != null) + { + OnGazeExitEditableComponent?.Invoke((previousTarget)?.gameObject); + } + } + } + } private InputManager inputManager; @@ -53,23 +77,7 @@ namespace Script.Gameplay.Player hitEditable = lookAtObj; } } - currentTarget = hitEditable; - - // // 如果命中对象与之前注视的不一样，触发进入/离开事件 - // if (hitEditable != previousGazedTarget) - // { - // if (previousGazedTarget != null) - // { - // // previousGazedTarget.OnGazeExit(this); - // } - // - // if (hitEditable != null) - // { - // // hitEditable.OnGazeEnter(this); - // } - // - // previousGazedTarget = hitEditable; - // } + CurrentTarget = hitEditable; } private void EditTarget() @@ -77,7 +85,7 @@ namespace Script.Gameplay.Player if (isEditing) { isEditing = false; - OnEndEditTarget?.Invoke(currentTarget); + OnEndEditTarget?.Invoke(CurrentTarget); inputManager.SetCursorState(false, CursorLockMode.Locked); inputManager.SetInputForLook(true); inputManager.SetInputForMove(true); @@ -88,10 +96,10 @@ namespace Script.Gameplay.Player } else { - if (currentTarget == null) return; + if (CurrentTarget == null) return; if (!IsEnableEditing) return; isEditing = true; - OnBeginEditTarget?.Invoke(currentTarget); + OnBeginEditTarget?.Invoke(CurrentTarget); inputManager.SetCursorState(true, CursorLockMode.Confined); inputManager.SetInputForLook(false); inputManager.SetInputForMove(false); diff --git a/Assets/Script/Gameplay/UI/PlayerGazeReminder.cs b/Assets/Script/Gameplay/UI/PlayerGazeReminder.cs index 4457973..9e30329 100644 --- a/Assets/Script/Gameplay/UI/PlayerGazeReminder.cs +++ b/Assets/Script/Gameplay/UI/PlayerGazeReminder.cs @@ -3,6 +3,7 @@ using UnityEngine; using Script.Gameplay.Player; using TMPro; using System.Collections.Generic; +using Script.Gameplay.Interface; namespace UI { @@ -11,11 +12,19 @@ namespace UI [SerializeField] private GameObject reminderInteractPrefab; [SerializeField] private GameObject reminderReadPrefab; [SerializeField] private GameObject reminderConnectPrefab; - [SerializeField] private GameObject reminderSetPointPrefab; + [SerializeField] private GameObject reminderSetLeftPointPrefab; + [SerializeField] private GameObject reminderSetRightPointPrefab; [SerializeField] private GameObject reminderDeleteLinePrefab; + [SerializeField] private GameObject reminderEditPrefab; + [Header("Connect Status UI")] + [SerializeField] private GameObject ConnectStatus; + [SerializeField] private TMP_Text NeedCountText; + [SerializeField] private TMP_Text CurrentCountText; + private PlayerInteractorController playerInteractorController; private PlayerConnectController playerConnectController; private PlayerDialogueController playerDialogueController; + private PlayerEditController playerEditController; protected override void Awake() { @@ -23,6 +32,14 @@ namespace UI ControllerLocator.Instance.TryGetWait(OnGetInteractorController); ControllerLocator.Instance.TryGetWait(OnGetConnectController); ControllerLocator.Instance.TryGetWait(OnGetDialogueController); + ControllerLocator.Instance.TryGetWait(OnGetEditController); + } + + private void OnGetEditController(PlayerEditController obj) + { + playerEditController = obj; + playerEditController.OnGazeEnterEditableComponent += (obj) => reminderEditPrefab.SetActive(true); + playerEditController.OnGazeExitEditableComponent += (obj) => reminderEditPrefab.SetActive(false); } private void OnGetInteractorController(PlayerInteractorController controller) @@ -35,17 +52,32 @@ namespace UI private void OnGetConnectController(PlayerConnectController controller) { playerConnectController = controller; - playerConnectController.OnGazeEnter += (obj) => + playerConnectController.OnGazeEnterConnectable += (obj) => { reminderConnectPrefab.SetActive(true); - reminderSetPointPrefab.SetActive(true); + reminderSetLeftPointPrefab.SetActive(true); + reminderSetRightPointPrefab.SetActive(true); reminderDeleteLinePrefab.SetActive(true); + // 更新连接状态UI + ISignalReceiver connectableComponent = obj.GetComponent(); + if (connectableComponent != null) + { + ConnectStatus.SetActive(true); + NeedCountText.text = connectableComponent.NeedSignalCount.ToString(); + CurrentCountText.text = connectableComponent.CurrentNeedSignalCount.ToString(); + } + else + { + ConnectStatus.SetActive(false); + } }; - playerConnectController.OnGazeExit += (obj) => + playerConnectController.OnGazeExitConnectable += (obj) => { reminderConnectPrefab.SetActive(false); - reminderSetPointPrefab.SetActive(false); + reminderSetLeftPointPrefab.SetActive(false); + reminderSetRightPointPrefab.SetActive(false); reminderDeleteLinePrefab.SetActive(false); + ConnectStatus.SetActive(false); }; } diff --git a/Assets/Script/Gameplay/UI/PlayerWatchModeViewer.cs b/Assets/Script/Gameplay/UI/PlayerWatchModeViewer.cs index 833c278..9563de0 100644 --- a/Assets/Script/Gameplay/UI/PlayerWatchModeViewer.cs +++ b/Assets/Script/Gameplay/UI/PlayerWatchModeViewer.cs @@ -20,8 +20,8 @@ namespace UI private void OnGet(PlayerWatchModeController watchModeCtrl) { watchModeController = watchModeCtrl; - modeText.text = "Watch Mode: " + watchModeController.CurrentWatchMode; - watchModeController.OnEnterWatchMode += mode => modeText.text = "Watch Mode: " + mode; + modeText.text = "Mode: " + watchModeController.CurrentWatchMode; + watchModeController.OnEnterWatchMode += mode => modeText.text = "Mode: " + mode; } } } \ No newline at end of file