diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIcon.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIcon.prefab index 644fe7cf..fcee8e7f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIcon.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIcon.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 7807764757529915208} - component: {fileID: 4149673547459892155} - component: {fileID: 4092475717025940613} + - component: {fileID: 6225080396998151119} m_Layer: 0 m_Name: BuffIcon m_TagString: Untagged @@ -61,7 +62,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -77,6 +78,22 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6225080396998151119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610775712955856159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bba8982995f7d334a98ab71ea6c1b915, type: 3} + m_Name: + m_EditorClassIdentifier: + buffName: + buffInfor: + buffValue: + buffIcon: {fileID: 0} --- !u!1 &5955648499163411156 GameObject: m_ObjectHideFlags: 0 @@ -136,7 +153,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -215,7 +232,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab index 99ce9215..dc6ced85 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab @@ -169,6 +169,7 @@ GameObject: - component: {fileID: 7957164916501873808} - component: {fileID: 4202242118663527483} - component: {fileID: 4992992949522583455} + - component: {fileID: 3130684007053171194} m_Layer: 0 m_Name: BuffIconInUIBar m_TagString: Untagged @@ -235,3 +236,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3130684007053171194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8664123997041071156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bba8982995f7d334a98ab71ea6c1b915, type: 3} + m_Name: + m_EditorClassIdentifier: + buffName: + buffInfor: + buffValue: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffInforTip.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffInforTip.prefab new file mode 100644 index 00000000..474c73dd --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffInforTip.prefab @@ -0,0 +1,329 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2592041783247472681 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5029496837788054627} + - component: {fileID: 1914585258800841885} + - component: {fileID: 326719674285812878} + - component: {fileID: 7438723330654741663} + m_Layer: 0 + m_Name: BuffInforTip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5029496837788054627 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2592041783247472681} + 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: 6246507384177836118} + - {fileID: 953402618508117459} + - {fileID: 338608162721150301} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 310, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1914585258800841885 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2592041783247472681} + m_CullTransparentMesh: 1 +--- !u!114 &326719674285812878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2592041783247472681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1505802468, guid: dc6b9182f75d3ba4dba9ab97c6560421, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7438723330654741663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2592041783247472681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97e04e00e32104349ad2db7e195ee93f, type: 3} + m_Name: + m_EditorClassIdentifier: + image: {fileID: 3620118993430584810} + inforText: {fileID: 6183072798072282244} + valueText: {fileID: 4516611789443743915} +--- !u!1 &2875204946471600193 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 953402618508117459} + - component: {fileID: 5030735656716133214} + - component: {fileID: 6183072798072282244} + m_Layer: 0 + m_Name: Infor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &953402618508117459 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2875204946471600193} + 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: 5029496837788054627} + 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: 46.5132, y: 0.9247} + m_SizeDelta: {x: 216.9735, y: 98.1505} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5030735656716133214 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2875204946471600193} + m_CullTransparentMesh: 1 +--- !u!114 &6183072798072282244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2875204946471600193} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!1 &6615503620388618141 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6246507384177836118} + - component: {fileID: 8381044141226787902} + - component: {fileID: 3620118993430584810} + m_Layer: 0 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6246507384177836118 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6615503620388618141} + 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: 5029496837788054627} + 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: -106.4, y: 0} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8381044141226787902 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6615503620388618141} + m_CullTransparentMesh: 1 +--- !u!114 &3620118993430584810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6615503620388618141} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7600469922298161121 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 338608162721150301} + - component: {fileID: 4761098755218675163} + - component: {fileID: 4516611789443743915} + m_Layer: 0 + m_Name: Value + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &338608162721150301 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7600469922298161121} + 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: 5029496837788054627} + 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: -75.76226, y: -25.76461} + m_SizeDelta: {x: 41.0164, y: 44.7727} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4761098755218675163 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7600469922298161121} + m_CullTransparentMesh: 1 +--- !u!114 &4516611789443743915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7600469922298161121} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffInforTip.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffInforTip.prefab.meta new file mode 100644 index 00000000..6cd9fa73 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffInforTip.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1b58ed47ff3c01b408a4adac252a6554 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab index 770a852d..e5b17358 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab @@ -12,8 +12,9 @@ GameObject: - component: {fileID: 7926778518287012244} - component: {fileID: 8378802601904226369} - component: {fileID: 4279916569717705464} + - component: {fileID: 9167572405963525808} m_Layer: 10 - m_Name: BUffPanel + m_Name: TotalPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -100,6 +101,23 @@ MonoBehaviour: m_Spacing: {x: -0.03, y: -0.03} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!114 &9167572405963525808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6855895506985558} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5896c2d4f0601e346bf36f2fe9629329, type: 3} + m_Name: + m_EditorClassIdentifier: + inforBar: {fileID: 0} + offSet: {x: 0, y: 0, z: 0} + buffNodeList: [] + layoutGroup: {fileID: 0} + textAnchor: 0 --- !u!1 &221578480655655393 GameObject: m_ObjectHideFlags: 0 @@ -161,7 +179,7 @@ MonoBehaviour: m_Color: {r: 0.19215687, g: 0.19215687, b: 0.19215687, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -234,7 +252,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -315,7 +333,7 @@ MonoBehaviour: m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -396,8 +414,8 @@ Canvas: m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 801241541 - m_SortingOrder: 0 + m_SortingLayerID: 269777783 + m_SortingOrder: -1 m_TargetDisplay: 0 --- !u!114 &7687161830598055294 MonoBehaviour: @@ -421,7 +439,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &8739798778191560965 MonoBehaviour: m_ObjectHideFlags: 0 @@ -463,6 +481,7 @@ MonoBehaviour: buffIcon: {fileID: 610775712955856159, guid: 457a3d2dee855fa41a324600bf63e57f, type: 3} buffPanle: {fileID: 6855895506985558} time: 0.2 + buffInforOnMouse: {fileID: 9167572405963525808} --- !u!65 &6055812006071397122 BoxCollider: m_ObjectHideFlags: 0 @@ -568,7 +587,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -647,7 +666,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -727,7 +746,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -802,7 +821,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -883,7 +902,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -958,7 +977,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1038,7 +1057,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19245279, g: 0.19245279, b: 0.19245279, a: 0} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1148,7 +1167,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1226,7 +1245,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1303,12 +1322,12 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -1380,7 +1399,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index de67429e..15c5020c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -469,6 +469,7 @@ GameObject: - component: {fileID: 14209051} - component: {fileID: 14209050} - component: {fileID: 14209052} + - component: {fileID: 14209053} m_Layer: 5 m_Name: BuffPanel m_TagString: Untagged @@ -557,6 +558,23 @@ MonoBehaviour: m_Spacing: {x: 12, y: 10} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!114 &14209053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14209048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5896c2d4f0601e346bf36f2fe9629329, type: 3} + m_Name: + m_EditorClassIdentifier: + inforBar: {fileID: 0} + offSet: {x: 1.2, y: 0, z: 0.3} + buffNodeList: [] + layoutGroup: {fileID: 0} + textAnchor: 6 --- !u!1 &20402335 GameObject: m_ObjectHideFlags: 0 @@ -3705,6 +3723,7 @@ MonoBehaviour: bone: {fileID: 0} bone_Re: {fileID: 0} lasteHp: 0 + anim: {fileID: 0} canMove: 0 planAction: 0 --- !u!4 &173840243 @@ -8468,8 +8487,9 @@ GameObject: - component: {fileID: 365854628} - component: {fileID: 365854627} - component: {fileID: 365854626} + - component: {fileID: 365854629} m_Layer: 5 - m_Name: BUffPanel + m_Name: TotalPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8532,9 +8552,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -8556,6 +8576,23 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 365854624} m_CullTransparentMesh: 1 +--- !u!114 &365854629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365854624} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5896c2d4f0601e346bf36f2fe9629329, type: 3} + m_Name: + m_EditorClassIdentifier: + inforBar: {fileID: 0} + offSet: {x: 0, y: 0, z: 0} + buffNodeList: [] + layoutGroup: {fileID: 0} + textAnchor: 0 --- !u!1 &368102274 GameObject: m_ObjectHideFlags: 0 @@ -11884,6 +11921,7 @@ MonoBehaviour: bone: {fileID: 0} bone_Re: {fileID: 0} lasteHp: 0 + anim: {fileID: 0} canMove: 0 planAction: 0 --- !u!4 &490441552 @@ -11987,6 +12025,8 @@ MonoBehaviour: coma: 0 sleep: 0 canAction: 0 + buffInforOnMouse: {fileID: 365854629} + buffInforOnMouseInStatus: {fileID: 14209053} --- !u!1 &504685528 GameObject: m_ObjectHideFlags: 0 @@ -13159,6 +13199,120 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1 &532689217 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 532689218} + - component: {fileID: 532689222} + - component: {fileID: 532689221} + - component: {fileID: 532689220} + - component: {fileID: 532689219} + m_Layer: 0 + m_Name: buffInforPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &532689218 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532689217} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000015522834} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2140661235} + 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: -1.9991547, y: 161.0968} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 1.3} +--- !u!114 &532689219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532689217} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3dac0a4602fa1b41bbfa073875344c3, type: 3} + m_Name: + m_EditorClassIdentifier: + inforPanleType: 1 +--- !u!114 &532689220 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532689217} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 1 + m_CellSize: {x: 310, y: 100} + m_Spacing: {x: 0, y: 0} + m_Constraint: 2 + m_ConstraintCount: 4 +--- !u!114 &532689221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532689217} + 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.2528302, g: 0.2528302, b: 0.2528302, a: 0} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + 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: 100 +--- !u!222 &532689222 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532689217} + m_CullTransparentMesh: 1 --- !u!1 &545229582 GameObject: m_ObjectHideFlags: 0 @@ -13830,7 +13984,7 @@ GameObject: - component: {fileID: 569168384} - component: {fileID: 569168385} m_Layer: 0 - m_Name: PlanPanel + m_Name: cardInforPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -13929,6 +14083,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b3dac0a4602fa1b41bbfa073875344c3, type: 3} m_Name: m_EditorClassIdentifier: + inforPanleType: 0 --- !u!1 &572219194 GameObject: m_ObjectHideFlags: 0 @@ -15003,7 +15158,7 @@ GameObject: - component: {fileID: 628364367} - component: {fileID: 628364366} m_Layer: 0 - m_Name: CardInforBarManager + m_Name: InforBarManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -15025,6 +15180,10 @@ MonoBehaviour: InforBarTipPrefab: {fileID: 8650645450562924027, guid: 64ec1d3890ee945458d7528b185a796a, type: 3} InforBarTipList: [] + buffInforBar: {fileID: 0} + buffInforBarTipPrefab: {fileID: 2592041783247472681, guid: 1b58ed47ff3c01b408a4adac252a6554, + type: 3} + buffInforBarTipList: [] --- !u!4 &628364367 Transform: m_ObjectHideFlags: 0 @@ -38622,7 +38781,11 @@ MonoBehaviour: generatePoint: {fileID: 514899946} lineOffSet: {x: 1, y: 0, z: 0} columnOffSet: {x: 0, y: 0, z: 0.865} - enemyGenerateDataList: [] + enemyGenerateDataList: + - enemyPrefab: {fileID: 1253231568001379261, guid: 3d83bb7c6cfaa71439ad6302d0dceb51, + type: 3} + locationX: 1 + locationY: 1 playerNameText: {fileID: 742474145} playerMoneyText: {fileID: 506890230} cardGuide: {fileID: 1393562878} @@ -45758,7 +45921,7 @@ GameObject: - component: {fileID: 2140661237} - component: {fileID: 2140661236} m_Layer: 0 - m_Name: CardInfarBarCanvas + m_Name: InfarBarCanvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -45777,6 +45940,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 569168383} + - {fileID: 532689218} m_Father: {fileID: 196188496} m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1} m_AnchorMin: {x: 0, y: 0} @@ -46139,6 +46303,7 @@ MonoBehaviour: bone: {fileID: 0} bone_Re: {fileID: 0} lasteHp: 0 + anim: {fileID: 0} canMove: 0 planAction: 0 --- !u!1 &1507966320976878147 @@ -47755,6 +47920,6 @@ SceneRoots: - {fileID: 992566371} - {fileID: 395072433} - {fileID: 2068068679} - - {fileID: 628364367} - {fileID: 789990414} - {fileID: 1751203284} + - {fileID: 628364367} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode.meta new file mode 100644 index 00000000..35375bc5 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c2918b6cb990c804e9d899b106efd131 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffInforOnMouse.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffInforOnMouse.cs new file mode 100644 index 00000000..444e5a1b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffInforOnMouse.cs @@ -0,0 +1,62 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +public class BuffInforOnMouse : MonoBehaviour,IPointerEnterHandler ,IPointerExitHandler +{ + bool isShow; + [Header("信息表")] + public GameObject inforBar; + [Header("偏移量")] + public Vector3 offSet; + [Header("buffNode表")] + public List buffNodeList = new List(); + [Header("排版轴")] + public LayoutGroup layoutGroup; + public TextAnchor textAnchor; + public void OnPointerEnter(PointerEventData eventData) + { + + + isShow = true; + inforBar = CardInfroBarManager.Instance.buffInforBar; + layoutGroup = inforBar .GetComponent(); + layoutGroup.childAlignment = textAnchor; + inforBar.SetActive(true); + //同步位置 + inforBar.transform.position = transform.position + offSet; + //删除以前的条目 + foreach (var tip in CardInfroBarManager.Instance.buffInforBarTipList) + { + if (tip != null) + Destroy(tip.gameObject); + } + CardInfroBarManager.Instance.buffInforBarTipList.Clear(); + //生成新条目 + for(int i=0;i()); + tip.transform.GetComponent().SetUpTip(buffNodeList[i].buffIcon, buffNodeList[i].buffName, buffNodeList[i].buffValue); + CardInfroBarManager.Instance.buffInforBarTipList.Add(tip); + } + } + + public void OnPointerExit(PointerEventData eventData) + { + isShow = false; + inforBar.SetActive(false); + } + + /*private void Update() + { + if (isShow) + { + //跟随 + // inforBar .transform .position = Mouse.current.position.value; + inforBar.transform.position = transform.position + offSet; + } + }*/ +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffInforOnMouse.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffInforOnMouse.cs.meta new file mode 100644 index 00000000..0b7b82af --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffInforOnMouse.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5896c2d4f0601e346bf36f2fe9629329 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffNode.cs new file mode 100644 index 00000000..5b2b536b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffNode.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class BuffNode : MonoBehaviour +{ + public string buffName;//名字 + public string buffInfor;//简介 + public string buffValue;//层数 + public Sprite buffIcon;//图片 + + +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffNode.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffNode.cs.meta new file mode 100644 index 00000000..b6b9ef50 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bba8982995f7d334a98ab71ea6c1b915 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffTipNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffTipNode.cs new file mode 100644 index 00000000..19b4e6c1 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffTipNode.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +public class BuffTipNode : MonoBehaviour +{ + public Image image; + public Text inforText; + public Text valueText; + + public void SetUpTip(Sprite buffIcon,string buffName ,string buffValue) + { + image.sprite = buffIcon; + //inforText.text = buffInfor; + inforText.text = BuffDataManager.Instance.NameToInforText(buffName); + valueText.text = buffValue; + + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffTipNode.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffTipNode.cs.meta new file mode 100644 index 00000000..c83a69a5 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffTipNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 97e04e00e32104349ad2db7e195ee93f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInfroBarManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInfroBarManager.cs index 5acfbe41..254891cd 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInfroBarManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInfroBarManager.cs @@ -11,6 +11,12 @@ public class CardInfroBarManager : Singleton public GameObject InforBarTipPrefab; [Header("信息面板内条目列表")] public List InforBarTipList= new List (); + [Header("Buff信息面板")] + public GameObject buffInforBar; + [Header("Buff信息面板内条目预制体")] + public GameObject buffInforBarTipPrefab; + [Header("Buff信息面板内条目列表")] + public List buffInforBarTipList = new List(); void Start() { DontDestroyOnLoad(this.gameObject); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/RegisteInforPanle.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/RegisteInforPanle.cs index 627c619a..e152c105 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/RegisteInforPanle.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/RegisteInforPanle.cs @@ -4,8 +4,29 @@ using UnityEngine; public class RegisteInforPanle : MonoBehaviour { + public InforPanleType inforPanleType; + public enum InforPanleType + { + card, + buff, + relic + } + private void Start() { - CardInfroBarManager.Instance.InforBar = this.gameObject; + switch (inforPanleType) + { + case InforPanleType.card: + CardInfroBarManager.Instance.InforBar = this.gameObject; + break; + case InforPanleType.buff: + CardInfroBarManager.Instance.buffInforBar = this.gameObject; + break; + case InforPanleType.relic: + // CardInfroBarManager.Instance.buffInforBar = this.gameObject; + break; + } + + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs index b2a9f267..b31bf801 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs @@ -4,6 +4,11 @@ using UnityEngine; using UnityEngine.UI; public class EnemyActionAction_Aoe : EnemyAction { + public override void SettleText(EnemyNode enemyNode, Text attackDamageText, Text stateText) + { + attackDamageText.text = (enemyNode.EnemyState.damage * enemyNode.EnemyState.damageMultiplier).ToString(); + stateText.text = "这个敌人将会造成" + attackDamageText.text + "点范围伤害。"; + } public override void AttackRange(EnemyNode enemyNode) { AoeAttackRange(enemyNode); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_DeBuff.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_DeBuff.cs index 3bad9664..7a981b12 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_DeBuff.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_DeBuff.cs @@ -7,7 +7,7 @@ public class EnemyActionAction_DeBuff : EnemyAction { public override void SettleText(EnemyNode enemyNode, Text attackDamageText ,Text stateText) { - attackDamageText.text = "?"; + attackDamageText.text = ""; stateText.text = "这个敌人将施加负面效果"; } public override EnemyAction NewAction() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Random.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Random.cs index 3c9802d8..ca89d80c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Random.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Random.cs @@ -8,7 +8,7 @@ public class EnemyActionAction_Random : EnemyAction public override void SettleText(EnemyNode enemyNode, Text attackDamageText, Text stateText) { - attackDamageText.text = "?"; + attackDamageText.text = ""; stateText.text = "这个敌人的行动无法预测"; } public override EnemyAction NewAction() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shield.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shield.cs index c2661a90..d510069d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shield.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shield.cs @@ -8,7 +8,7 @@ public class EnemyActionAction_Shield : EnemyAction public override void SettleText(EnemyNode enemyNode, Text attackDamageText, Text stateText) { - attackDamageText.text = (enemyNode.EnemyState.upShieldValue).ToString(); + attackDamageText.text = ""; stateText.text = "这个敌人将增加" + attackDamageText.text + "点护盾"; } public override EnemyAction NewAction() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shoot.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shoot.cs index a4117088..f4333da0 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shoot.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shoot.cs @@ -5,6 +5,11 @@ using UnityEngine.UI; public class EnemyActionAction_Shoot : EnemyAction { + public override void SettleText(EnemyNode enemyNode, Text attackDamageText, Text stateText) + { + attackDamageText.text = (enemyNode.EnemyState.damage * enemyNode.EnemyState.damageMultiplier).ToString(); + stateText.text = "这个敌人将会造成" + attackDamageText.text + "点伤害。" ; + } public override void AttackRange(EnemyNode enemyNode) { ShootAttackRange(enemyNode); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_UpBuff.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_UpBuff.cs index 6c1f7572..6013037c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_UpBuff.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_UpBuff.cs @@ -7,7 +7,7 @@ public class EnemyActionAction_UpBuff :EnemyAction { public override void SettleText(EnemyNode enemyNode, Text attackDamageText,Text stateText) { - attackDamageText.text = "?"; + attackDamageText.text = ""; stateText.text = "这个敌人将施加强化效果"; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_AttackAndShield.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_AttackAndShield.cs index 860a2289..cf4d55b2 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_AttackAndShield.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_AttackAndShield.cs @@ -1,9 +1,14 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; - +using UnityEngine.UI; public class EnemyAction_AttackAndShield : EnemyAction { + public override void SettleText(EnemyNode enemyNode, Text attackDamageText, Text stateText) + { + attackDamageText.text = (enemyNode.EnemyState.damage * enemyNode.EnemyState.damageMultiplier).ToString(); + stateText.text = "这个敌人将会造成" + attackDamageText.text + "点伤害。" + "这个敌人将会移动" + (enemyNode.getStepRange()).ToString() + "个格子。"; + } public override EnemyAction NewAction() { EnemyAction action = new EnemyAction_AttackAndShield(); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_ShootAndPollute.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_ShootAndPollute.cs index 10fc33c0..c183899c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_ShootAndPollute.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_ShootAndPollute.cs @@ -1,9 +1,14 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; - +using UnityEngine.UI; public class EnemyAction_ShootAndPollute : EnemyAction { + public override void SettleText(EnemyNode enemyNode, Text attackDamageText, Text stateText) + { + attackDamageText.text = (enemyNode.EnemyState.damage * enemyNode.EnemyState.damageMultiplier).ToString(); + stateText.text = "这个敌人将会造成" + attackDamageText.text + "点伤害。" + "这个敌人将会污染格子格子。"; + } public override void AttackRange(EnemyNode enemyNode) { ShootAttackRange(enemyNode); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyUIBar.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyUIBar.cs index 344b5349..2738acc4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyUIBar.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyUIBar.cs @@ -29,8 +29,8 @@ public class EnemyUIBar : MonoBehaviour [Header("计数标量")] public float time; float lastTime=0; - - + [Header(" BuffInforOnMouse")] + public BuffInforOnMouse buffInforOnMouse; private void Update() { HPBar.fillAmount = enemyNode .EnemyState .currentHP /enemyNode .EnemyState .maxHP; @@ -103,7 +103,7 @@ public class EnemyUIBar : MonoBehaviour Destroy(icon); } buffIconList.Clear(); - + buffInforOnMouse.buffNodeList.Clear(); //再刷新 foreach (var key in EnemyState.abnormalCondition.Keys.ToList()) { @@ -111,6 +111,14 @@ public class EnemyUIBar : MonoBehaviour { var buff = Instantiate(buffIcon, buffPanle.transform); EnemyState.abnormalCondition[key].EnemyUIShow(buff, key, enemyNode); + + //装配buffNode + BuffNode buffNode = buff.GetComponent(); + buffNode.buffName = key; + buffNode.buffValue = EnemyState.abnormalCondition[key].value.ToString(); + buffNode.buffIcon = buff.transform.GetComponent().sprite; + buffInforOnMouse.buffNodeList.Add(buffNode); + buffIconList.Add(buff); } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs index c5947bff..aef99990 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs @@ -58,4 +58,15 @@ public class BuffDataManager : Singleton } return null; } + + public string NameToInforText(string buffName) + { + switch (buffName ) + { + case CardFunction.vulnerable: + return "受到的伤害增加50%,持续x回合"; + + } + return " "; + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs index 2341c318..e303f5a8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs @@ -46,7 +46,9 @@ public class Usermanager : Singleton public bool coma; public bool sleep; public bool canAction; - + [Header("BuffInforOnMouse")] + public BuffInforOnMouse buffInforOnMouse; + public BuffInforOnMouse buffInforOnMouseInStatus; public Usermanager(int health) { Health = health; @@ -347,7 +349,7 @@ public class Usermanager : Singleton Destroy(icon); } buffIconList.Clear(); - + buffInforOnMouse.buffNodeList.Clear(); //再刷新 foreach (var key in playerAbnormalCondition.Keys.ToList()) { @@ -355,6 +357,13 @@ public class Usermanager : Singleton { var buff = Instantiate(buffIcon, buffPanle.transform); playerAbnormalCondition[key].UIShow(buff, key); + + //装配buffNode + BuffNode buffNode = buff .GetComponent(); + buffNode.buffName = key; + buffNode.buffValue = playerAbnormalCondition[key].value.ToString (); + buffNode.buffIcon = buff.transform.GetComponent().sprite; + buffInforOnMouse.buffNodeList.Add(buffNode); buffIconList.Add(buff); } @@ -366,7 +375,7 @@ public class Usermanager : Singleton Destroy(icon); } buffIconListInPlayerPanel.Clear(); - + buffInforOnMouseInStatus.buffNodeList.Clear(); //再刷新 foreach (var key in playerAbnormalCondition.Keys.ToList()) { @@ -374,6 +383,13 @@ public class Usermanager : Singleton { var buff = Instantiate(buffIconInPlayerPanel, buffPanleInPlayerPanel .transform); playerAbnormalCondition[key].UIShow(buff, key); + + //装配buffNode + BuffNode buffNode = buff.GetComponent(); + buffNode.buffName = key; + buffNode.buffValue = playerAbnormalCondition[key].value.ToString(); + buffNode.buffIcon = buff.transform.GetComponent().sprite; + buffInforOnMouseInStatus.buffNodeList.Add(buffNode); buffIconListInPlayerPanel.Add(buff); }