diff --git a/ColorlessWorld-2024-4-2/Assets/Image/测试.meta b/ColorlessWorld-2024-4-2/Assets/Image/测试.meta new file mode 100644 index 00000000..95bc7a7d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/测试.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 340bb8c5884a4f74bb52f56d09c9da69 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/测试/测试场景.meta b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试场景.meta new file mode 100644 index 00000000..2c69ee26 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试场景.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 97d0ab1fefcb4cd4bb3fdc1ecf59719b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/测试/测试场景/roberts269969__30011932-f5e9-4547-8efa-c7b3793e5747.png b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试场景/roberts269969__30011932-f5e9-4547-8efa-c7b3793e5747.png new file mode 100644 index 00000000..f4806e7c Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试场景/roberts269969__30011932-f5e9-4547-8efa-c7b3793e5747.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/测试/测试场景/roberts269969__30011932-f5e9-4547-8efa-c7b3793e5747.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试场景/roberts269969__30011932-f5e9-4547-8efa-c7b3793e5747.png.meta new file mode 100644 index 00000000..d1df06e3 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试场景/roberts269969__30011932-f5e9-4547-8efa-c7b3793e5747.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 07540e0d5e6060f439bc90ab08abaafe +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: 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: 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: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物.meta b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物.meta new file mode 100644 index 00000000..e3832e80 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6612c820011111c41b21992aa2709347 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物/怪物_1.png b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物/怪物_1.png new file mode 100644 index 00000000..5a0e1428 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物/怪物_1.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物/怪物_1.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物/怪物_1.png.meta new file mode 100644 index 00000000..bbb0d223 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物/怪物_1.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 4401a8ed029f0a246b2cf780151541da +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: 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: 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: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物/怪物_2.png b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物/怪物_2.png new file mode 100644 index 00000000..1aec1089 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物/怪物_2.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物/怪物_2.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物/怪物_2.png.meta new file mode 100644 index 00000000..07e50f6e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/测试/测试怪物/怪物_2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 1db3c55c34dd06443bf2678247b1eb18 +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: 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: 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: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/tree.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/tree.prefab index b44c68f8..6bba831f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/tree.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/tree.prefab @@ -168,6 +168,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + colorUnderAttack: 0 canMove: 0 planAction: 0 drawCardCount: 2 diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/BlackSheep.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/BlackSheep.prefab index 809a4204..8ae521d7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/BlackSheep.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/BlackSheep.prefab @@ -1,5 +1,107 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1242347969481838859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9003921760140663279} + - component: {fileID: 3350121520416830920} + - component: {fileID: 3793525103872995041} + m_Layer: 9 + m_Name: Square (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9003921760140663279 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1242347969481838859} + serializedVersion: 2 + m_LocalRotation: {x: 0.08715337, y: 0.0073893657, z: -0.0006464859, w: 0.99616736} + m_LocalPosition: {x: -0.051, y: 0.78, z: -0.024} + m_LocalScale: {x: 0.24267429, y: 0.28157, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4276721484070507378} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3350121520416830920 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1242347969481838859} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -696370157 + m_SortingLayer: 2 + m_SortingOrder: -1 + m_Sprite: {fileID: 21300000, guid: 4401a8ed029f0a246b2cf780151541da, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &3793525103872995041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1242347969481838859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} + maxAnglesX: 0 + minAnglesX: 0 + maxAnglesY: 0 + minAnglesY: 0 --- !u!1 &1253231568001379261 GameObject: m_ObjectHideFlags: 0 @@ -33,9 +135,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 719232722191935980} + - {fileID: 9003921760140663279} - {fileID: 8888823514061126702} - {fileID: 6503119109324506896} + - {fileID: 719232722191935980} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &7989887375954300062 @@ -123,6 +226,8 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} + blockUIBar: {fileID: 0} + enemyUI: {fileID: 0} followPoint: {fileID: 8888823514061126702} bone: {fileID: 0} bone_Re: {fileID: 0} @@ -153,6 +258,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + colorUnderAttack: 0 canMove: 0 planAction: 0 --- !u!114 &2630096967588951713 @@ -484,7 +590,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &719232722191935980 Transform: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 681895bd..e44b2f29 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -5567,7 +5567,7 @@ MonoBehaviour: type: 3} textInCondition: {fileID: 2195466461428280820, guid: ef66a5db78741da4d93f90fcdcb7176a, type: 3} - tree: {fileID: 2458175114420723768, guid: 1daabfecd71e04b4a8a8a2664ac80287, type: 3} + tree: {fileID: 2458175114420723768, guid: f3c59a4c3b3c54a4c952f50e44940dfc, type: 3} --- !u!1 &282261046 GameObject: m_ObjectHideFlags: 0 @@ -37404,7 +37404,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1598057360} m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} - m_LocalPosition: {x: 0, y: 0, z: -1774.92} + m_LocalPosition: {x: 0, y: 0, z: -1658} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: [] @@ -37412,8 +37412,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -97.27, y: 19.08} - m_SizeDelta: {x: 1906.43, y: 2182.03} + m_AnchoredPosition: {x: -114.72, y: 136} + m_SizeDelta: {x: 1967, y: 2182.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1598057362 MonoBehaviour: @@ -37435,7 +37435,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 68336e7c47cff7f41ba97c5c23aba342, type: 3} + m_Sprite: {fileID: 21300000, guid: 07540e0d5e6060f439bc90ab08abaafe, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TreeNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TreeNode.cs index 5e8cbeda..94ac6ab4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TreeNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TreeNode.cs @@ -22,6 +22,7 @@ public class TreeNode : BlockNode yield return StartCoroutine(TurnMaster.Instance.MoveCards()); GameManager.Instance.X[positionX].Y[positionY].blocked = false; GameManager.Instance.X[positionX].Y[positionY].enemyNode = null; + Destroy(this.gameObject); yield break; } }