diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset index de390cf3..b71ccccc 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset @@ -29,7 +29,7 @@ MonoBehaviour: currentSkillCoolDown: 3 damageMultiplier: 1 damage: 7 - attackRange: 5 + attackRange: 3 aoeRange: 2 maxNumberOfHits: 0 currentNumberOfHits: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset index 02f217cf..f9d20873 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset @@ -29,7 +29,7 @@ MonoBehaviour: currentSkillCoolDown: 3 damageMultiplier: 1 damage: 0 - attackRange: 6 + attackRange: 3 aoeRange: 0 maxNumberOfHits: 0 currentNumberOfHits: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/FailedSample.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/FailedSample.asset index 05484683..09814dc7 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/FailedSample.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/FailedSample.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: enemyName: BoundSoul enemyIcon: {fileID: 21300000, guid: bd8f3094e7ef01148bddd857e065ebc3, type: 3} - stepRange: 4 + stepRange: 3 stepRangeMultiplier: 1 speed: 4 maxMoveCoolDown: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Leviathan.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Leviathan.asset index 5fcf2c3c..76ab0a16 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Leviathan.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Leviathan.asset @@ -29,7 +29,7 @@ MonoBehaviour: currentSkillCoolDown: 3 damageMultiplier: 1 damage: 25 - attackRange: 4 + attackRange: 3 aoeRange: 2 maxNumberOfHits: 0 currentNumberOfHits: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pharmacist.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pharmacist.asset index c4adbcd0..2d29ed87 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pharmacist.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pharmacist.asset @@ -29,7 +29,7 @@ MonoBehaviour: currentSkillCoolDown: 3 damageMultiplier: 1 damage: 10 - attackRange: 6 + attackRange: 4 aoeRange: 0 maxNumberOfHits: 0 currentNumberOfHits: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pollutinel.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pollutinel.asset index 541bbe5f..32d6f2a6 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pollutinel.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pollutinel.asset @@ -29,7 +29,7 @@ MonoBehaviour: currentSkillCoolDown: 3 damageMultiplier: 1 damage: 8 - attackRange: 4 + attackRange: 3 aoeRange: 2 maxNumberOfHits: 0 currentNumberOfHits: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/PollutionSpreader.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/PollutionSpreader.asset index 55310497..81ec3e81 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/PollutionSpreader.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/PollutionSpreader.asset @@ -29,7 +29,7 @@ MonoBehaviour: currentSkillCoolDown: 3 damageMultiplier: 1 damage: 4 - attackRange: 4 + attackRange: 3 aoeRange: 2 maxNumberOfHits: 0 currentNumberOfHits: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/RatWarrior.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/RatWarrior.asset index 6a23b8fe..eeb5d85d 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/RatWarrior.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/RatWarrior.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: enemyName: RatWarrior enemyIcon: {fileID: 21300000, guid: bd8f3094e7ef01148bddd857e065ebc3, type: 3} - stepRange: 4 + stepRange: 3 stepRangeMultiplier: 1 speed: 3 maxMoveCoolDown: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/ReconnaissanceBee.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/ReconnaissanceBee.asset index f836341f..2c46d451 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/ReconnaissanceBee.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/ReconnaissanceBee.asset @@ -29,7 +29,7 @@ MonoBehaviour: currentSkillCoolDown: 3 damageMultiplier: 1 damage: 5 - attackRange: 4 + attackRange: 2 aoeRange: 0 maxNumberOfHits: 0 currentNumberOfHits: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/SoulMaker.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/SoulMaker.asset index dffa9c58..673385cb 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/SoulMaker.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/SoulMaker.asset @@ -29,7 +29,7 @@ MonoBehaviour: currentSkillCoolDown: 3 damageMultiplier: 1 damage: 8 - attackRange: 4 + attackRange: 2 aoeRange: 0 maxNumberOfHits: 0 currentNumberOfHits: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta b/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta deleted file mode 100644 index 1d182472..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5b07afdbcf13e43438545d591cfd2e4b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Monster.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Monster.png new file mode 100644 index 00000000..b19a90b4 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Monster.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Monster.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Monster.png.meta new file mode 100644 index 00000000..a35e44a9 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Monster.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: c70cfc2f90b367447a1d47fe4aecffa7 +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: + - serializedVersion: 2 + name: Monster_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4219d2a15bf5e7d40b61af5a9e124261 + internalID: -143651760 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Monster_0: -143651760 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Armor.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Armor.png new file mode 100644 index 00000000..4611ab18 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Armor.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Armor.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Armor.png.meta new file mode 100644 index 00000000..5dc164b2 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Armor.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: bc9464a38a392104a9e7eb4c40d35fbf +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/Resources/BuffIcon_v02/CantShield.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/CantShield.png new file mode 100644 index 00000000..b1482897 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/CantShield.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/CantShield.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/CantShield.png.meta new file mode 100644 index 00000000..40b5ff7e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/CantShield.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 6f2132dce0b5ad24ea93f3509069b833 +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/Resources/BuffIcon_v02/Monster.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Monster.png new file mode 100644 index 00000000..b19a90b4 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Monster.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Monster.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Monster.png.meta new file mode 100644 index 00000000..fff8981d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Monster.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 4ebe85f56bcdd0842ad879e9ee886e14 +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: + - serializedVersion: 2 + name: Monster_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4219d2a15bf5e7d40b61af5a9e124261 + internalID: -143651760 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Monster_0: -143651760 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Shedding.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Shedding.png new file mode 100644 index 00000000..bf6f646e Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Shedding.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Shedding.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Shedding.png.meta new file mode 100644 index 00000000..896aed8b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Shedding.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 36868da9f8aaa63438d2307bfe429010 +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/Resources/BuffIcon_v02/StoneSkin.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/StoneSkin.png new file mode 100644 index 00000000..40ca4304 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/StoneSkin.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/StoneSkin.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/StoneSkin.png.meta new file mode 100644 index 00000000..2bde4deb --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/StoneSkin.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 3586e5bd352042841a140d070fa2ab06 +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/Resources/BuffIcon_v02/血疗.jpg b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/血疗.jpg new file mode 100644 index 00000000..42f2dd3b Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/血疗.jpg differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/血疗.jpg.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/血疗.jpg.meta new file mode 100644 index 00000000..a8620b3a --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/血疗.jpg.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: e4fafd1d73d62f345a69cb10e0c31826 +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/Resources/BuffIcon_v02/赋能.jpg b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/赋能.jpg new file mode 100644 index 00000000..7708b8b5 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/赋能.jpg differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/赋能.jpg.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/赋能.jpg.meta new file mode 100644 index 00000000..c820c223 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/赋能.jpg.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 1094c69b678619546952c4c9f14bb14b +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/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 4a90f845..fedb452f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -53759,7 +53759,11 @@ MonoBehaviour: generatePoint: {fileID: 514899946} lineOffSet: {x: 1.43, y: 0, z: 0} columnOffSet: {x: 0, y: 0, z: 0.86} - enemyGenerateDataList: [] + enemyGenerateDataList: + - enemyPrefab: {fileID: 1253231568001379261, guid: a3234acb1bf506e4ba6a68d9c87bb537, + type: 3} + locationX: 3 + locationY: 3 mapUnityFather: {fileID: 471426433} playerNameText: {fileID: 1103775266} cardDeckNumberText: {fileID: 1577863296} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_AcidRain.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_AcidRain.cs index 6e2cbcb3..cbae2227 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_AcidRain.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_AcidRain.cs @@ -24,7 +24,7 @@ public class Buff_AcidRain : Buff { Buff buff = new Buff_AcidRain(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Armor.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Armor.cs index cc143a7e..1f4d3571 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Armor.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Armor.cs @@ -22,7 +22,7 @@ public class Buff_Armor : Buff { Buff buff = new Buff_Armor(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "fireseed"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Armor"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed3TurnCost.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed3TurnCost.cs index 18c4f55e..d486469d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed3TurnCost.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed3TurnCost.cs @@ -21,7 +21,7 @@ public class Buff_Bleed3TurnCost : Buff { Buff buff = new Buff_Bleed3TurnCost(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "¸³ÄÜ"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed4TurnCost.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed4TurnCost.cs index f91fd10a..b985f464 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed4TurnCost.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed4TurnCost.cs @@ -22,7 +22,7 @@ public class Buff_Bleed4TurnCost : Buff { Buff buff = new Buff_Bleed4TurnCost(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "¸³ÄÜ"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BleedHeal.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BleedHeal.cs index 2efe7c5f..0ad6f68d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BleedHeal.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BleedHeal.cs @@ -24,7 +24,7 @@ public class Buff_BleedHeal : Buff { Buff buff = new Buff_BleedHeal(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "ѪÁÆ"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BoundSoul.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BoundSoul.cs index e62cc92b..678d5f8f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BoundSoul.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BoundSoul.cs @@ -24,7 +24,7 @@ public class Buff_BoundSoul : Buff { Buff buff = new Buff_BoundSoul(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_CantShield.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_CantShield.cs index 05be8763..69df318d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_CantShield.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_CantShield.cs @@ -20,7 +20,7 @@ public class Buff_CantShield : Buff { Buff buff = new Buff_CantShield(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "CantShield"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ContaminatusImmortalis.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ContaminatusImmortalis.cs index aec80d33..d1fc0674 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ContaminatusImmortalis.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ContaminatusImmortalis.cs @@ -24,7 +24,7 @@ public class Buff_ContaminatusImmortalis : Buff { Buff buff = new Buff_ContaminatusImmortalis(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_FailedSample.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_FailedSample.cs index b3e34015..ba6bb41d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_FailedSample.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_FailedSample.cs @@ -24,7 +24,7 @@ public class Buff_FailedSample : Buff { Buff buff = new Buff_FailedSample(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_LivingArmor.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_LivingArmor.cs index 4ff8361f..c5e966cf 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_LivingArmor.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_LivingArmor.cs @@ -24,7 +24,7 @@ public class Buff_LivingArmor : Buff { Buff buff = new Buff_LivingArmor(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Pharmacist.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Pharmacist.cs index 4526d264..2aaff28b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Pharmacist.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Pharmacist.cs @@ -24,7 +24,7 @@ public class Buff_Pharmacist : Buff { Buff buff = new Buff_Pharmacist(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PollutionSpreader.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PollutionSpreader.cs index 79388e64..573c5841 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PollutionSpreader.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PollutionSpreader.cs @@ -24,7 +24,7 @@ public class Buff_PollutionSpreader : Buff { Buff buff = new Buff_PollutionSpreader(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PrismReflector.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PrismReflector.cs index 21562674..712944af 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PrismReflector.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PrismReflector.cs @@ -24,7 +24,7 @@ public class Buff_PrismReflector : Buff { Buff buff = new Buff_PrismReflector(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_RatWarrior.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_RatWarrior.cs index f35f514e..ff9f8de5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_RatWarrior.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_RatWarrior.cs @@ -24,7 +24,7 @@ public class Buff_RatWarrior : Buff { Buff buff = new Buff_RatWarrior(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ReconnaissanceBee.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ReconnaissanceBee.cs index d7f2006c..bc6da045 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ReconnaissanceBee.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ReconnaissanceBee.cs @@ -24,7 +24,7 @@ public class Buff_ReconnaissanceBee : Buff { Buff buff = new Buff_ReconnaissanceBee(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Disabled"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Shedding.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Shedding.cs index fa53aef4..5df8a8b3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Shedding.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Shedding.cs @@ -22,7 +22,7 @@ public class Buff_Shedding : Buff { Buff buff = new Buff_Shedding(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "fireseed"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Shedding"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_SoulMaker.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_SoulMaker.cs index af1f29fe..4e2d655b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_SoulMaker.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_SoulMaker.cs @@ -24,7 +24,7 @@ public class Buff_SoulMaker : Buff { Buff buff = new Buff_SoulMaker(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_StonePillar.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_StonePillar.cs index 743f66f3..9204be39 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_StonePillar.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_StonePillar.cs @@ -24,7 +24,7 @@ public class Buff_StonePillar : Buff { Buff buff = new Buff_StonePillar(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_StoneSkin.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_StoneSkin.cs index 013ebf43..5bf67a26 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_StoneSkin.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_StoneSkin.cs @@ -24,7 +24,7 @@ public class Buff_StoneSkin : Buff { Buff buff = new Buff_StoneSkin(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "StoneSkin"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Thief.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Thief.cs index 1dc738cb..0063ce37 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Thief.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Thief.cs @@ -24,7 +24,7 @@ public class Buff_Thief : Buff { Buff buff = new Buff_Thief(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Twinbee.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Twinbee.cs index 33e5cea3..b1f5a1b7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Twinbee.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Twinbee.cs @@ -24,7 +24,7 @@ public class Buff_Twinbee : Buff { Buff buff = new Buff_Twinbee(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "TwinBee"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs index b35b7f0f..44bc7eef 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs @@ -51,7 +51,9 @@ public class MapManager : Singleton { // StartCoroutine (starttest());//¼ÓÔصؿ鶯»­ //¿ªÊ¼¼ÓÔصؿé - StartCoroutine(GenerateProcess()); + + +; StartCoroutine(GenerateProcess()); SetUpScenceInfor(); } @@ -180,11 +182,12 @@ public class MapManager : Singleton yield return StartCoroutine(TransformMapUnity()); yield return StartCoroutine(SetUpMapUnityForCube()); yield return StartCoroutine(UPMoveMapUnity()); - // yield return new WaitForSeconds(2); - yield return StartCoroutine(GenerateItem()); + // yield return new WaitForSeconds(2); + yield return StartCoroutine(PlayerGenerate()); yield return StartCoroutine(EnemyGenerate()); // yield return StartCoroutine(GenerateMask()); yield return StartCoroutine(CompleteGenerate()); + } IEnumerator GenerateMask() { @@ -254,16 +257,28 @@ public class MapManager : Singleton { // yield return StartCoroutine(EnemyGenerate()); yield return new WaitForSeconds(1); - GameManager.Instance.player.StartPlayer(); + //GameManager.Instance.player.StartPlayer(); GameManager.Instance.complete = true; EnemyManager.Instance.SpeedSortList(); EnemyManager.Instance.EnemySortIconGnerate(); + } + + IEnumerator PlayerGenerate() + { + // yield return StartCoroutine(EnemyGenerate()); + GameManager.Instance.player.StartPlayer(); + yield return null; + } IEnumerator EnemyGenerate() { - // yield return StartCoroutine(SetUpMapUnity()); + // yield return StartCoroutine(SetUpMapUnity()); + if (GameManager.Instance.playerOn != null) + { + Debug.Log("playerÔÚ" + GameManager.Instance.playerOn); + } foreach (var enemy in enemyGenerateDataList) { var currentEnemy = Instantiate(enemy.enemyPrefab, getNodeTools.LocationToGetNode(enemy.locationX,enemy.locationY).transform.position, enemy.enemyPrefab.transform.rotation); @@ -295,11 +310,33 @@ public class MapManager : Singleton List enemyPrefabList = EnemyPool.getEnemyPrefab(enemyList); - HashSet allCanUseNode = getNodeTools.getAllCanUseNode(); + HashSet allCanUseNode = new HashSet(); + //allCanUseNode = getNodeTools.getAllCanUseNode(); if (enemyPrefabList.Count > 0) { foreach (var enemyPrefab in enemyPrefabList) { + if (enemyPrefab.GetComponent().enemyScript.Equals(EnemyNode.EnemyScript.StonePillar)) + { + allCanUseNode = getNodeTools.getAllCanUseNode(); + } + else if (enemyPrefab.GetComponent().templateEnemyState.attackRange==1) + { + HashSet meleeList = new HashSet(); + //Dictionary endNodeMapUnityMap = new Dictionary(); + meleeList.Add(GameManager.Instance.playerOn); + getNodeTools.getArcNode(meleeList, 5); + allCanUseNode=meleeList; + } + else if (enemyPrefab.GetComponent().templateEnemyState.attackRange > 1) + { + HashSet meleeList = new HashSet(); + //Dictionary endNodeMapUnityMap = new Dictionary(); + meleeList.Add(GameManager.Instance.playerOn); + getNodeTools.getArcNode(meleeList, 7); + allCanUseNode = meleeList; + } + Debug.Log("EnemyNode³É¹¦"+ enemyPrefab.GetComponent().enemyScript); MapUnity currentMapUnity = allCanUseNode.ElementAt(Random.Range(0, allCanUseNode.Count)); var currentEnemy = Instantiate(enemyPrefab, currentMapUnity.transform.position, enemyPrefab.transform.rotation); EnemyNode enemynode = currentEnemy.GetComponent(); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs index 3e99ec6c..e291d3cf 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs @@ -468,7 +468,7 @@ public class getNodeTools nodeList.UnionWith(mapUnityList); } - + //µ¥È¦µØ¿é public static void getArcNode(HashSet nodeList, int range) { HashSet smallCircleNodeSet=new HashSet(nodeList); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs index 5964b729..9f872105 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs @@ -131,7 +131,7 @@ public class BuffDataManager : Singleton case AbnormalCondition.Buff_FailedSample: return "²»Îȶ¨£ºÈç¹û»ØºÏ½áÊøʱºòÔÚ²»ÎÛȾµØ¿é£¬Ëæ»ú»ñµÃÒ»ÖÖ¼õÒæ"; case AbnormalCondition.Buff_Pharmacist: - return ":»ØºÏ½áÊøʱ£¬ÒƳýÆäËû¹ÖÎ³ý×ÔÉíÍ⣩µÄÒ»¸ö¼õÒæЧ¹û£¬Ã¿ÒƳýÒ»²ã£¬Ëæ»úÔì³É¹ÖÎïÖÜΧһ´¦ÎÛȾ"; + return "»ØºÏ½áÊøʱ£¬ÒƳýÆäËû¹ÖÎ³ý×ÔÉíÍ⣩µÄÒ»¸ö¼õÒæЧ¹û£¬Ã¿ÒƳýÒ»²ã£¬Ëæ»úÔì³É¹ÖÎïÖÜΧһ´¦ÎÛȾ"; case AbnormalCondition.Buff_RatWarrior: return "ÉúÃüÖµÔ½µÍÉ˺¦Ô½µÍ"; case AbnormalCondition.Buff_LivingArmor: @@ -144,6 +144,8 @@ public class BuffDataManager : Singleton return "ÿÊÕµ½Ò»´Î¹¥»÷£¬ÎÛȾÖÜΧһȦµØ¿é"; case AbnormalCondition.Buff_StonePillar: return "±»ÆÆ»µºó£¬¼õÉÙ¾ÞÊÞÒ»²ãʯ·ô"; + case AbnormalCondition.stoneSkin: + return "ʯ·ô:ÿ²ã¼õÉÙ20%ÊÕµ½µÄÉ˺¦"; case AbnormalCondition.acidRain: return "ÿ´ÎÊÕµ½¹¥»÷£¬Ëæ»úÎÛȾ3¸ñÍæ¼ÒµØ¿é"; case AbnormalCondition.halfDamageInBlack: