地块数量UI联动，敌人意图优化

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Wolf.asset

@@ -13,9 +13,15 @@ MonoBehaviour:
   m_Name: Wolf
   m_EditorClassIdentifier: 
   stepRange: 2
+  stepRangeMultiplier: 1
+  maxMoveCoolDown: 2
+  currentMoveCoolDown: 2
   shieldValue: 0
+  upShieldValue: 0
   maxHP: 150
   currentHP: 150
   colourType: 0
   maxSkillCoolDown: 3
   currentSkillCoolDown: 3
+  damageMultiplier: 1
+  damage: 10

ColorlessWorld-2024-4-2/Assets/Image/CardImage.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0011bf5a6d7bc5f4c8a311f5e0ba97d1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Image/Icon.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8ce278887522d564e8bf1809a5607b97
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Image/Icon/AttackIcon.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 98e3bfa470e005e40bd314bfde358262
+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: 512
+    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: 

ColorlessWorld-2024-4-2/Assets/Image/Icon/RadomIcon.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: dced10efe2e82604b8a76a8bc482a054
+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: 512
+    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: 

ColorlessWorld-2024-4-2/Assets/Image/Icon/RunIcon.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 71163bdbe0d369346937c5cdc3627b7f
+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: 512
+    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: 

ColorlessWorld-2024-4-2/Assets/Image/Icon/ShieldIcon.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 6e6d87bb241dd7f489dc4c200c80d452
+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: 512
+    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: 

ColorlessWorld-2024-4-2/Assets/Image/Icon/throwIcon.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: ddc5269604f2dc64dbc956e9911ff4a7
+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: 512
+    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: 

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01.prefab

@@ -934,6 +934,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9878eb734a9bb9e448c1a125b1e863e6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  text: {fileID: 2257759688655818602}
   cardId: 0
   originalParent: {fileID: 0}
   originalpoint: {x: 0, y: 0, z: 0}

ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using Unity.VisualScripting;
 using UnityEngine;
+using UnityEngine.UI;
 using UnityEngine.EventSystems;
 using UnityEngine.InputSystem;
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Bird.cs

@@ -92,4 +92,5 @@ public class Bird : MonoBehaviour
             }
         }
     }
+
  }

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs

@@ -29,6 +29,16 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         wolf,
         bird
     }
+    [Header("意图行动")]
+    public  bool canMove; //可以移动
+    public PlanAction planAction;
+    public enum PlanAction
+    {
+        attack,
+        sheield,
+        random  
+    }
+
     private void OnEnable()
     {
         EnemyManager.Instance.enemyObservers.Add(this);
@@ -84,6 +94,11 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         {
             EnemyState.currentSkillCoolDown -= 1;
         }
+
+        if (EnemyState.currentMoveCoolDown >= 0)
+        {
+            EnemyState.currentMoveCoolDown -= 1;
+        }
     }
     public EnemyNode  GetEnemyNode()
     {

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Wolf.cs

@@ -5,45 +5,131 @@ using UnityEngine;
 public class Wolf : MonoBehaviour
 {
      EnemyNode enemyNode;
+    public enum NextAction
+    {
+        attack,
+        dash,
+        random
+    }
+    public NextAction nextAction;
 
+    [Header("普通攻击范围")]
+    public int attackRange;
+    [Header("冲刺攻击范围")]
+    public int dashRange;
+
+    [Header("计数标量")]
+    float lastTime = 0;
+    public float time;
 
     private void Start()
     {
         enemyNode = GetComponent<EnemyNode>();
     }
 
+    private void Update()
+    {
+        if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn && GameManager .Instance .complete )
+        {
+            if (lastTime > 0)
+            {
+                lastTime -= Time.deltaTime;
+            }
+            else
+            {
+                WolfAction();
+                lastTime = time;
+            }
+        }     
+    }
+
     public void WolfTurn()
     {
         enemyNode.FindPath();
-
+        if (nextAction ==NextAction.dash)
-        if (enemyNode.pasth.Count <= 6 && enemyNode.pasth.Count>2)
         {
             //³å·æ 
-            if(enemyNode .EnemyState .currentSkillCoolDown <= 0 )
-            {
             enemyNode.Move(enemyNode.pasth[0], 5);
             enemyNode.EnemyState.currentSkillCoolDown = enemyNode.EnemyState.maxSkillCoolDown;
             Debug.Log("³å·æ");
             WolfColour();
         }
-            else
+        else if(enemyNode.canMove == true&&enemyNode.pasth.Count>2)
         {
+            //移动
             enemyNode.Move(enemyNode.pasth[0], enemyNode.EnemyState.stepRange);
             Debug.Log("Òƶ¯");
+            enemyNode.EnemyState.currentMoveCoolDown = enemyNode.EnemyState.maxMoveCoolDown;
             WolfColour();
         }
+        else
+        {
+            //不动
+            Debug.Log("无法移动");
         }
-        else if(enemyNode.pasth.Count > 6)
+        
+        if (nextAction == NextAction.attack)
         {
-            //移动
+            //攻击
-            enemyNode.Move(enemyNode.pasth[0], enemyNode.EnemyState.stepRange);
+            Debug.Log("攻击");
-            Debug.Log("移动");
-            WolfColour();
         }
         else
+        {
+            //不动
+            Debug.Log("无动作");
+        }
+        WolfMove();     
+    }
+
+    public void WolfMove()
+    {      
+        if (enemyNode.EnemyState.currentSkillCoolDown > 0&&enemyNode.EnemyState.currentMoveCoolDown <= 0)
+        {
+            enemyNode.canMove = true;          
+        } 
+        else
+        {
+            enemyNode.canMove = false;
+        }
+
+        if (enemyNode.EnemyState.currentSkillCoolDown <= 0 && enemyNode.pasth.Count > 6)
+        {
+            if ( enemyNode.EnemyState.currentMoveCoolDown <= 0)
+            {
+                enemyNode.canMove = true;
+            }
+        }
+
+    }
+    public void WolfAction()
+    {
+        enemyNode.FindPath();
+        if (enemyNode.pasth.Count <= 2)
         {
             //¹¥»÷
-            Debug.Log("攻击");
+            nextAction = NextAction.attack;
+            enemyNode.planAction = EnemyNode.PlanAction.attack;
+            enemyNode.EnemyState.attackRange = attackRange;
+        }
+        else if( enemyNode.pasth.Count <= 4&& enemyNode.canMove )
+        {
+            //攻击
+            nextAction = NextAction.attack;
+            enemyNode.planAction = EnemyNode.PlanAction.attack;
+            enemyNode.EnemyState.attackRange = attackRange + enemyNode.EnemyState.stepRange;
+        }
+        else if(enemyNode.pasth.Count <= 6&& enemyNode.EnemyState.currentSkillCoolDown <= 0)
+        {  
+            //冲锋
+            nextAction = NextAction.dash;
+            enemyNode.planAction = EnemyNode.PlanAction.attack;
+            enemyNode.EnemyState.attackRange = dashRange;
+        }
+        else
+        {
+            //不动
+            nextAction = NextAction.random;
+            enemyNode.planAction = EnemyNode.PlanAction.random;
         }
 
     }

ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs

@@ -27,8 +27,17 @@ public class GameManager : Singleton<GameManager>
 
     public Image HpBar;
 
+    [Header("部華晇伎跺杅UI")]
+    public int boundary;//羲擁部華煦賜
+    public Text playerColourCountText;
+    public Text enemyColourCountText;
+    public Image playerColourCountBar;
+    public Image enemyColourCountBar;
+
     private void Start()
     {
+        Invoke("CompleteGenerate", 6.5f);
+
         if(complete ==false )
         {
             for (int i = 0; i < MapManager.Instance.line; i++)
@@ -43,7 +52,8 @@ public class GameManager : Singleton<GameManager>
         //生成角色数据
         if (templatePlayerState != null)
             playerState = Instantiate(templatePlayerState);
-
+        //羲擁部華芨伎
+        Invoke("StartMapColour", 5f);   
     }
     [System.Serializable]
     public class Yunit
@@ -59,5 +69,90 @@ public class GameManager : Singleton<GameManager>
         textShieldValue.text = playerState.currentShieldValue.ToString();
         HpBar.fillAmount = playerState.currentHP / playerState.maxHP;
     }
+
+    //苀數部華晇伎
+    public void SyncColourCountUI()
+    {
+        Debug.Log("Sync");
+        float playerCount = 0;
+        float enemyCount = 0;
+        float totalCount = 0;
+
+        for(int i=0;i<X .Count; i++)
+        {
+            for (int j = 0; j < X[i].Y.Count; j++)
+            {
+                if(X[i].Y[j].whoColour ==MapUnity.WhoColour.playerColour)
+                {
+                    playerCount += 1;
+                }
+                else if(X[i].Y[j].whoColour == MapUnity.WhoColour.enemyColour)
+                {
+                    enemyCount += 1;
+                }
+                totalCount += 1;
+            }
+        }
+
+        //肮祭UI
+        playerColourCountText.text = playerCount.ToString();
+        enemyColourCountText.text = enemyCount.ToString();
+        playerColourCountBar.fillAmount = playerCount / totalCount;
+        enemyColourCountBar.fillAmount = enemyCount / totalCount;
+    }
+
+    //羲擁部華芨伎
+    public void StartMapColour()
+    {
+        if(MapManager .Instance .column %2 ==0)
+        {
+            for (int i = 0; i < X.Count; i++)
+            {
+                for (int j = 0; j < X[i].Y.Count; j++)
+                {
+                    if (j <= boundary)
+                    {
+                        X[i].Y[j].whoColour = MapUnity.WhoColour.playerColour;
+                    }
+                    else
+                    {
+                        X[i].Y[j].whoColour = MapUnity.WhoColour.enemyColour;
+                    }
+                }
+            }
+        }
+        else
+        {
+            for (int i = 0; i < X.Count; i++)
+            {
+                for (int j = 0; j < X[i].Y.Count; j++)
+                {
+                    if (j < boundary)
+                    {
+                        X[i].Y[j].whoColour = MapUnity.WhoColour.playerColour;
+                    }
+                    else if(j==boundary )
+                    {
+                        if(i%2==0)
+                        {
+                            X[i].Y[j].whoColour = MapUnity.WhoColour.playerColour;
+                        }
+                    }
+                    else
+                    {
+                        X[i].Y[j].whoColour = MapUnity.WhoColour.enemyColour;
+                    }
+                }
+            }
+        }
+       
+    }
+
+
+    //俇傖部華斐膘
+    public void CompleteGenerate()
+    {
+        complete = true;
+    }
 }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardData_SO/EnemyState_SO.cs

@@ -8,8 +8,13 @@ public class EnemyState_SO : ScriptableObject
     public int stepRange;//步数
     public double stepRangeMultiplier = 1;//步数系数
 
+    public int maxMoveCoolDown;//移动冷却
+    public int currentMoveCoolDown;
+
     public int shieldValue;//护盾
 
+    public int upShieldValue;//护盾值提升
+
     public float maxHP;//血量
 
     public float currentHP;//当前血量
@@ -24,4 +29,6 @@ public class EnemyState_SO : ScriptableObject
     public double damageMultiplier = 1;//攻击力系数
 
     public int damage;//攻击力
+
+    public int attackRange;//攻击范围
 }

ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyUIBar.cs

@@ -6,9 +6,24 @@ using UnityEngine.UI;
 public class EnemyUIBar : MonoBehaviour
 {
     public Image HPBar;
+    EnemyNode enemyNode;
 
+    [Header("意图图标")]
+    public Sprite  attackIcon;
+    public Sprite shieldIcon;
+    public Sprite randomIcon;
+    public Text planInforText;
+    public Image planIcon;
 
-    EnemyNode enemyNode;
+    public GameObject attackRangeIcon;
+    public Text attackRangeText;
+
+    public GameObject moveIcon;
+    public Text stepText;
+
+    [Header("计数标量")]
+    float lastTime=0;
+    public float time;
 
     private void Start()
     {
@@ -17,5 +32,56 @@ public class EnemyUIBar : MonoBehaviour
     private void Update()
     {
         HPBar.fillAmount = enemyNode .EnemyState .currentHP /enemyNode .EnemyState .maxHP;
+
+        //切换意图UI
+       
+        if(lastTime >0)
+        {
+            lastTime -= Time.deltaTime;
+        }
+        else
+        {
+            SwitchIntention(enemyNode.planAction);
+            SwitchMoveIntention(enemyNode.canMove);
+            lastTime = time;
+        }
+    }
+
+    //切换意图UI
+    private void SwitchIntention(EnemyNode.PlanAction planAction)
+    {
+        switch (enemyNode.planAction)
+        {
+            case EnemyNode.PlanAction.attack:
+                planIcon.sprite = attackIcon;
+                planInforText.text = (enemyNode.EnemyState.damage * enemyNode.EnemyState.damageMultiplier).ToString ();
+                attackRangeIcon.SetActive(true);
+                attackRangeText.text = enemyNode.EnemyState.attackRange.ToString();
+                break;           
+            case EnemyNode.PlanAction.sheield:
+                planIcon.sprite = shieldIcon;
+                planInforText.text = enemyNode.EnemyState.upShieldValue .ToString();
+                attackRangeIcon.SetActive(false);
+                break;      
+            case EnemyNode.PlanAction.random:
+                planIcon.sprite = randomIcon;
+                planInforText.text = null;
+                attackRangeIcon.SetActive(false);
+                break;
+        }
+    }
+    private void SwitchMoveIntention(bool canMove)
+    {
+        switch (canMove)
+        {
+            case true:
+                moveIcon.SetActive(true);
+                stepText.text=(enemyNode.EnemyState.stepRange*enemyNode.EnemyState.stepRangeMultiplier).ToString();
+                break;
+            case false:
+                moveIcon.SetActive(false);  
+                break;
+          
+        }
     }
 }

ColorlessWorld-2024-4-2/Library/StateCache/PrefabStageHierarchy/a7/a75fe03092d64491ac9a6b1ccc9d7e62.json

@@ -1 +1 @@
-{"m_ScrollY":0.0,"m_ExpandedPrefabGameObjectFileIDs":[3410471369990512392],"m_LastClickedFileID":0}
+{"m_ScrollY":0.0,"m_ExpandedPrefabGameObjectFileIDs":[3410471369990512392,55742390230665598],"m_LastClickedFileID":1321165852577465730}

ColorlessWorld-2024-4-2/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json

@@ -1 +1 @@
-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":3.402341604232788,"y":-0.40519046783447268,"z":3.069761276245117},"rotation":{"x":0.5492663979530335,"y":-0.00005001154568162747,"z":-0.00011234518751734868,"w":0.8358164429664612},"size":7.094128608703613,"orthographic":false}
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":21.34392738342285,"y":1.3062845468521119,"z":5.773749351501465},"rotation":{"x":0.44551941752433779,"y":0.05358051136136055,"z":-0.026990743353962899,"w":0.8934251070022583},"size":1.4953428506851197,"orthographic":false}

ColorlessWorld-2024-4-2/Library/UIElements/EditorWindows/UnityEditor.InspectorWindow.pref

@@ -226,9 +226,9 @@ MonoBehaviour:
   - '{}'
   - '{}'
   - '{}'
-  - '{"m_ShowAlternatingRowBackgrounds":0,"serializedVirtualizationData":{"scrollOffset":{"x":0.0,"y":0.0},"firstVisibleIndex":0,"contentPadding":0.0,"contentHeight":0.0,"anchoredItemIndex":-1,"anchorOffset":0.0}}'
-  - '{"m_ShowAlternatingRowBackgrounds":0,"serializedVirtualizationData":{"scrollOffset":{"x":0.0,"y":0.0},"firstVisibleIndex":0,"contentPadding":0.0,"contentHeight":0.0,"anchoredItemIndex":-1,"anchorOffset":0.0}}'
   - '{}'
   - '{}'
+  - '{"m_ShowAlternatingRowBackgrounds":0,"serializedVirtualizationData":{"scrollOffset":{"x":0.0,"y":0.0},"firstVisibleIndex":0,"contentPadding":0.0,"contentHeight":0.0,"anchoredItemIndex":-1,"anchorOffset":0.0}}'
+  - '{}'
   - '{}'
   - '{}'

ColorlessWorld-2024-4-2/Library/ilpp.pid

@@ -1 +1 @@
-33280
+1244

ColorlessWorld-2024-4-2/UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -48,7 +48,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 439.2
     y: 80.8
-    width: 745.2001
+    width: 738.80005
     height: 455.8
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -102,10 +102,10 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 745.2001
+      width: 738.80005
       height: 434.8
-    m_Scale: {x: 0.4851563, y: 0.4851563}
+    m_Scale: {x: 0.4809896, y: 0.4809896}
-    m_Translation: {x: 372.60004, y: 217.4}
+    m_Translation: {x: 369.40002, y: 217.4}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
@@ -113,12 +113,12 @@ MonoBehaviour:
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
       x: -768
-      y: -448.103
+      y: -451.9848
       width: 1536
-      height: 896.206
+      height: 903.9696
     m_MinimalGUI: 1
-  m_defaultScale: 0.4851563
+  m_defaultScale: 0.4809896
-  m_LastWindowPixelSize: {x: 931.5001, y: 569.75}
+  m_LastWindowPixelSize: {x: 923.50006, y: 569.75}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -143,7 +143,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1116.8
+    width: 1110.4
     height: 756.4
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
@@ -168,7 +168,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1116.8
+    width: 1110.4
     height: 476.8
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
@@ -238,9 +238,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 1e6d0000
+      m_SelectedIDs: 
-      m_LastClickedID: 27934
+      m_LastClickedID: 0
-      m_ExpandedIDs: 2afbffffda6b0000e26b00009c6c0000d46c0000ea6c00001e6d0000726d00007a6d0000f46d0000
+      m_ExpandedIDs: ec9bfcff2afbffff6c6c00000a6f0000266f0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -281,7 +281,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 369.6
     y: 0
-    width: 747.2001
+    width: 740.80005
     height: 476.8
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -312,9 +312,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 370.6
+    x: 439.2
-    y: 19
+    y: 80.8
-    width: 745.2001
+    width: 738.80005
     height: 455.8
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -635,9 +635,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 156.72263, y: 717.39197, z: 71.7437}
+    m_Target: {x: 21.343927, y: 1.3062845, z: 5.7737494}
     speed: 2
-    m_Value: {x: 156.72263, y: 717.39197, z: 71.7437}
+    m_Value: {x: 21.343927, y: 1.3062845, z: 5.7737494}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -683,13 +683,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.0029916756, y: 0.01321897, z: -0.00023781399, w: 1.0000155}
+    m_Target: {x: 0.44551942, y: 0.05358051, z: -0.026990743, w: 0.8934251}
     speed: 2
-    m_Value: {x: 0.0029913548, y: 0.013217552, z: -0.00023778848, w: 0.9999082}
+    m_Value: {x: 0.4454536, y: 0.0535726, z: -0.026986757, w: 0.89329314}
   m_Size:
-    m_Target: 113.000336
+    m_Target: 1.4953429
     speed: 2
-    m_Value: 113.000336
+    m_Value: 1.4953429
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -731,7 +731,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 476.8
-    width: 1116.8
+    width: 1110.4
     height: 279.60004
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
@@ -764,7 +764,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 69.6
     y: 557.60004
-    width: 1115.8
+    width: 1109.4
     height: 258.60004
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -787,7 +787,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Prefab/MapNodePrefab
+    - Assets/Scripts/UI
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -795,16 +795,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/Prefab/MapNodePrefab
+  - Assets/Scripts/UI
   m_LastFoldersGridSize: -1
-  m_LastProjectPath: D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+  m_LastProjectPath: D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 79}
+    scrollPos: {x: 0, y: 161.39996}
-    m_SelectedIDs: 66810000
+    m_SelectedIDs: b2720000
-    m_LastClickedID: 33126
+    m_LastClickedID: 29362
-    m_ExpandedIDs: 000000005a6f00005c6f00002071000000ca9a3bffffff7f
+    m_ExpandedIDs: 00000000dc700000de70000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -832,7 +832,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000005a6f00005c6f000000ca9a3bffffff7f
+    m_ExpandedIDs: 00000000dc700000de70000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -857,10 +857,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 1e6d0000
+    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 27934
+    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
-    m_ExpandedInstanceIDs: c6230000f06f00003a7b000058cc00005ecc0000000000006ed40000
+    m_ExpandedInstanceIDs: c6230000f06f00003a7b000058cc00005ecc00006ed400004e6e000000000000e0720000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -911,7 +911,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 69.6
     y: 557.60004
-    width: 1115.8
+    width: 1109.4
     height: 258.60004
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -938,12 +938,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1116.8
+    x: 1110.4
     y: 0
-    width: 342.3999
+    width: 348.79993
     height: 756.4
-  m_MinSize: {x: 275, y: 50}
+  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -970,9 +970,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1186.4
+    x: 1180
     y: 80.8
-    width: 341.3999
+    width: 347.79993
     height: 735.4
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -991,7 +991,7 @@ MonoBehaviour:
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
+  m_LastVerticalScrollValue: 54
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker:

ColorlessWorld-2024-4-2/UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 1459.2001
     height: 806.4
   m_ShowMode: 4
-  m_Title: "\u5C42\u7EA7"
+  m_Title: "\u9879\u76EE"
   m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 95
+  controlID: 10271
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 50
+  controlID: 10309
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -169,7 +169,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 51
+  controlID: 10310
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -206,7 +206,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -217,12 +217,12 @@ MonoBehaviour:
     height: 476.8
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 12}
   m_Panes:
   - {fileID: 14}
   - {fileID: 12}
-  m_Selected: 0
+  m_Selected: 1
-  m_LastSelected: 1
+  m_LastSelected: 0
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -233,7 +233,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
+  m_Name: ProjectBrowser
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -242,14 +242,14 @@ MonoBehaviour:
     y: 476.8
     width: 1110.4
     height: 279.60004
-  m_MinSize: {x: 101, y: 121}
+  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
   - {fileID: 16}
-  m_Selected: 1
+  m_Selected: 0
-  m_LastSelected: 0
+  m_LastSelected: 1
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -344,7 +344,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -415,7 +415,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 2afbffff
+      m_ExpandedIDs: ec9bfcff2afbffff6c6c00000a6f0000266f0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -783,9 +783,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 3.4023416, y: -0.40519047, z: 3.0697613}
+    m_Target: {x: 21.343927, y: 1.3062845, z: 5.7737494}
     speed: 2
-    m_Value: {x: 3.4023416, y: -0.40519047, z: 3.0697613}
+    m_Value: {x: 21.343927, y: 1.3062845, z: 5.7737494}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -831,13 +831,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.5492664, y: -0.000050011546, z: -0.00011234519, w: 0.83581644}
+    m_Target: {x: 0.44551942, y: 0.05358051, z: -0.026990743, w: 0.8934251}
     speed: 2
-    m_Value: {x: 0.54918873, y: -0.000050004477, z: -0.000112329304, w: 0.8356983}
+    m_Value: {x: -0.44551942, y: -0.05358051, z: 0.026990743, w: -0.8934251}
   m_Size:
-    m_Target: 7.0941286
+    m_Target: 1.4953429
     speed: 2
-    m_Value: 7.0941286
+    m_Value: 1.4953429
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -885,7 +885,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 69.6
     y: 557.60004
-    width: 1115.8
+    width: 1109.4
     height: 258.60004
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -908,7 +908,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/Card
+    - Assets/Scripts/UI
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -916,16 +916,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/Scripts/Card
+  - Assets/Scripts/UI
   m_LastFoldersGridSize: -1
   m_LastProjectPath: D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 79}
+    scrollPos: {x: 0, y: 161.39996}
-    m_SelectedIDs: 3c720000
+    m_SelectedIDs: b2720000
-    m_LastClickedID: 29244
+    m_LastClickedID: 29362
-    m_ExpandedIDs: 000000006c7000006e70000000ca9a3bffffff7f
+    m_ExpandedIDs: 00000000dc700000de70000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -953,7 +953,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000006c7000006e700000
+    m_ExpandedIDs: 00000000dc700000de70000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -981,7 +981,7 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 0
-    m_ExpandedInstanceIDs: c6230000f06f00003a7b000058cc00005ecc00006ed400004e6e000000000000
+    m_ExpandedInstanceIDs: c6230000f06f00003a7b000058cc00005ecc00006ed400004e6e000000000000e0720000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1086,7 +1086,7 @@ MonoBehaviour:
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
+  m_LastVerticalScrollValue: 54
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker: