diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffInforTip.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffInforTip.prefab index 679c69f6..94f54f7d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffInforTip.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffInforTip.prefab @@ -162,8 +162,8 @@ RectTransform: 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_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 3704654265581629033} - {fileID: 6246507384177836118} @@ -213,7 +213,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 7 + m_PixelsPerUnitMultiplier: 0.05 --- !u!114 &7438723330654741663 MonoBehaviour: m_ObjectHideFlags: 0 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 9d499c5c..aa6194ca 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab @@ -113,12 +113,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5896c2d4f0601e346bf36f2fe9629329, type: 3} m_Name: m_EditorClassIdentifier: - inforBar: {fileID: 0} - point: {fileID: 5464646678957139971} - offSet: {x: 0, y: 0, z: 0} + inforBar: {fileID: 6280927403896533333} + inforBarPosTransform: {fileID: 7821102608491960482} + offSet: {x: -1.2, y: -0.8, z: 0} buffNodeList: [] - layoutGroup: {fileID: 0} - textAnchor: 0 --- !u!1 &221578480655655393 GameObject: m_ObjectHideFlags: 0 @@ -273,41 +271,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 ---- !u!1 &290475609920841743 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5464646678957139971} - m_Layer: 10 - m_Name: BuffInforPoint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5464646678957139971 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 290475609920841743} - 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: 249919684828638365} - 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.431, y: 1.243} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &347439106986302337 GameObject: m_ObjectHideFlags: 0 @@ -500,6 +463,7 @@ RectTransform: - {fileID: 5149080690304349511} - {fileID: 2636589020202218253} - {fileID: 7821102608491960482} + - {fileID: 7278022356683466379} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -602,6 +566,7 @@ MonoBehaviour: sheildFlash: {fileID: 6953056437515368525} planPanle: {fileID: 680696555364769109} planInforText: {fileID: 6968249584613984229} + planPanlePos: {fileID: 7278022356683466379} --- !u!65 &6055812006071397122 BoxCollider: m_ObjectHideFlags: 0 @@ -1332,6 +1297,106 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6280927403896533333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1031929257533195894} + - component: {fileID: 4145312844300131373} + - component: {fileID: 3468691288230923997} + - component: {fileID: 5159424879509153725} + m_Layer: 0 + m_Name: buffInforPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1031929257533195894 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6280927403896533333} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.012, y: 0.012, z: 0.012} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 249919684828638365} + 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.656, y: 0.992} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4145312844300131373 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6280927403896533333} + m_CullTransparentMesh: 1 +--- !u!114 &3468691288230923997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6280927403896533333} + 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!114 &5159424879509153725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6280927403896533333} + 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: -150, y: -45} + m_Constraint: 2 + m_ConstraintCount: 4 --- !u!1 &6587967682901428189 GameObject: m_ObjectHideFlags: 0 @@ -1503,6 +1568,37 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8111082982440911050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7278022356683466379} + m_Layer: 0 + m_Name: PlanInforPos + m_TagString: Untagged + m_Icon: {fileID: 7174288486110832750, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7278022356683466379 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8111082982440911050} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.87, y: 1.84, z: 0.18} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3373168338813219461} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8426581855035409240 GameObject: m_ObjectHideFlags: 0 @@ -1612,7 +1708,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5325467856006033053} - - {fileID: 5464646678957139971} + - {fileID: 1031929257533195894} m_Father: {fileID: 3373168338813219461} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeBlack.mat b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeBlack.mat index 5f023caa..37d1e426 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeBlack.mat +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeBlack.mat @@ -31,7 +31,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 3002 stringTagMap: RenderType: Transparent disabledShaderPasses: @@ -119,7 +119,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueOffset: 0 + - _QueueOffset: 2 - _ReceiveShadows: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeBule.mat b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeBule.mat index 14df5379..58016959 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeBule.mat +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeBule.mat @@ -31,7 +31,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 3002 stringTagMap: RenderType: Transparent disabledShaderPasses: @@ -119,7 +119,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueOffset: 0 + - _QueueOffset: 2 - _ReceiveShadows: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeGreen.mat b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeGreen.mat index 4427a82a..d00f28a1 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeGreen.mat +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeGreen.mat @@ -32,7 +32,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 3002 stringTagMap: RenderType: Transparent disabledShaderPasses: @@ -120,7 +120,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueOffset: 0 + - _QueueOffset: 2 - _ReceiveShadows: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeRed.mat b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeRed.mat index 8424c0c1..52b166c6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeRed.mat +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeRed.mat @@ -32,7 +32,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 3002 stringTagMap: RenderType: Transparent disabledShaderPasses: @@ -120,7 +120,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueOffset: 0 + - _QueueOffset: 2 - _ReceiveShadows: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeRedWhite.mat b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeRedWhite.mat index ead12866..74e35931 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeRedWhite.mat +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/CastPreRangeRedWhite.mat @@ -32,7 +32,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 3002 stringTagMap: RenderType: Transparent disabledShaderPasses: @@ -120,7 +120,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueOffset: 0 + - _QueueOffset: 2 - _ReceiveShadows: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/EnemyColour.mat b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/EnemyColour.mat index a78fefd1..b0703cc3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/EnemyColour.mat +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/EnemyColour.mat @@ -16,7 +16,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2001 + m_CustomRenderQueue: 2002 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -102,7 +102,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueOffset: 1 + - _QueueOffset: 2 - _ReceiveShadows: 1 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab index bb478c9b..38e8f06d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab @@ -312,12 +312,14 @@ MonoBehaviour: cubeR: 0 canChange: 1 compalte: 0 - influenced: 0 - infHighLight: 0 + effectInfluenced: 0 + castRangeInf: 0 + stepInfluenced: 0 markInfluenced: 0 aoeInfluenced: 0 - playerMark: {fileID: 8781005840710497347} - highLightMark: {fileID: 8361859619082391464} + effectMark: {fileID: 8781005840710497347} + stepRangeMark: {fileID: 8361859619082391464} + castRangeMark: {fileID: 3050862533273502844} enemyInfMark: {fileID: 6124836568472427169} aoeMake: {fileID: 3764244817995401500} red: {fileID: 2100000, guid: 876d1c111d915ca45b7304b41dcc1060, type: 2} @@ -497,7 +499,7 @@ GameObject: - component: {fileID: 8781005840710497347} - component: {fileID: 1588156821486986797} m_Layer: 0 - m_Name: PlayerInf + m_Name: PlayerInfMark m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -922,7 +924,7 @@ GameObject: - component: {fileID: 8361859619082391464} - component: {fileID: 8773676662435128278} m_Layer: 0 - m_Name: infHighLight + m_Name: StepRangeMark m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -971,7 +973,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 7d9328d5c1fdb3a47bf6791baa1726d9, type: 2} + - {fileID: 2100000, guid: 2ec9a21f0a6530249b852e4deea04d31, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1972,6 +1974,102 @@ Transform: - {fileID: 4516184787307417991} m_Father: {fileID: 4579690416932963536} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7002642649024796812 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7222066115512037505} + - component: {fileID: 4455663630552303289} + - component: {fileID: 3050862533273502844} + - component: {fileID: 4757633318606095356} + m_Layer: 0 + m_Name: CastRangeMark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7222066115512037505 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7002642649024796812} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.21144} + m_LocalScale: {x: 1, y: 1, z: 0.03890773} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4579690416932963536} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4455663630552303289 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7002642649024796812} + m_Mesh: {fileID: -5468021829708598221, guid: ae332737a5755ee499c32f566d3a2913, type: 3} +--- !u!23 &3050862533273502844 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7002642649024796812} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7d9328d5c1fdb3a47bf6791baa1726d9, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &4757633318606095356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7002642649024796812} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 043f286664f900c44a3e6e06130a9ac5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7193311182764678611 GameObject: m_ObjectHideFlags: 0 @@ -2371,6 +2469,7 @@ Transform: m_Children: - {fileID: 5510486009783351286} - {fileID: 7892340080281178766} + - {fileID: 7222066115512037505} - {fileID: 8900614378456229163} - {fileID: 3762100914476649762} - {fileID: 1907971066537205495} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PlayerColour.mat b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PlayerColour.mat index 2e643f7f..d5b59182 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PlayerColour.mat +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PlayerColour.mat @@ -18,7 +18,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 3001 stringTagMap: RenderType: Transparent disabledShaderPasses: @@ -106,7 +106,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueOffset: 0 + - _QueueOffset: 1 - _ReceiveShadows: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PlayerStepMark.mat b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PlayerStepMark.mat new file mode 100644 index 00000000..8bb2bf53 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PlayerStepMark.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerStepMark + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3001 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + 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} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 1 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.08627453, g: 0.77254903, b: 0.70487916, a: 0.7490196} + - _Color: {r: 0.0862745, g: 0.77254903, b: 0.70487916, a: 0.7490196} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &5999080594394386120 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PlayerStepMark.mat.meta similarity index 52% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill.meta rename to ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PlayerStepMark.mat.meta index 86a13d8e..c01d7e56 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill.meta +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PlayerStepMark.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: c3f33c18d92e4c142aa468b5e2448cf6 -folderAsset: yes -DefaultImporter: +guid: 2ec9a21f0a6530249b852e4deea04d31 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/attackHightLIght.mat b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/attackHightLIght.mat index a5fb3e52..9c784b93 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/attackHightLIght.mat +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/attackHightLIght.mat @@ -32,7 +32,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3001 + m_CustomRenderQueue: 3003 stringTagMap: RenderType: Transparent disabledShaderPasses: @@ -120,7 +120,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueOffset: 1 + - _QueueOffset: 3 - _ReceiveShadows: 1 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/EffectCardIcon/死亡印记.jpg b/ColorlessWorld-2024-4-2/Assets/Resources/EffectCardIcon/死亡印记.jpg deleted file mode 100644 index 2854b93c..00000000 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/EffectCardIcon/死亡印记.jpg and /dev/null differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/EffectCardIcon/死亡印记.png b/ColorlessWorld-2024-4-2/Assets/Resources/EffectCardIcon/死亡印记.png new file mode 100644 index 00000000..360b136a Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/EffectCardIcon/死亡印记.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/EffectCardIcon/死亡印记.jpg.meta b/ColorlessWorld-2024-4-2/Assets/Resources/EffectCardIcon/死亡印记.png.meta similarity index 97% rename from ColorlessWorld-2024-4-2/Assets/Resources/EffectCardIcon/死亡印记.jpg.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/EffectCardIcon/死亡印记.png.meta index 16436733..b41cb708 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/EffectCardIcon/死亡印记.jpg.meta +++ b/ColorlessWorld-2024-4-2/Assets/Resources/EffectCardIcon/死亡印记.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b702d38a648481749986d7bc83cdb97d +guid: fe11210fbebd931409b4414647dc0ff7 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 083722b8..15dd0d47 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -571,11 +571,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: inforBar: {fileID: 0} - point: {fileID: 0} + inforBarPosTransform: {fileID: 0} offSet: {x: 1.2, y: 0, z: 0.3} buffNodeList: [] - layoutGroup: {fileID: 0} - textAnchor: 6 --- !u!1 &20402335 GameObject: m_ObjectHideFlags: 0 @@ -13584,11 +13582,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: inforBar: {fileID: 0} - point: {fileID: 0} + inforBarPosTransform: {fileID: 0} offSet: {x: 0, y: 0, z: 0} buffNodeList: [] - layoutGroup: {fileID: 0} - textAnchor: 0 --- !u!1 &368102274 GameObject: m_ObjectHideFlags: 0 @@ -33422,16 +33418,15 @@ MonoBehaviour: startPositionX: 1 startPositionY: 1 chooseNodeLayerMask: - serializedVersion: 2 m_Bits: 64 playerLayerMask: - serializedVersion: 2 m_Bits: 192 movePath: [] anim: {fileID: 1148506001} speed: 2 arrowInMap: {fileID: 1971171990} latestMapUnity: {fileID: 0} + isRefresh: 0 stepIconCount: -1 StepIconFather: {fileID: 1259659850} stepIconPrefab: {fileID: 5159667013927544512, guid: ca425697306c5a941b283345d04e8f26, @@ -35473,9 +35468,6 @@ MonoBehaviour: textShieldValue: {fileID: 197140187} HpBar: {fileID: 743691082} playerHPinUpUI: {fileID: 1087486309} - servantOn: {fileID: 0} - servant: {fileID: 1202010108} - servantState: {fileID: 0} playerBoundary: -1 enemyBoundary: 15 Red: {fileID: 1848107657} @@ -55955,8 +55947,10 @@ MonoBehaviour: speed: 0.003 destination: {x: 0, y: 0, z: 0} aimLayerMask: - serializedVersion: 2 m_Bits: 64 + id: 15 + material: {fileID: 0} + offset: {x: 0, y: 0} --- !u!1 &1974423746 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffInforOnMouse.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffInforOnMouse.cs index 5b7084d1..f48391fb 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffInforOnMouse.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/BuffNode/BuffInforOnMouse.cs @@ -9,27 +9,28 @@ public class BuffInforOnMouse : MonoBehaviour bool isShow; [Header("Ϣ")] public GameObject inforBar; - [Header("ʼλ")] - public Transform point; + [Header("Ϣλ")] + public Transform inforBarPosTransform; [Header("ƫ")] public Vector3 offSet; [Header("buffNode")] public List buffNodeList = new List(); - [Header("Ű")] - public LayoutGroup layoutGroup; - public TextAnchor textAnchor; + // [Header("Ű")] + // public LayoutGroup layoutGroup; + // public TextAnchor textAnchor; public void ShowBuffInfor() { - inforBar = CardInfroBarManager.Instance.buffInforBar; - layoutGroup = inforBar.GetComponent(); - layoutGroup.childAlignment = textAnchor; + //inforBar = CardInfroBarManager.Instance.buffInforBar; + // layoutGroup = inforBar.GetComponent(); + // layoutGroup.childAlignment = textAnchor; inforBar.SetActive(true); //ͬλ /* // inforBar.transform.position = transform.position + offSet; Vector3 mousePos = Input.mousePosition; Vector3 worldPos = Camera.main.ScreenToWorldPoint(new Vector3(mousePos.x, mousePos.y, 7));//λ inforBar.transform.position = worldPos + offSet;*/ - inforBar.transform.position = point.position + offSet; + inforBar.transform.position = inforBarPosTransform.position ; + inforBar.transform.localPosition += offSet; //ɾǰĿ foreach (var tip in CardInfroBarManager.Instance.buffInforBarTipList) { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs index 4f43a689..33c37e53 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs @@ -41,8 +41,6 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag PointerEventData eventData; List result = new List(); - public bool ready;//Ƿѵͷλ - [Header("")] public List castingPool;//ƴΧ @@ -71,20 +69,6 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag private void Update() { handleRightClickCancel(); - - - /*if (dragState != CardDragState.noDrag && dragState != CardDragState.onDrag) - { - //UI߼ - eventData.position = Mouse.current.position.value; - - eventSystem.RaycastAll(eventData, result); - if (result.Count > 0) - { - Debug.Log(result[0].gameObject.name); - } - }*/ - if (GameManager.Instance.onDraw ==false &&TurnMaster .Instance .servantAction != TurnMaster.ServantAction.useSkill ) { switch (dragState) @@ -140,7 +124,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag break; case CardDragState.onDrag: CardFollow(); - if (Mouse.current.leftButton.wasReleasedThisFrame && ready) + if (Mouse.current.leftButton.wasReleasedThisFrame) { dragState = CardDragState.onEndDrag; } @@ -220,8 +204,6 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag return; } - dyeing(); - eventData.position = Mouse.current.position.value; eventSystem.RaycastAll(eventData, result); @@ -264,10 +246,6 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag transform.position = eventDataWorld; } }*/ - if (ready == false) - { - ready = true; - } // transform.localPosition = cardOnMouseEnter.originPoint;// + new Vector3(0, 30, 0); //cardOnMouseEnter.StartCoroutine(cardOnMouseEnter.MoveComeBack()); // transform.localScale = new Vector3(1, 1, 1); @@ -482,18 +460,17 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag //ΧԤӰɫ foreach (MapUnity mapUnity in MapUnityManager.Instance.castPool) { - mapUnity.influenced = false; + mapUnity.castRangeInf = false; } MapUnityManager.Instance.castPool.Clear(); //Ӱرɫ foreach (MapUnity mapUnity in cardEntity.influencePreviewPool) { - mapUnity.influenced = false; + mapUnity.effectInfluenced = false; } cardEntity.influencePreviewPool.Clear(); - ready = false; GameManager.Instance.onDrag = false; dragState = CardDragState.noDrag; @@ -549,7 +526,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag { foreach (MapUnity mapUnity in cardEntity.influencePreviewPool) { - mapUnity.influenced = false; + mapUnity.effectInfluenced = false; } cardEntity.influencePreviewPool.Clear(); @@ -559,18 +536,20 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag setCastingRangePreview(); //ԤӰ췶Χ - if (currentNode.influenced) + if (currentNode.castRangeInf) { //ݿԸıӰ Vector3 face = currentNode.transform.position - GameManager.Instance.playerOn.transform.position; float euler = Vector3.SignedAngle(-GameManager.Instance.playerOn.transform.forward, face, GameManager.Instance.playerOn.transform.up) + 180; getNodeTools.setEffectRangePreviewTest(cardEntity.cardOriginalData, euler, currentNode,cardEntity); + //ʾΧ + dyeing(); //setEffectRangePreview(cardEntity.cardOriginalData.EffectRange, euler, currentNode); //influencePreviewPool.Add(currentNode); //ͿɫԤ - // SettlementManager.Instance.PreviewSwitchColor(cardEntity.cardOriginalData, currentNode); + // SettlementManager.Instance.PreviewSwitchColor(cardEntity.cardOriginalData, currentNode); //µؿ(ɫԤ) SettlementManager.Instance.PreviewColorMapUnity(cardEntity.cardOriginalData, currentNode); } @@ -612,7 +591,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag } foreach (MapUnity mapUnity in MapUnityManager.Instance.castPool) { - mapUnity.influenced = false; + mapUnity.castRangeInf = false; } MapUnityManager.Instance.castPool.Clear(); if (cardEntity.cardOriginalData.TrueFunctionVal.ContainsKey(CardFunction.infCastRange)) @@ -654,6 +633,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag //getNodeTools.setEffectRangePreview(cardEntity.cardOriginalData.EffectRange, 30.0f, currentNode, cardEntity); MapUnity mapUnity=GameManager.Instance.playerOn; getNodeTools.setEffectRangePreviewTest(cardEntity.cardOriginalData, 90.0f, mapUnity, cardEntity); + dyeing(); //Ч÷ΧڹѪ EnemyManager.Instance.ShowExpHp_Observer(cardEntity.influencePreviewPool); //Ϳɫʺ͵ؿͳԤ @@ -669,10 +649,10 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag { //Ӱرɫ foreach (MapUnity mapUnity in cardEntity.influencePreviewPool) - { - mapUnity.PlayerInfluenced(cardEntity.influencePreviewPool); + { + mapUnity.EffectInfluenced(cardEntity.influencePreviewPool); // mapUnity.playerMark.meshRenderer .material = mapUnity.castPreRange; - } + } } @@ -702,7 +682,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag //жϸÿƵǷҪΧ if (cardEntity.cardOriginalData.CastingRange != 0) { - if(currentNode != null&& currentNode.influenced) + if(currentNode != null&& currentNode.castRangeInf) { //ͷЧ yield return StartCoroutine(cardEntity.settle(0,currentNode)); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs index a19c3843..41f3f8d2 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs @@ -268,7 +268,7 @@ public class CardEntity : MonoBehaviour //Ӱرɫ foreach (MapUnity mapUnity in influencePreviewPool) { - mapUnity.influenced = false; + mapUnity.effectInfluenced = false; } GameManager.Instance.SyncColourCountUI(); //Ч @@ -280,7 +280,7 @@ public class CardEntity : MonoBehaviour foreach (MapUnity mapUnity in MapUnityManager.Instance.castPool) { - mapUnity.influenced = false; + mapUnity.castRangeInf = false; } MapUnityManager.Instance.castPool.Clear(); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardSmall/CardSmall.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardSmall/CardSmall.cs index 0482abad..55800f45 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardSmall/CardSmall.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardSmall/CardSmall.cs @@ -110,7 +110,6 @@ public class CardSmall : MonoBehaviour } public void SetDestination(GameObject gameObject, string ID ) { - cardID = ID; lineRender = GetComponent(); mainCaera = GameManager.Instance.mainCamera; @@ -122,8 +121,10 @@ public class CardSmall : MonoBehaviour //speed = 12f; StartCoroutine(moveCardFollowLineWithToUsedCard()); } - public void SetDestinationWithDrawCard(Vector3 endPoint) - { + public void SetDestinationWithDrawCard(Vector3 endPoint,string ID) + { + TurnMaster.Instance.lastDrawCardId = ID; + cardID = ID; mainCaera = GameManager.Instance.mainCamera; lineStart = transform.InverseTransformPoint( TurnMaster.Instance.cardDeckNumberText.transform.position) ; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs index 50e22718..74fb7d25 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs @@ -28,7 +28,8 @@ public class TurnMaster : Singleton public int settleTurn = 0; public int commDrawCardsNum = 1; - + [Header("һų鵽Ŀid")] + public string lastDrawCardId; [Header("ٿӳٽغ")] public bool continueTurn; @@ -102,15 +103,7 @@ public class TurnMaster : Singleton ResetLegacy(); //ָ - GameManager.Instance.playerState.currentStepRange = Usermanager.Instance.StepRangeCalculation(GameManager.Instance.playerState.maxStepRange); - //жǷʹħн - if(ServentStateManager .Instance .servantState != null ) - { - //ָ - RecoverServantResource(); - //Ӽܽ - SettleCoolDownSkill(); - } + GameManager.Instance.playerState.currentStepRange = Usermanager.Instance.StepRangeCalculation(GameManager.Instance.playerState.maxStepRange); //ʾ˹ EnemyManager.Instance.EnemyLine_Observer(); //ظϵ @@ -129,9 +122,7 @@ public class TurnMaster : Singleton //ؿBuff(ɫؿ) MapUnitySettleManager.Instance.MapGridsBeginSettle(); //㲥ӿ - LegacyManager.Instance.BroadCastSettleInPlayerTurnEnd(); - //رӵļUI - CloseSkillUI(); + LegacyManager.Instance.BroadCastSettleInPlayerTurnEnd(); //غϽbuff Usermanager.Instance.PlayerTurnSettle(); //˻ @@ -235,50 +226,12 @@ public class TurnMaster : Singleton EnemyManager.Instance.enemyTurnState = EnemyManager.EnemyTurnState.end; turn = Turn.enemyTurnEnd; } - - // - public void RecoverServantResource() - { - GameManager.Instance.servantState.currentStepRange = GameManager.Instance.servantState.maxStepRange; - } - + public void ResetLegacy() { LegacyManager.Instance.tryResetCount(Name.Legacy.LegacyNode_LightningBoots); } - public void CloseSkillUI() - { - GameManager.Instance.servant .SkillUI.SetActive(false); - } - //Ӽȴ - public void SettleCoolDownSkill() - { - List skillList =GameManager.Instance.servant.skillList; - foreach (Servant.ServantSkill skill in skillList) - { - if(skill.currentStorageTimes0) - { - skill.currentCoolDown--; - GameManager.Instance.servant.skillNodeList[skill.effectIndex].coolDownText.text=skill .currentCoolDown .ToString (); - } - - if (skill.currentCoolDown <= 0) - { - skill.currentCoolDown = skill .coolDown; - skill.currentStorageTimes++; - } - } - - if(skill .currentStorageTimes >0) - { - GameManager.Instance.servant.skillNodeList[skill.effectIndex].GetComponent ().sprite = skill.Icon; - GameManager.Instance.servant.skillNodeList[skill.effectIndex].coolDownText.gameObject.SetActive(false); - } - } - } - + //ϵдĺ public void restoreResource(int settleTurn) { @@ -458,7 +411,9 @@ public class TurnMaster : Singleton yield return new WaitForSeconds(0.1f); } + Debug.Log("жϵ`3"); yield return CardActiveSort.Instance.StartCoroutine(CardActiveSort.Instance.ReflashCardPointWithDrawCards()); + Debug.Log("жϵ`4"); yield break; } @@ -470,39 +425,19 @@ public class TurnMaster : Singleton int handCardCount = handCard.cardEntityList.Count; int actualCardsToDraw = Mathf.Min(handCard.maxHandCard - handCardCount, drawNum); - CardActiveSort.Instance.drawCardCount = actualCardsToDraw; + CardActiveSort.Instance.drawCardCount += actualCardsToDraw; yield return CardActiveSort.Instance.StartCoroutine(CardActiveSort.Instance.SortOldCardPointWithDrawCards()); - Debug.Log("鿨1"); - for (int i = handCardCount; i < handCardCount + actualCardsToDraw; i++) - { - if (cardDeck.cardList.Count > 0) - { - createCard(i); - } - else if (usedCard.usedCardList.Count > 0) - { - //ϴƼ - for (int c = 0; c < usedCard.usedCardList.Count; c++) - { - cardDeck.cardList.Add(usedCard.usedCardList[c]); - cardDeck.cardList.Shuffle(); - } - usedCard.usedCardList.Clear(); + DrawCardWithID(handCardCount+1, lastDrawCardId); - createCard(i); - } - yield return new WaitForSeconds(0.1f); - } - - - //yield return StartCoroutine(CardActiveSort.Instance.ReflashCardPointWithDrawCards()); - yield return StartCoroutine(copyNewestCard()); - CardActiveSort.Instance.ReflashCardPoint(); + yield return new WaitForSeconds(0.1f); + Debug.Log("жϵ`1"); + yield return CardActiveSort.Instance.StartCoroutine(CardActiveSort.Instance.ReflashCardPointWithDrawCards()); + Debug.Log("жϵ`2"); yield break; } - public IEnumerator copyNewestCard() + /* public IEnumerator copyNewestCard() { int handCardCount = handCard.cardEntityList.Count; @@ -515,7 +450,7 @@ public class TurnMaster : Singleton yield return CardActiveSort.Instance.StartCoroutine(CardActiveSort.Instance.ReflashCardPointWithDrawCards()); yield break; - } + }*/ public IEnumerator drawDyeingCards(int drawNum) { @@ -690,44 +625,27 @@ public class TurnMaster : Singleton } //ӿƶű CardSmall cardSmall = cardPrefab.AddComponent(); - cardSmall.SetDestinationWithDrawCard(CardActiveSort.Instance.newPointList[i]); + cardSmall.SetDestinationWithDrawCard(CardActiveSort.Instance.newPointList[i],cardEntity .cardId ); } - public void copyCard(int i,string cardId) + public void DrawCardWithID(int i,string cardId)//Σֿλãid { GameObject cardPrefab = PlayerStatsManager.Instance.CreateCardWithID(cardId, i, true, handCard.cardPanle.transform); - // cardPrefab = Instantiate(cardDeck.rareCardPrefab, handCard.cardPanle.transform); - //int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[cardDeck.cardList[cardDeck.cardList.Count - 1]].Rarity; - //cardPrefab = new GameObject(); - /*switch (cardRarity) - { - case Name.CardRarity.Legendary: - cardPrefab = Instantiate(cardDeck.legendaryCardPrefab, handCard.cardPanle.transform); - break; - case Name.CardRarity.Rare: - cardPrefab = Instantiate(cardDeck.rareCardPrefab, handCard.cardPanle.transform); - break; - case Name.CardRarity.Common: - cardPrefab = Instantiate(cardDeck.cardPrefabPuTong, handCard.cardPanle.transform); - break; - }*/ - /* if (cardRarity==Name.CardRarity.Legendary) - { - cardPrefab = Instantiate(cardDeck.legendaryCardPrefab, handCard.cardPanle.transform); - } - else - { - cardPrefab = Instantiate(cardDeck.cardPrefabPuTong, handCard.cardPanle.transform); - }*/ - - // cardPrefab.GetComponent().localEulerAngles = new Vector3(0, 0, 0); CardEntity cardEntity = cardPrefab.GetComponent(); - // cardEntity.createCard(cardId, i, true); - cardDeck.cardList.RemoveAt(cardDeck.cardList.Count - 1); + //cardDeck.cardList.RemoveAt(cardDeck.cardList.Count - 1); handCard.cardEntityList.Add(cardEntity); + if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.nextDrawCardisDisposable)) + { + cardEntity.tempIsDisposable = true; + Usermanager.playerAbnormalCondition[AbnormalCondition.nextDrawCardisDisposable].value -= 1; + if (Usermanager.playerAbnormalCondition[AbnormalCondition.nextDrawCardisDisposable].value <= 0) + { + Usermanager.playerAbnormalCondition.Remove(AbnormalCondition.nextDrawCardisDisposable); + } + } //ӿƶű CardSmall cardSmall = cardPrefab.AddComponent(); - cardSmall.SetDestinationWithDrawCard(CardActiveSort.Instance.newPointList[i]); + cardSmall.SetDestinationWithDrawCard(CardActiveSort.Instance.newPointList[i],cardEntity .cardId ); } public void createCardWithoutMove(int i) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs index 494f1a32..e2a2c6f2 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs @@ -444,7 +444,7 @@ public class EnemyManager : Singleton { if (currentNode.unitPool[0] != null) { - if (currentNode.influenced == false) + if (currentNode.effectInfluenced == false) { influencePreviewPool.Add(currentNode.unitPool[0]); currentNode = currentNode.unitPool[0]; @@ -475,7 +475,7 @@ public class EnemyManager : Singleton { if (currentNode.unitPool[5] != null) { - if (currentNode.influenced == false) + if (currentNode.effectInfluenced == false) { influencePreviewPool.Add(currentNode.unitPool[5]); currentNode = currentNode.unitPool[5]; @@ -506,7 +506,7 @@ public class EnemyManager : Singleton { if (currentNode.unitPool[4] != null) { - if (currentNode.influenced == false) + if (currentNode.effectInfluenced == false) { influencePreviewPool.Add(currentNode.unitPool[4]); currentNode = currentNode.unitPool[4]; @@ -537,7 +537,7 @@ public class EnemyManager : Singleton { if (currentNode.unitPool[3] != null) { - if (currentNode.influenced == false) + if (currentNode.effectInfluenced == false) { influencePreviewPool.Add(currentNode.unitPool[3]); currentNode = currentNode.unitPool[3]; @@ -568,7 +568,7 @@ public class EnemyManager : Singleton { if (currentNode.unitPool[2] != null) { - if (currentNode.influenced == false) + if (currentNode.effectInfluenced == false) { influencePreviewPool.Add(currentNode.unitPool[2]); currentNode = currentNode.unitPool[2]; @@ -599,7 +599,7 @@ public class EnemyManager : Singleton { if (currentNode.unitPool[1] != null) { - if (currentNode.influenced == false) + if (currentNode.effectInfluenced == false) { influencePreviewPool.Add(currentNode.unitPool[1]); currentNode = currentNode.unitPool[1]; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Enemy/EnemyUIBar.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Enemy/EnemyUIBar.cs index 8b81313a..f4438a34 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Enemy/EnemyUIBar.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Enemy/EnemyUIBar.cs @@ -1,11 +1,7 @@ -using System.Collections; using System.Collections.Generic; using UnityEngine; -using UnityEngine.InputSystem; using UnityEngine.UI; using System.Linq; -using System.Xml; -using System; using TMPro; public class EnemyUIBar : MonoBehaviour @@ -42,6 +38,7 @@ public class EnemyUIBar : MonoBehaviour [Header("ͼ")] public GameObject planPanle; public TMP_Text planInforText; + public Transform planPanlePos; private void Update() { @@ -75,14 +72,16 @@ public class EnemyUIBar : MonoBehaviour if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn && GameManager.Instance.onDrag == false) { //ͼʾ - planInforText.text = enemyNode.stateText; - planPanle.SetActive(true); + ShowPlanInfor(); //buffʾ buffInforOnMouse.ShowBuffInfor(); //ʾΧ if (enemyNode.currentActionScript != null) { + //¼㹥Χ + MapUnity currentMapUnity = getNodeTools.LocationToGetNode(enemyNode.positionX, enemyNode.positionY); + EnemyManager.Instance.AttackRangeInfluencedNode(currentMapUnity, enemyNode.EnemyState.attackRange + enemyNode.getStepRange(), enemyNode.rangePool); enemyNode.currentActionScript.ShowAttackRange(enemyNode); if (enemyNode.currentActionScript.isAiming) @@ -96,6 +95,7 @@ public class EnemyUIBar : MonoBehaviour } } + //ͣ private void OnMouseOver() { @@ -135,15 +135,26 @@ public class EnemyUIBar : MonoBehaviour enemyNode.lineAim.SetActive(false); //Ӱرɫ - enemyNode.currentActionScript.FadeAttackRange(enemyNode); - + if (enemyNode != null && enemyNode.currentActionScript!= null) + { + enemyNode.currentActionScript.FadeAttackRange(enemyNode); + } //ͼر planPanle.SetActive(false); //buffر buffInforOnMouse.FadeBuffInfor(); } + //ͼʾ + public void ShowPlanInfor() + { + planInforText.text = enemyNode.stateText; + planPanle.SetActive(true); + Vector3 screenPos = Camera.main.WorldToScreenPoint(planPanlePos .position); + Vector3 worldPos = Camera.main.ScreenToWorldPoint(new Vector3(screenPos.x, screenPos.y, 7));//תͼ꣬λƽ + planPanle.transform.position = worldPos; + } //쳣Buffʾ public void RefreshEnemyBuffIcon() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs index 129eb065..022de778 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs @@ -139,12 +139,12 @@ public class ForgintPointManager : Singleton { if (choosedMapUnity != null) { - choosedMapUnity.influenced = false; + choosedMapUnity.effectInfluenced = false; } // mapUnity.influenced = true; choosedMapUnityPool.Clear(); choosedMapUnityPool.Add(mapUnity); - mapUnity.PlayerInfluenced(choosedMapUnityPool); + mapUnity.EffectInfluenced(choosedMapUnityPool); choosedMapUnity = mapUnity; //ͬUI @@ -184,7 +184,7 @@ public class ForgintPointManager : Singleton { if (choosedMapUnity != null ) { - choosedMapUnity.influenced = false; + choosedMapUnity.effectInfluenced = false; choosedMapUnity = null; } isColorDone = true; @@ -479,7 +479,7 @@ public class ForgintPointManager : Singleton public void ChangeColor(int color) { choosedMapUnity.switchColor(color); - choosedMapUnity.influenced = false; + choosedMapUnity.effectInfluenced = false; colorSelectUI .SetActive (false); // totalCostPoint += nodeInforList[(choosedMapUnity.locationX, choosedMapUnity.locationY)].cost; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs index 6a5e7104..bdbd7937 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs @@ -40,13 +40,6 @@ public class GameManager : Singleton //UIʾѪ public TMP_Text playerHPinUpUI; - - [Header("ʹħǰλò")] - public MapUnity servantOn;//ǰĸ - [Header("ɫ״̬ݲ")] - public Servant servant; - public ServantState_SO servantState;//Ϸʵʹõ - [Header("ɫUI")] public int playerBoundary;//ֳطֽ public int enemyBoundary;//طֽ @@ -118,10 +111,7 @@ public class GameManager : Singleton { //ɽɫ if (PlayerStatsManager.Instance.playerState != null) - playerState = PlayerStatsManager.Instance.playerState; - //ɽɫ - if (ServentStateManager.Instance.servantState != null) - servantState = Instantiate(ServentStateManager.Instance.servantState); + playerState = PlayerStatsManager.Instance.playerState; //ɿյͼб // GenerateEnmptyMapList(); GenerateEnmptyMapListDefault(); @@ -320,7 +310,7 @@ public class GameManager : Singleton { if(currentCardEntity.cardOriginalData.CastingRange != 0) { - if( currentMapNode != null && currentMapNode.influenced == true) + if( currentMapNode != null && currentMapNode.effectInfluenced == true) { } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs index 4d3d9279..4873dd7b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs @@ -23,17 +23,20 @@ public class MapUnity : MonoBehaviour public bool compalte;//ʶ [Header("UIЧΧؼ")] - public bool influenced;//ѡ - bool lastInfluenced; - public bool infHighLight;//ҷ - bool lastInfHighLight; + public bool effectInfluenced;//Ч÷Χ + bool lastEffectInfluenced; + public bool castRangeInf;//Ͷ䷶Χ + bool lastCastRangeInf; + public bool stepInfluenced;//ƶΧԤ + bool lastStepInfluenced; public bool markInfluenced;//˷Χ bool lastMarkInfluenced;//˷Χ public bool aoeInfluenced;//aoe bool lastAoeInfluenced;//aoe - public MeshRenderer playerMark;//ѡм - public MeshRenderer highLightMark;//ƶλñǸ + public MeshRenderer effectMark;//ЧΧ + public MeshRenderer stepRangeMark;//ƶΧԤ + public MeshRenderer castRangeMark;//Ͷ䷶Χ public MeshRenderer enemyInfMark;//ѡи public GameObject aoeMake;//aoe @@ -174,22 +177,29 @@ public class MapUnity : MonoBehaviour void Update() { - if (influenced!= lastInfluenced ) + if (effectInfluenced!= lastEffectInfluenced ) { - lastInfluenced = influenced; - if (influenced == false) + lastEffectInfluenced = effectInfluenced; + if (effectInfluenced == false) { - ClearPlayerInfluenced(); + ClearEffectInfluenced(); } } - if (infHighLight != lastInfHighLight ) + if (stepInfluenced != lastStepInfluenced) { - lastInfHighLight = infHighLight; - if (infHighLight==true ) + lastStepInfluenced = stepInfluenced; + if (stepInfluenced == false) { - ClearHightLightInfluenced(); + ClearStepRangeInfluenced(); + } + } + if (castRangeInf != lastCastRangeInf) + { + lastCastRangeInf = castRangeInf; + if (castRangeInf == false) + { + ClearCastRangeInfluenced(); } - } if (markInfluenced != lastMarkInfluenced) { @@ -209,26 +219,6 @@ public class MapUnity : MonoBehaviour { aoeMake.SetActive(false); } - //Ϳɫɫıɫ - /* if (whoColour == WhoColour.playerColour) - { - colourGameObject.GetComponent().material = plyerColour; - } - else if (whoColour == WhoColour.enemyColour) - { - colourGameObject.GetComponent().material = enemyColour; - } - else if (whoColour == WhoColour.noneColour) - { - colourGameObject.GetComponent().material = noneColour; - }*/ - -/* if (whoColour != beforeWhoColour) - { - RefreshWhoColor(); - }*/ - - // Debug.DrawRay(touchRayStartPoint .position,touchRayStartPoint .right, Color.green ,2f); } public void switchColor(int newColor) @@ -308,23 +298,23 @@ public class MapUnity : MonoBehaviour switch (newColor ) { case 1: - playerMark.material = redPre; + effectMark.material = redPre; colorUnderAttack = newColor; break; case 2: - playerMark.material = whitePre; + effectMark.material = whitePre; colorUnderAttack = newColor; break; case 3: - playerMark.material = bluePre; + effectMark.material = bluePre; colorUnderAttack = newColor; break; case 4: - playerMark.material = greenPre; + effectMark.material = greenPre; colorUnderAttack = newColor; break; case 5: - playerMark.material = blackPre; + effectMark.material = blackPre; colorUnderAttack = newColor; break; } @@ -565,28 +555,37 @@ public class MapUnity : MonoBehaviour #region // - public void PlayerInfluenced(HashSet rangePool) + public void EffectInfluenced(HashSet rangePool) + { + effectInfluenced = true; + effectMark.gameObject .SetActive(true); + ShowMark(rangePool); + } + public void ClearEffectInfluenced() + { + effectMark.gameObject.SetActive(false); + FadeMark(); + } + public void PlayerCastRangeInf(HashSet rangePool) { - influenced = true; - playerMark.gameObject .SetActive(true); - // playerMark.ShowMark(rangePool); + castRangeInf = true; + castRangeMark.gameObject.SetActive(true); ShowMark(rangePool); } - public void ClearPlayerInfluenced() + public void ClearCastRangeInfluenced() { - playerMark.gameObject.SetActive(false); + castRangeMark.gameObject.SetActive(false); FadeMark(); } - public void HightLightInfluenced(HashSet rangePool) + public void StepRangeInfluenced(HashSet rangePool) { - infHighLight = true; - highLightMark .gameObject .SetActive(true); - // highLightMark.ShowMark(rangePool); + stepInfluenced = true; + stepRangeMark.gameObject.SetActive(true); ShowMark(rangePool); } - public void ClearHightLightInfluenced() + public void ClearStepRangeInfluenced() { - highLightMark.gameObject.SetActive(false); + stepRangeMark.gameObject.SetActive(false); FadeMark(); } public void EnemyInfluenced(HashSet rangePool) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs index e996536a..a745c69b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs @@ -6,6 +6,7 @@ using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.UI; using static Name; +using static TurnMaster; public class Player : MonoBehaviour { public int step; @@ -66,7 +67,7 @@ public class Player : MonoBehaviour { if(GameManager .Instance .complete ==true ) { - if (Mouse.current.leftButton.wasPressedThisFrame && TurnMaster.Instance.playerAction != TurnMaster.PlayerAction.useCard && TurnMaster.Instance.playerAction != TurnMaster.PlayerAction.banAction) + if (Mouse.current.leftButton.wasPressedThisFrame &&TurnMaster .Instance .turn == Turn.playerTurn && TurnMaster.Instance.playerAction != TurnMaster.PlayerAction.useCard && TurnMaster.Instance.playerAction != TurnMaster.PlayerAction.banAction) { if (GameManager.Instance.playerState.currentStepRange > 0 && !Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.banStep)) { @@ -79,9 +80,7 @@ public class Player : MonoBehaviour //Ӱرɫ foreach (MapUnity mapUnity in influencePreviewPool) { - mapUnity.PlayerInfluenced(influencePreviewPool); - mapUnity.playerMark.material = mapUnity.red; - + mapUnity.StepRangeInfluenced(influencePreviewPool); } //StepPreviewInfluencedNode(GameManager.Instance.playerState.currentStepRange); TurnMaster.Instance.playerAction = TurnMaster.PlayerAction.move; @@ -199,7 +198,7 @@ public class Player : MonoBehaviour MapUnity mapNode = raycastHit.collider.transform.GetComponent(); //ɫƶ - if (mapNode .influenced &&mapNode .blocked ==false &&mapNode .enemyNode ==null&& mapNode.playerOn == false ) + if (mapNode .stepInfluenced &&mapNode .blocked ==false &&mapNode .enemyNode ==null&& mapNode.playerOn == false ) { //· movePath = AStarManager.Instance.FindPathWithEndNode(GameManager.Instance.playerOn, mapNode); @@ -219,13 +218,13 @@ public class Player : MonoBehaviour if (GameManager.Instance.playerOn != null ) { GameManager.Instance.playerOn.playerOn = false; - GameManager.Instance.playerOn.influenced = false; + GameManager.Instance.playerOn.stepInfluenced = false; } //Ӱرɫ foreach (MapUnity mapUnity in influencePreviewPool) { - mapUnity.influenced = false; + mapUnity.stepInfluenced = false; } influencePreviewPool.Clear(); //رƶ @@ -348,7 +347,7 @@ public class Player : MonoBehaviour //Ӱرɫ foreach (MapUnity mapUnity in influencePreviewPool) { - mapUnity.influenced = false; + mapUnity.stepInfluenced = false; } influencePreviewPool.Clear(); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent.meta deleted file mode 100644 index 4e4cf53c..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1fa9b405ca4e84b468cfd0902f79c50c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent.meta deleted file mode 100644 index a44158e7..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6a532d13c0722bc4591a8e2bff02a70a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs deleted file mode 100644 index 4f6aac51..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs +++ /dev/null @@ -1,194 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Data; -using System.IO; -using UnityEngine; -using UnityEngine.InputSystem; - -public class ServantBottleCat : Servant -{ - [Header ("Դ")] - public GameObject bulletPrefab; - - public override void SkillePreviewSelector(int index) - { - switch (index) - { - case 0: - PreEffect_0(); - break; - case 1: - PreEffect_1(); - break; - case 2: - PreEffect_2(); - break; - } - } - public override void SkillePreviewEffectSelector(int index, MapUnity currentMapUnity) - { - switch (index) - { - case 0: - PreEffectRange_0(currentMapUnity); - break; - case 1: - PreEffectRange_1(currentMapUnity); - break; - case 2: - PreEffectRange_2(currentMapUnity); - break; - } - } - public override void SkilleEffectSelector(int index) - { - switch (index) - { - case 0: - Effect_0(); - break; - case 1: - Effect_1(); - break; - case 2: - Effect_2(); - break; - } - } - //ԤΧ - public void PreEffect_0() - { - arrowInMap.gameObject.SetActive(true );//򿪼ͷ - MovePreView(); - } - public void PreEffect_1() - { - arrowInMap.gameObject.SetActive(true);//򿪼ͷ - influencePreviewPool.UnionWith(MapUnityManager.Instance.findReachableTiles(GameManager.Instance.servantOn,skillList [currentSkillInex].throwRange )); - //Ӱرɫ - foreach (MapUnity mapUnity in influencePreviewPool) - { - mapUnity.PlayerInfluenced(influencePreviewPool); - mapUnity.playerMark.material = mapUnity.red; - } - TurnMaster.Instance.servantAction = TurnMaster.ServantAction.useSkill; - } - public void PreEffect_2() - { - arrowInMap.gameObject.SetActive(true);//򿪼ͷ - influencePreviewPool.UnionWith(MapUnityManager.Instance.findReachableTiles(GameManager.Instance.servantOn, skillList[currentSkillInex].throwRange)); - //Ӱرɫ - foreach (MapUnity mapUnity in influencePreviewPool) - { - mapUnity.PlayerInfluenced(influencePreviewPool); - mapUnity.playerMark.material = mapUnity.red; - } - TurnMaster.Instance.servantAction = TurnMaster.ServantAction.useSkill; - } - //ԤЧΧ - public void PreEffectRange_0(MapUnity currentMapUnity ) - { - effectRangePreviewPool.Add(currentMapUnity); - HighLightEffectRange(); - } - public void PreEffectRange_1(MapUnity currentMapUnity) - { - effectRangePreviewPool.Add(currentMapUnity); - HighLightEffectRange(); - } - public void PreEffectRange_2(MapUnity currentMapUnity) - { - Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value); - if (Physics.Raycast(ray, out RaycastHit raycastHit, 500, chooseNodeLayerMask.value)) - { - Vector3 direction = raycastHit.transform.position - transform.position; - - float angle1 = Vector3.SignedAngle(transform.forward, direction, transform.up); - - if (angle1 < 0) - { - angle1 += 360f; - } - Debug.Log(angle1+"ǰ"); - - if (angle1 >= 300f) - { - angle1 = 330f; - } - else if (angle1 >= 240f) - { - angle1 = 270f; - } - else if (angle1 >= 180f) - { - angle1 = 210f; - } - else if (angle1 >= 120f) - { - angle1 = 150f; - } - else if (angle1 >= 60f) - { - angle1 = 90f; - } - else if (angle1 >= 0f) - { - angle1 = 30f; - } - Debug.Log(angle1 + ""); - effectRangePreviewPool = getNodeTools.setEffectRangePreviewNoCard("3_1", angle1, currentMapUnity); - HighLightEffectRange(); - - } - - } - public void Effect_0() - { - StartCoroutine(MoveToChooseNode()); - } - public void Effect_1() - { - Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value); - if (Physics.Raycast(ray, out RaycastHit raycastHit, 500,chooseNodeLayerMask.value)) - { - Debug.Log(raycastHit.collider.name); - MapUnity currentNode = raycastHit.transform.GetComponent(); - if (currentNode.enemyNode != null ) - { - var bullet = Instantiate(bulletPrefab, this.transform.position, bulletPrefab.transform.rotation); - BulletMove bulletMove = bullet.GetComponent(); - bulletMove.destination = raycastHit.transform.position; - bulletMove.destination.y = 0.4f; - currentNode.enemyNode.EnemyState.currentHP -= skillList[currentSkillInex].value; - - anim.SetTrigger("shoot"); - - SettleSkillCoolDown(skillList[currentSkillInex], skillNodeList[currentSkillInex]); - } - - } - - ResetPreView(); - } - public void Effect_2() - { - Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value); - if (Physics.Raycast(ray, out RaycastHit raycastHit, 500, chooseNodeLayerMask.value)) - { - Debug.Log(raycastHit.collider.name); - MapUnity currentNode = raycastHit.transform.GetComponent(); - if(currentNode .influenced ==true ) - { - foreach (var node in effectRangePreviewPool) - { - //node.whoColour = MapUnity.WhoColour.playerColour; - } - anim.SetTrigger("shoot"); - SettleSkillCoolDown(skillList[currentSkillInex], skillNodeList[currentSkillInex]); - } - - } - ResetPreView(); - } -} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs.meta deleted file mode 100644 index 2200e420..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1a6bd56e8e7c0b34ab0b3bf7baa437ae -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs deleted file mode 100644 index 032e29b0..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs +++ /dev/null @@ -1,440 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using Unity.VisualScripting; -using UnityEngine; -using UnityEngine.UI; -using UnityEngine.InputSystem; - - -public class Servant : MonoBehaviour -{ - public int startPositionX, startPositionY; - public HashSet influencePreviewPool = new HashSet();//¼ԤӰĶ - public HashSet effectRangePreviewPool = new HashSet();//Ч÷Χ - - [Header("㼶")] - public LayerMask chooseNodeLayerMask;//ƶѡIJ㼶 - public LayerMask playerLayerMask;//ɫ㼶 - [Header("·")] - public List movePath = new List(); - - [Header("")] - public Animator anim; - [Header("ܲٶ")] - public float speed = 2; - [Header("׼ͷ")] - public ArrowInMap arrowInMap; - [Header("׼һ֡׼")] - public MapUnity latestMapUnity;//뵱ǰ֡һˢ·Χ - private bool isRefresh; - [Header("ʶUI")] - public int stepIconCount; - public Transform StepIconFather; - public GameObject stepIconPrefab; - - [Header("UIбUI")] - public GameObject SkillUI; - public List skillList = new List(); - public List skillNodeList = new List(); - public List skillUIPos = new List(); - - [Header("UIԴ")] - public GameObject SkillUIPrefab; - [Header("UIɲ")] - public float radius; - public float angle; - public float startAngle; - public int pathNodeNum; - - [Header("ǰĸܵķΧԤ")] - public int currentSkillInex; - - private void Start() - { - GameManager.Instance.servant = this; - Invoke("StartSevent", 10f); - - InstantiateSkillUI(); - } - public void StartSevent() - { - MapUnity currentNode = GameManager.Instance.X[startPositionX].Y[startPositionY]; - currentNode.playerOn = true; - GameManager.Instance.servantOn = currentNode; - this.gameObject.transform.position = new Vector3(currentNode.transform.position.x, 0.5f, currentNode.transform.position.z); - this.gameObject.transform.SetParent(currentNode.CylinderFloor.transform); - } - public virtual void Update() - { - if (Mouse.current.leftButton.wasReleasedThisFrame && TurnMaster.Instance.playerAction != TurnMaster.PlayerAction.useCard && TurnMaster.Instance.servantAction != TurnMaster.ServantAction.banAction) - { - //if (GameManager.Instance.servantState.currentStepRange > 0 && !Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.banStep)) - Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value); - if (Physics.Raycast(ray, out RaycastHit raycastHit, 500, playerLayerMask.value)) - { - if (raycastHit.collider.gameObject.tag == "Servant") - { - GameManager.Instance.character = GameManager.SelectedCharacter.servant; - //Debug.Log(raycastHit.collider.gameObject.name); - //չܱ - ShowSkillUI(); - } - else if (raycastHit.collider.gameObject.tag == "ServantSkillUI")//⵽Ǽ - { - GameManager.Instance.character = GameManager.SelectedCharacter.servant; - //ܷΧԤ(buttonӼ) - //MovePreView(); - if (skillList[currentSkillInex].currentStorageTimes > 0) - { - TurnMaster.Instance.servantAction = TurnMaster.ServantAction.useSkill; - isRefresh = true; - SkillePreviewSelector(currentSkillInex); - ColorInUseSkillUI(); - } - } - else if (Physics.Raycast(ray, out RaycastHit raycastHitMap, 500, chooseNodeLayerMask.value)) - { - isRefresh = false; - //⵽棬ͷżʵЧ - if (GameManager.Instance.character == GameManager.SelectedCharacter.servant && TurnMaster.Instance.servantAction == TurnMaster.ServantAction.useSkill) - { - SkilleEffectSelector(currentSkillInex); - ColorResrtUseSkillUI(); - } - } - - } - else - { - ResetPreView(); - } - - } - - if (Mouse.current.rightButton.wasPressedThisFrame) - { - ResetPreView(); - } - - //ƶˢ·ΧԤ - if (isRefresh ==true) - { - Ray rayMap = Camera.main.ScreenPointToRay(Mouse.current.position.value); - if (Physics.Raycast(rayMap, out RaycastHit raycastHitRefresh, 500, chooseNodeLayerMask.value)) - { - MapUnity currentMapUnity = raycastHitRefresh.transform.GetComponent(); - if (currentMapUnity != latestMapUnity) - { - CleanEffectRange(); - SkillePreviewEffectSelector(currentSkillInex,currentMapUnity); - latestMapUnity = currentMapUnity; - } - - } - } - //ͬUIʶ - if (GameManager.Instance.servantState.currentStepRange != stepIconCount) - { - for (int i = StepIconFather.childCount - 1; i >= 0; i--) - { - Destroy(StepIconFather.GetChild(i).gameObject); - } - stepIconCount = GameManager.Instance.servantState.currentStepRange; - - for (int i = 0; i (); - servantSkillNode.servantSkill = skillList[i]; - servantSkillNode.servant = this; - skillNodeList.Add(servantSkillNode); - - //ÿǶȷڵ - for(int a=1;a<=pathNodeNum ;a ++) - { - float currentAngle = startAngle + angle * (i - 1) + a * angle / (float)pathNodeNum; - // currentUI.transform.localPosition = new Vector3(radius * Mathf.Sin(currentAngle * Mathf.Deg2Rad), radius * (1 - Mathf.Cos(currentAngle * Mathf.Deg2Rad)), 0); - //currentUI.transform.localEulerAngles -= SkillUI.transform.localEulerAngles;//Ƕ - skillUIPos.Add(new Vector3(radius * Mathf.Sin(currentAngle * Mathf.Deg2Rad), radius * (1 + Mathf.Cos(currentAngle * Mathf.Deg2Rad)), 0)); - } - - } - - } - //ȡͷż״̬ - public void ResetPreView() - { - // StepPreviewInfluencedNode(step); - CloseStepPreviewInfluencedNode();//ȡԤ - CleanEffectRange();//ȡΧԤ - - ColorResrtUseSkillUI();//ָUI - arrowInMap.gameObject.SetActive(false);//رռͷ - isRefresh = false; - if (TurnMaster.Instance.servantAction != TurnMaster.ServantAction.banAction) - TurnMaster.Instance.servantAction = TurnMaster.ServantAction.none; - } - //ƶԤƶΧ - public void MovePreView() - { - influencePreviewPool.UnionWith(MapUnityManager.Instance.findReachableTiles(GameManager.Instance.servantOn, GameManager.Instance.servantState.currentStepRange)); - //Ӱرɫ - foreach (MapUnity mapUnity in influencePreviewPool) - { - mapUnity.PlayerInfluenced(influencePreviewPool); - mapUnity.playerMark.material = mapUnity.red; - } - //StepPreviewInfluencedNode(GameManager.Instance.playerState.currentStepRange); - //TurnMaster.Instance.servantAction = TurnMaster.ServantAction.move; - TurnMaster.Instance.servantAction = TurnMaster.ServantAction.useSkill; - } - public IEnumerator MoveToChooseNode()//߼ѡһmapNode - { - //رռͷ - arrowInMap.gameObject.SetActive(false); - //رոԤ - CleanEffectRange(); - - Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value); - if (Physics.Raycast(ray, out RaycastHit raycastHit, 500, chooseNodeLayerMask.value)) - { - // Debug.Log(raycastHit.collider.gameObject.name); - MapUnity mapNode = raycastHit.collider.transform.GetComponent(); - - //ıŷת - FlipLocalScale(raycastHit.point); - - //ɫƶ - if (mapNode.influenced && mapNode.blocked == false && mapNode.enemyNode == null&&mapNode .playerOn ==false ) - { - //· - movePath = AStarManager.Instance.FindPathWithEndNode(GameManager.Instance.servantOn, mapNode); - //жܷ񵽴 - if (movePath.Count - 1 > GameManager.Instance.servantState.currentStepRange) - { - Debug.Log("ƶλ"); - yield break; - } - - //ı䶯 - anim.SetBool("move", true); - - if (GameManager.Instance.servantOn != null) - { - GameManager.Instance.servantOn.playerOn = false; - GameManager.Instance.servantOn.influenced = false; - } - //Ӱرɫ - CloseStepPreviewInfluencedNode(); - - //յ - mapNode.infHighLight = true; - - for (int i = 1; i < movePath.Count; i++) - { - bool move = true; - float time = 0; - Vector3 startPos = transform.position; - Vector3 endpos = new Vector3(movePath[i].transform.position.x, transform.position.y, movePath[i].transform.position.z); - while (move) - { - transform.position = Vector3.Lerp(startPos, endpos, time += Time.deltaTime * speed); - if (Vector3.Distance(transform.position, endpos) < 0.1f) - { - move = false; - } - - yield return 0; - } - //жϼѪǷЧ - //Usermanager.Instance.ParasitismnRealize(movePath[i]);//뵱ǰnode - // Usermanager.Instance.bleedRealize(); - // - GameManager.Instance.servantState.currentStepRange -= 1; - //ͬUI - if (GameManager.Instance.servantState.currentStepRange <= 0) - { - skillList[0].currentStorageTimes = 0; - skillNodeList[0].image.sprite = skillList[0].coolDownIcon; - } - } - - this.gameObject.transform.position = new Vector3(mapNode.transform.position.x, 0.5f, mapNode.transform.position.z); - mapNode.playerOn = true; - GameManager.Instance.servantOn = mapNode; - this.gameObject.transform.SetParent(mapNode.CylinderFloor.transform); - - //ı䶯 - anim.SetBool("move", false); - - //ȡյ - mapNode.infHighLight = false; - TurnMaster.Instance.servantAction = TurnMaster.ServantAction.none; - - - } - else - { - Debug.Log("ƶλ"); - } - } - } - - public void CloseStepPreviewInfluencedNode() - { - //Ӱرɫ - foreach (MapUnity mapUnity in influencePreviewPool) - { - mapUnity.influenced = false; - } - influencePreviewPool.Clear(); - - } - //ıŷת - public void FlipLocalScale(Vector3 point) - { - if (point.x < transform.position.x) - { - anim.transform.localScale = new Vector3(-0.06f, 0.06f, 0.06f); - } - else - { - anim.transform.localScale = new Vector3(0.06f, 0.06f, 0.06f); - } - } - //ȴ - public void SettleSkillCoolDown(ServantSkill skill ,ServantSkillNode skillNode) - { - if(skill .currentStorageTimes >0) - { - skill.currentUseTimes--; - if(skill .currentUseTimes <=0) - { - skill.currentStorageTimes--; - skill.currentUseTimes = skill.useTimes; - } - } - if (skill.currentStorageTimes <= 0) - { - skillNode.image .sprite = skill.coolDownIcon; - } - if (skill.currentStorageTimes < skill.storageTimes) - { - skillNode.coolDownText.gameObject.SetActive(true); - skillNode.coolDownText.text = skill.currentCoolDown .ToString (); - } - } - - - [System .Serializable ] - public class ServantSkill - { - public string name; - public string disdescription; - public int effectIndex; - public int value; - public int throwRange; - public int effectRange; - public int coolDown;//ȴʱ - public int useTimes;//һغü - public int storageTimes;//ߴ漸ʹ - public int currentCoolDown; - public int currentUseTimes; - public int currentStorageTimes; - - public SkillType skillType; - public enum SkillType - { - bullet, - melee, - magic, - aoe, - move, - noneRange - } - public Sprite Icon; - public Sprite coolDownIcon; - } -} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs.meta deleted file mode 100644 index 9d3e8e1f..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0e88f38f638f532498966deadd648cd0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ArrowInMap.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ArrowInMap.cs deleted file mode 100644 index 4e73e4e8..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ArrowInMap.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.InputSystem; - -public class ArrowInMap : MonoBehaviour -{ - public LineRenderer lineRenderer; - public float density = 2f; //ܶ - public float speed;//ٶ - public Vector3 destination;//Ŀĵ - public LayerMask aimLayerMask; - private int id = Shader.PropertyToID("_MainTex"); - private Material material; - private Vector2 offset = new Vector2(0, 0); - - - private void OnEnable() - { - material = lineRenderer.material; - - } - void Update() - { - Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value); - if (Physics.Raycast(ray, out RaycastHit raycastHit, 500, aimLayerMask.value)) - { - destination = raycastHit.point; - lineRenderer.SetPosition(0,this.transform.position); - lineRenderer.SetPosition(1,destination); - - float lineLength = (lineRenderer.GetPosition(1) - lineRenderer.GetPosition(0)).magnitude; - material.SetTextureScale(id, new Vector2(lineLength * density, 0)); - - offset -= new Vector2(speed, 0); - material.SetTextureOffset(id, offset); - } - - } - -} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ArrowInMap.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ArrowInMap.cs.meta deleted file mode 100644 index 5ef5e06e..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ArrowInMap.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d7f89d6a95cea3849b3ea899f72d31c1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ServantSkillNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ServantSkillNode.cs deleted file mode 100644 index 4e4262ea..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ServantSkillNode.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.EventSystems; -using UnityEngine.UI; - -public class ServantSkillNode : MonoBehaviour -{ - public Servant servant; - public Servant.ServantSkill servantSkill; - - public Collider col; - public Image image; - public Button button; - public Text coolDownText; - public float speed; - - public string atlasPath; - private void Start() - { - button = GetComponent