Merge pull request '敌人范围显示优化' (#9) from dev-0705 into dev-0524

Reviewed-on: #9
1 year ago · 74a926324f
16 changed files with 436 additions and 22 deletions
--- a/ColorlessWorld-2024-4-2/Assets/Image/enemyMark.png
+++ b/ColorlessWorld-2024-4-2/Assets/Image/enemyMark.png
--- a/ColorlessWorld-2024-4-2/Assets/Image/enemyMark.png.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Image/enemyMark.png.meta
@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 02691098c39ccd6458dd3771b3004071
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity
@ -59,9 +59,12 @@ MonoBehaviour:
  locationY: 0
  compalte: 0
  influenced: 0
+  markInfluenced: 0
  choossedMark: {fileID: 1211505881046303546}
+  hightLigtMark: {fileID: 1502226451502315807}
  red: {fileID: 2100000, guid: 876d1c111d915ca45b7304b41dcc1060, type: 2}
  yellow: {fileID: 2100000, guid: cf59497cd92e036419cf5cfa2d1e4c79, type: 2}
+  enemyMark: {fileID: 2100000, guid: 5bc9b4d525fc54344935f187546b718b, type: 2}
  plyerColour: {fileID: 2100000, guid: 8ec571d5570dab34ea8687ab32ac03ac, type: 2}
  enemyColour: {fileID: 2100000, guid: 1f241e895118d564d8b61a307da80150, type: 2}
  colourGameObject: {fileID: 7818877686521749494}
@ -123,7 +126,7 @@ GameObject:
  - component: {fileID: 1240166201725739929}
  - component: {fileID: 8781005840710497347}
  m_Layer: 0
-  m_Name: Cylinder
+  m_Name: inf
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -194,6 +197,89 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &1502226451502315807
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8900614378456229163}
+  - component: {fileID: 8485410642332178147}
+  - component: {fileID: 6124836568472427169}
+  m_Layer: 0
+  m_Name: mark
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &8900614378456229163
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1502226451502315807}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.2}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4579690416932963536}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8485410642332178147
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1502226451502315807}
+  m_Mesh: {fileID: -5468021829708598221, guid: ae332737a5755ee499c32f566d3a2913, type: 3}
+--- !u!23 &6124836568472427169
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1502226451502315807}
+  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: 5bc9b4d525fc54344935f187546b718b, 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!1 &7818877686521749494
 GameObject:
  m_ObjectHideFlags: 0
@ -332,6 +418,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 5510486009783351286}
+  - {fileID: 8900614378456229163}
  m_Father: {fileID: 2384686249825617783}
  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!33 &2437255636331898785
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/enemyMark.mat
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/enemyMark.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: enemyMark
+  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: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - DepthOnly
+  - SHADOWCASTER
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 02691098c39ccd6458dd3771b3004071, type: 3}
+        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: 2800000, guid: 02691098c39ccd6458dd3771b3004071, type: 3}
+        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.5
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 1
+    - _WorkflowMode: 1
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _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 &1781025284166211548
+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
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/enemyMark.mat.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/enemyMark.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5bc9b4d525fc54344935f187546b718b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
@ -5155,7 +5155,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  time: 0.2
-  moveSpeed: 2
+  moveSpeed: 4
 --- !u!1 &557438114
 GameObject:
  m_ObjectHideFlags: 0
@ -9256,6 +9256,7 @@ MonoBehaviour:
  usedCard: {fileID: 1964831963}
  cardDeckNumberText: {fileID: 591146068}
  usedCardNumberText: {fileID: 1278694494}
+  deleteCardNumberText: {fileID: 263387098}
  currentCost: 0
  totalCost: 0
  turn: 4
@ -9468,7 +9469,7 @@ MonoBehaviour:
    serializedVersion: 2
    m_Bits: 2176
  time: 0.2
-  moveSpeed: 2
+  moveSpeed: 4
 --- !u!114 &1153479994
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -10199,6 +10200,7 @@ MonoBehaviour:
  templatePlayerState: {fileID: 11400000, guid: afd7daa84e9985b45bd00c91505acb37,
    type: 2}
  playerState: {fileID: 0}
+  onDrag: 0
  textMaxCost: {fileID: 2096369105}
  textCurrentCost: {fileID: 791443579}
  textMaxStep: {fileID: 219845941}
@ -11281,7 +11283,7 @@ MonoBehaviour:
    serializedVersion: 2
    m_Bits: 2176
  time: 0.2
-  moveSpeed: 2
+  moveSpeed: 4
 --- !u!114 &1387589238
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -15593,6 +15595,7 @@ MonoBehaviour:
  cardPrefab: {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c,
    type: 3}
  usedCardList: 
+  deleteCardList: 
 --- !u!1 &1966305439
 GameObject:
  m_ObjectHideFlags: 0
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs
@ -20,7 +20,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
    public EventSystem eventSystem;
    bool canUse = true;//决定卡牌是否可以释放
    bool choosed;//标识卡牌是否被选中
-
+    
    [Header("贝塞尔曲线瞄准")]
    public GameObject ainPanle;

@ -129,6 +129,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag

        if (choosed && Mouse.current.rightButton.wasPressedThisFrame)
        {
+            GameManager.Instance.onDrag = false;
            Debug.Log("取消释放");
            canUse = false;//取消释放
            ainPanle.SetActive(false);
@ -147,6 +148,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
        {
            return;
        }
+        GameManager.Instance.onDrag = true;
        choosed = true;

        GetComponent<CanvasGroup>().blocksRaycasts = false;
@ -331,6 +333,8 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag

    public void OnEndDrag(PointerEventData eventData)
    {
+        GameManager.Instance.onDrag = false;
+
        StartCoroutine(OnDragIEnumerator(eventData));
    }

--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs
@ -13,6 +13,7 @@ public class TurnMaster : Singleton<TurnMaster>

    public Text cardDeckNumberText;
    public Text usedCardNumberText;
+    public Text deleteCardNumberText;

    public int currentCost;
    public int totalCost;
@ -83,6 +84,7 @@ public class TurnMaster : Singleton<TurnMaster>
        //Í¬²½UI
        cardDeckNumberText.text = cardDeck.cardList.Count.ToString();
        usedCardNumberText.text = usedCard.usedCardList.Count.ToString();
+        deleteCardNumberText.text = usedCard.deleteCardList.Count.ToString();
    }
    IEnumerator EndPlayerTurnBegin()
    {
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/UsedCard.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/UsedCard.cs
@ -5,5 +5,8 @@ using UnityEngine;
 public class UsedCard : MonoBehaviour
 {
    public GameObject cardPrefab;
+    [Header("贏華")]
    public List<int> usedCardList;
+    [Header("种障")]
+    public List<int> deleteCardList;
 }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs
@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;

@ -153,9 +154,8 @@ public class EnemyManager : Singleton<EnemyManager>
    }

    public void AttackRangePreviewInfluencedNode(MapUnity enemyNode, int step,List<MapUnity> influencePreviewPool)//可移动格子预览
-    {
-
-         influencePreviewPool .Clear();
+    {    
+        influencePreviewPool .Clear();
        //GameManager.Instance.playerOn.InfluencePool = GameManager.Instance.playerOn.unitPool;
        MapUnity playerNode = enemyNode;
        MapUnity currentNode = enemyNode;
@ -519,11 +519,14 @@ public class EnemyManager : Singleton<EnemyManager>

            }
        }
+
+        List<MapUnity> disInfluencePreviewPool = influencePreviewPool.Distinct(new MapUnityCompare()).ToList();
+
        //遍历影响池变色
-        for (int i = 0; i < influencePreviewPool.Count; i++)
+        foreach ( var i in disInfluencePreviewPool)
        {
-            influencePreviewPool[i].influenced = true;
-            influencePreviewPool[i].choossedMark.GetComponent<Renderer>().material = influencePreviewPool[i].red;
+           i.markInfluenced = true;
+           i.hightLigtMark.GetComponent<Renderer>().material = i.enemyMark;
        }
  
    }
@ -896,5 +899,30 @@ public class EnemyManager : Singleton<EnemyManager>
            }
        }

+       List<MapUnity> disInfluencePreviewPool = influencePreviewPool.Distinct(new MapUnityCompare()).ToList ();
+        influencePreviewPool.Clear();
+        foreach (var i in disInfluencePreviewPool )
+        {
+            influencePreviewPool.Add(i);
+        }
+    }
+
+
+    //±È½ÏÀà
+    class MapUnityCompare : IEqualityComparer<MapUnity>
+    {
+        public bool Equals(MapUnity x, MapUnity y)
+        {
+            if((x.locationX == y.locationX)&&(x.locationY == y.locationY))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public int GetHashCode(MapUnity obj)
+        {
+            return obj.locationX.GetHashCode() ^ obj.locationY.GetHashCode();
+        }
    }
 }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs
@ -16,6 +16,9 @@ public class GameManager : Singleton<GameManager>
    public PlayerState_SO templatePlayerState;//角色数据ScriptableObject模板
    public PlayerState_SO playerState;//在游戏中实际使用的数据

+    [Header("角色动作状态")]
+    public bool onDrag;//正在拖动卡牌
+
    [Header("角色状态数据UI")]
    public Text textMaxCost;
    public Text textCurrentCost;
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs
@ -12,10 +12,14 @@ public class MapUnity : MonoBehaviour

    [Header("UI效果范围控件")]
    public bool influenced;//被选中
+    public bool markInfluenced;//需要被高亮显示
+
    public GameObject choossedMark;//被选中激活
-                                   // public List<MapUnity> InfluencePool;//影响池
+    public GameObject hightLigtMark;//被选中高亮
+                                   
    public Material red;
    public Material yellow;
+    public Material enemyMark;

    [Header("涂色控件")]
    public Material plyerColour;//玩家颜色
@ -77,9 +81,17 @@ public class MapUnity : MonoBehaviour
        {
            choossedMark.SetActive(false);
        }
+        if (markInfluenced)
+        {
+            hightLigtMark.SetActive(true);
+        }
+        else
+        {
+            hightLigtMark.SetActive(false);
+        }

-      //根据涂色角色改变颜色
-      if(whoColour == WhoColour.playerColour )
+        //根据涂色角色改变颜色
+        if (whoColour == WhoColour.playerColour )
      {
            colourGameObject.GetComponent<Renderer>().material = plyerColour;
      }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs
@ -14,7 +14,7 @@ public class EnemyPlanActionUI : MonoBehaviour

    private void OnMouseEnter()
    {
-        if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn)
+        if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn &&GameManager .Instance .onDrag ==false )
        {
            
            MapUnity currentMapUnity = GameManager.Instance.X[enemyNode.positionX].Y[enemyNode.positionY];
@ -134,21 +134,21 @@ public class EnemyPlanActionUI : MonoBehaviour
                        {
                            for (int i = 0; i < step + 1; i++)
                            {
-                                enemyNode.pasth[i].choossedMark.GetComponent<Renderer>().material = enemyNode.pasth[i].yellow;
+                                enemyNode.pasth[i].hightLigtMark.GetComponent<Renderer>().material = enemyNode.pasth[i].yellow;
                            }
                        }
                        else if (enemyNode.pasth.Count - 1 == step)
                        {
                            for (int i = 0; i < step; i++)
                            {
-                                enemyNode.pasth[i].choossedMark.GetComponent<Renderer>().material = enemyNode.pasth[i].yellow;
+                                enemyNode.pasth[i].hightLigtMark.GetComponent<Renderer>().material = enemyNode.pasth[i].yellow;
                            }
                        }
                        else
                        {
                            for (int i = 0; i < enemyNode.pasth.Count; i++)
                            {
-                                enemyNode.pasth[i].choossedMark.GetComponent<Renderer>().material = enemyNode.pasth[i].yellow;
+                                enemyNode.pasth[i].hightLigtMark.GetComponent<Renderer>().material = enemyNode.pasth[i].yellow;
                            }
                        }
                    }
@ -160,7 +160,7 @@ public class EnemyPlanActionUI : MonoBehaviour
                    {
                        for (int i = 0; i < enemyNode.oppositePasth.Count; i++)
                        {
-                            enemyNode.oppositePasth[i].choossedMark.GetComponent<Renderer>().material = enemyNode.pasth[i].yellow;
+                            enemyNode.oppositePasth[i].hightLigtMark.GetComponent<Renderer>().material = enemyNode.pasth[i].yellow;
                        }
                    }
                    break;
@ -185,9 +185,9 @@ public class EnemyPlanActionUI : MonoBehaviour
        //±éÀúÓ°Ïì³Ø±äÉ«
        for (int i = 0; i < enemyNode.rangePool.Count; i++)
        {
-            enemyNode.rangePool[i].influenced = false;
+            enemyNode.rangePool[i].markInfluenced = false;
        }
-        enemyNode.rangePool.Clear();
+        //enemyNode.rangePool.Clear();
    }
 }

--- a/ColorlessWorld-2024-4-2/Assets/data/card_data.csv
+++ b/ColorlessWorld-2024-4-2/Assets/data/card_data.csv
@ -3,7 +3,7 @@
 10002,护盾,1,1,2,5,0,0,0,2,5,1,,PlayerIcon
 10003,毒药,1,1,4,6,3,1,0,4,10,1,施加4层中毒,PlayerIcon
 10004,枫叶炸弹,2,2,9,2,2,7_2,0,9;4,2;4,1,施加4层中毒,PlayerIcon
-10005,花粉,0,2,8,1,4,1,0,8,2,1,施加1层沉睡,PlayerIcon
+10005,花粉,0,2,8,2,4,1,0,8,2,1,施加1层沉睡,PlayerIcon
 10006,致残,2,1,7,2,2,1,0,7;9,2;2,1,施加2层流血,PlayerIcon
 10007,滋养,1,2,12;13,3;1,0,0,0,12,3,1,无需丢弃,PlayerIcon
 10008,草山压顶,3,3,1;6,10;1,2,1,0,1;6,13;1,1,造成3点伤害,PlayerIcon
--- a/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache
+++ b/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache
--- a/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache
+++ b/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache