diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset index eefa8a2c..96c47040 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset @@ -32,7 +32,7 @@ MonoBehaviour: column: 1 fatherLevelNodes: [] nextLevelNodes: - - {x: 1, y: 2} + - {x: 1, y: 1} - {x: 1, y: 0} - roomType: 0 isUse: 1 @@ -42,7 +42,7 @@ MonoBehaviour: column: 2 fatherLevelNodes: [] nextLevelNodes: - - {x: 1, y: 2} + - {x: 1, y: 3} - roomType: 0 isUse: 1 passBy: 0 @@ -93,11 +93,29 @@ MonoBehaviour: - roomType: 0 isUse: 1 passBy: 0 + nodePos: {x: -5.4530506, y: 0.059720993, z: -7.679108} + line: 1 + column: 1 + fatherLevelNodes: + - {x: 0, y: 1} + nextLevelNodes: + - {x: 2, y: 2} + - roomType: 1 + isUse: 0 + passBy: 0 + nodePos: {x: -5.4530544, y: 0.0597229, z: -6.679111} + line: 1 + column: 2 + fatherLevelNodes: [] + nextLevelNodes: [] + - roomType: 0 + isUse: 1 + passBy: 1 nodePos: {x: -5.45306, y: 0.059724808, z: -5.679114} line: 1 column: 3 fatherLevelNodes: - - {x: 0, y: 3} + - {x: 0, y: 2} nextLevelNodes: - {x: 2, y: 3} - {x: 2, y: 2} @@ -107,8 +125,10 @@ MonoBehaviour: nodePos: {x: -5.453064, y: 0.059726715, z: -4.679116} line: 1 column: 4 - fatherLevelNodes: [] - nextLevelNodes: [] + fatherLevelNodes: + - {x: 0, y: 3} + nextLevelNodes: + - {x: 2, y: 4} - levelDataList: - roomType: 0 isUse: 1 @@ -116,6 +136,14 @@ MonoBehaviour: nodePos: {x: -3.3230686, y: 0.059732437, z: -8.679108} line: 2 column: 0 + fatherLevelNodes: [] + nextLevelNodes: [] + - roomType: 0 + isUse: 1 + passBy: 0 + nodePos: {x: -3.3230724, y: 0.059734344, z: -7.679109} + line: 2 + column: 1 fatherLevelNodes: - {x: 1, y: 0} nextLevelNodes: @@ -174,7 +202,7 @@ MonoBehaviour: - {x: 4, y: 0} - roomType: 0 isUse: 1 - passBy: 1 + passBy: 0 nodePos: {x: -1.1930962, y: 0.059747696, z: -7.679107} line: 3 column: 1 @@ -208,8 +236,10 @@ MonoBehaviour: nodePos: {x: -1.1931071, y: 0.059753418, z: -4.679114} line: 3 column: 4 - fatherLevelNodes: [] - nextLevelNodes: [] + fatherLevelNodes: + - {x: 2, y: 4} + nextLevelNodes: + - {x: 4, y: 4} - levelDataList: - roomType: 0 isUse: 1 @@ -262,8 +292,8 @@ MonoBehaviour: fatherLevelNodes: [] nextLevelNodes: [] - levelDataList: - - roomType: 0 - isUse: 1 + - roomType: 1 + isUse: 0 passBy: 0 nodePos: {x: 3.0668812, y: 0.05977249, z: -8.679108} line: 5 @@ -309,8 +339,10 @@ MonoBehaviour: nodePos: {x: 3.0668788, y: 0.05978012, z: -4.679114} line: 5 column: 4 - fatherLevelNodes: [] - nextLevelNodes: [] + fatherLevelNodes: + - {x: 4, y: 4} + nextLevelNodes: + - {x: 6, y: 4} - levelDataList: - roomType: 6 isUse: 0 @@ -321,7 +353,7 @@ MonoBehaviour: fatherLevelNodes: [] nextLevelNodes: [] - roomType: 6 - isUse: 1 + isUse: 0 passBy: 0 nodePos: {x: 5.1968794, y: 0.05978775, z: -7.679109} line: 6 @@ -349,6 +381,14 @@ MonoBehaviour: column: 3 fatherLevelNodes: [] nextLevelNodes: [] + - roomType: 6 + isUse: 1 + passBy: 0 + nodePos: {x: 5.1968794, y: 0.059791565, z: -5.679115} + line: 6 + column: 3 + fatherLevelNodes: [] + nextLevelNodes: [] - roomType: 6 isUse: 1 passBy: 0 @@ -361,7 +401,7 @@ MonoBehaviour: - {x: 7, y: 4} - levelDataList: - roomType: 0 - isUse: 1 + isUse: 0 passBy: 0 nodePos: {x: 7.3268824, y: 0.059799194, z: -8.679108} line: 7 @@ -506,8 +546,12 @@ MonoBehaviour: nodePos: {x: 11.586924, y: 0.059833527, z: -4.679114} line: 9 column: 4 - fatherLevelNodes: [] - nextLevelNodes: [] + fatherLevelNodes: + - {x: 8, y: 3} + - {x: 8, y: 4} + nextLevelNodes: + - {x: 10, y: 3} + - {x: 10, y: 4} - levelDataList: - roomType: 1 isUse: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/RelicList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/RelicList.asset index e353e6d4..fcd14933 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/RelicList.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/RelicList.asset @@ -12,4 +12,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 904fb4225c416d84e891fac047459035, type: 3} m_Name: RelicList m_EditorClassIdentifier: - relicClassNameList: [] + relicClassNameList: + - LegacyNode_AgnisTorch + - LegacyNode_AncientSilverCoin + - LegacyNode_EnchantedConch + - LegacyNode_Starfish + - LegacyNode_SuspiciousMushroom diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset index 7ed84176..7e9f2910 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset @@ -13,13 +13,13 @@ MonoBehaviour: m_Name: cardDeckList m_EditorClassIdentifier: cardDeckList: - - 1029 - - 1030 - - 1013 - - 1013 - 1014 + - 1014 + - 1015 + - 1015 - 1015 - 1016 + - 1016 + - 1016 + - 1017 - 1017 - - 1013 - - 1013 diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02.meta new file mode 100644 index 00000000..3e357409 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a93792f5c2f79d8499f1bc1183475d79 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/boomAndPollute.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/boomAndPollute.png new file mode 100644 index 00000000..d1214fc9 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/boomAndPollute.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/boomAndPollute.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/boomAndPollute.png.meta new file mode 100644 index 00000000..18a64395 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/boomAndPollute.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 53333beffd4e3d24893b12a5a67116fa +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/fireseed.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/fireseed.png new file mode 100644 index 00000000..b0825f7b Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/fireseed.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/fireseed.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/fireseed.png.meta new file mode 100644 index 00000000..ed0e860c --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/fireseed.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: af4ed737b602ed644bb437910f86ec60 +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/freeze.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/freeze.png new file mode 100644 index 00000000..8038301c Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/freeze.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/freeze.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/freeze.png.meta new file mode 100644 index 00000000..2e026fce --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/freeze.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 05dd2502c5dead0458e54cb63d20f75e +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/para.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/para.png new file mode 100644 index 00000000..082e4702 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/para.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/para.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/para.png.meta new file mode 100644 index 00000000..9cffee94 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/para.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 876811427f51a814aaf7a5e454b4efce +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/posion.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/posion.png new file mode 100644 index 00000000..fccafdef Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/posion.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/posion.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/posion.png.meta new file mode 100644 index 00000000..63fa5399 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/posion.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 104d59e50377e344db32e7c25ae822d5 +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/vun.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/vun.png new file mode 100644 index 00000000..5901adc5 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/vun.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/vun.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/vun.png.meta new file mode 100644 index 00000000..e8f80380 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/vun.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: bc825601ff2cce74ebcf51f6297b229c +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/weak.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/weak.png new file mode 100644 index 00000000..88e252f4 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/weak.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/weak.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/weak.png.meta new file mode 100644 index 00000000..f2f96946 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/weak.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 141e1f4e7a7a66145ab4da274d362f48 +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/wet.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/wet.png new file mode 100644 index 00000000..8038301c Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/wet.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/wet.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/wet.png.meta new file mode 100644 index 00000000..d837b025 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/wet.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 975e0ff44013f2e4ea9714ecc50e5330 +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/RelicsIcon/LegacyNode_AgnisTorch.png b/ColorlessWorld-2024-4-2/Assets/Resources/RelicsIcon/LegacyNode_AgnisTorch.png index 7f9a1f81..3c461966 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/RelicsIcon/LegacyNode_AgnisTorch.png and b/ColorlessWorld-2024-4-2/Assets/Resources/RelicsIcon/LegacyNode_AgnisTorch.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/RelicsIcon/LegacyNode_AgnisTorch.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/RelicsIcon/LegacyNode_AgnisTorch.png.meta index 06c3cf5c..bc7a0735 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/RelicsIcon/LegacyNode_AgnisTorch.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/Resources/RelicsIcon/LegacyNode_AgnisTorch.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d1b04edc73aaf3d4592b4e1d700a71ed +guid: 96fd5be98196fa24b9a87d2805ea56c4 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 512 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs index aea38ba4..b4c092ae 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs @@ -8,7 +8,7 @@ public class Buff { public int value; public Sprite icon; - public string iconPath = "BuffIcon/"; + public string iconPath = "BuffIcon_v02/"; public virtual void Settle() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BoomAndPollute.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BoomAndPollute.cs index 8196e06d..00633894 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BoomAndPollute.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BoomAndPollute.cs @@ -22,7 +22,7 @@ public class Buff_BoomAndPollute : Buff { Buff buff = new Buff_BoomAndPollute(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_baowu_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "boomAndPollute"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_FireSeed.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_FireSeed.cs index c18724e1..2066662b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_FireSeed.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_FireSeed.cs @@ -23,7 +23,7 @@ public class Buff_FireSeed : Buff { Buff buff = new Buff_FireSeed(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_huozhong_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "fireseed"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Posion.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Posion.cs index 3b6b208b..8d5ecc35 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Posion.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Posion.cs @@ -44,7 +44,7 @@ public class Buff_Posion : Buff { Buff buff = new Buff_Posion(); buff.value = value; - buff .icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_zhongdu_v01"); + buff .icon = BuffDataManager.Instance.LoadImage(iconPath + "posion"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Vulnerable.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Vulnerable.cs index b263b79d..018db5af 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Vulnerable.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Vulnerable.cs @@ -26,7 +26,7 @@ public class Buff_Vulnerable : Buff { Buff buff = new Buff_Vulnerable(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_yishang_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "vun"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Weak.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Weak.cs index 9bcbadb8..fdfb15f2 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Weak.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Weak.cs @@ -25,7 +25,7 @@ public class Buff_Weak : Buff { Buff buff = new Buff_Weak(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_xuruo_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "weak"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Wet.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Wet.cs index 6a0ec8e3..dfe99fc7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Wet.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Wet.cs @@ -23,7 +23,7 @@ public class Buff_Wet : Buff { Buff buff = new Buff_Wet(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_huozhong_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "wet"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_coma.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_coma.cs index 88d5a8b3..d77747c3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_coma.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_coma.cs @@ -23,7 +23,7 @@ public class Buff_coma : Buff { Buff buff = new Buff_coma(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_hunmi_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "freeze"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_corrode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_corrode.cs index 40e9ef55..7e226e2b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_corrode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_corrode.cs @@ -24,7 +24,7 @@ public class Buff_corrode : Buff { Buff buff = new Buff_corrode(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_fushi_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "para"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_parasitism.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_parasitism.cs index 0a0aa545..21623db8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_parasitism.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_parasitism.cs @@ -24,7 +24,7 @@ public class Buff_parasitism : Buff { Buff buff = new Buff_parasitism(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_jisheng_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "para"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs index 39c3ce98..6be0f2e2 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs @@ -379,7 +379,7 @@ public class CardEntity : MonoBehaviour { thresholdShift += 2; } - if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_SuspiciousMushroom) + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_Starfish) && firstPart.Equals(Name.Color.Blue)) { thresholdShift += 1; @@ -615,7 +615,7 @@ public class CardEntity : MonoBehaviour List matchList=new List(); KeyValuePair> kvp = cardOriginalData.conditionAndFunctionVal.ElementAt(i); string[] keys= kvp.Key.Split("_"); - Debug.Log("cardId是" + cardOriginalData.CardId + "key是" + keys); + //Debug.Log("cardId是" + cardOriginalData.CardId + "key是" + keys); string[] functions = kvp.Value.Item1.Split("_"); string[] vals = kvp.Value.Item2.Split("_"); for (int j = 0; j < keys.Length; j++) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs index fed358ad..17b4fef3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs @@ -22,7 +22,7 @@ public class TurnMaster : Singleton public int settleTurn = 0; - public int commDrawCardsNum = 6; + public int commDrawCardsNum = 1; [Header("销毁卡牌延迟结束回合")] public bool continueTurn; @@ -80,7 +80,7 @@ public class TurnMaster : Singleton //回合开始结算玩家buff Usermanager.Instance.PlayerTurnBeginSettle(); //恢复cost - restoreResource(0); + restoreResource(settleTurn); //恢复体力 GameManager.Instance.playerState.currentStepRange = Usermanager.Instance.StepRangeCalculation(GameManager.Instance.playerState.maxStepRange); @@ -308,12 +308,17 @@ public class TurnMaster : Singleton else { continueTurn = false; + if (handCard.cardEntityList.Count == 0) + { + continueTurn = true; + } List cardIndex = new List(); foreach (var card in handCard.cardEntityList) { cardIndex.Add(card.cardId); } StartCoroutine(Discard(cardIndex)); + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlackSheep.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlackSheep.cs index 9b1041c1..65f0ba25 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlackSheep.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlackSheep.cs @@ -244,7 +244,7 @@ public class BlackSheep : MonoBehaviour IEnumerator JudgNextActionCoroutine() { - if (enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.sleep)) + if (enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.coma)) { } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs index 2cf80b88..e93256d1 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs @@ -238,7 +238,7 @@ public class DarkCloud : MonoBehaviour IEnumerator JudgNextActionCoroutine() { - if (enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.sleep)) + if (enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.coma)) { } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs index af38ad9c..05065e92 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs @@ -164,12 +164,21 @@ public class EnemyManager : Singleton } } + public void enemyRefreshEnemyBuffIcon(int settleTurn) + { + foreach (var observer in enemyObservers) + { + //observer.GetEnemyNode().enemyTurnSettleInit(); + observer.GetEnemyNode().enemyRefreshUIIcon(settleTurn); + } + } + public void enemyTurnSettle(int settleTurn) { foreach (var observer in enemyObservers) { //observer.GetEnemyNode().enemyTurnSettleInit(); - observer.GetEnemyNode().enemyTurnSettle(settleTurn); + observer.GetEnemyNode().enemyTurnSettle(settleTurn); } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs index 7c3ad3cc..a251fd96 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs @@ -1243,6 +1243,14 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver } } + public void enemyRefreshUIIcon(int settleTurn) + { + foreach (var key in EnemyState.abnormalCondition.Keys.ToList()) + { + enemyUIBar.RefreshEnemyBuffIcon(); + } + } + public void enemyShieldSettle(int settleTurn) { EnemyState.shieldValue = 0; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs index eee45c67..5f39c987 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs @@ -29,7 +29,8 @@ public class EnemyPool : MonoBehaviour public static Dictionary, float> bossEnemyPool = new Dictionary, float>() { - { new List { Name.EnemyName.Polymaw,Name.EnemyName.Grinfiend,Name.EnemyName.BlackSheep,Name.EnemyName.DarkCloud}, 1.0f }, + { new List { Name.EnemyName.Polymaw,Name.EnemyName.Polymaw,Name.EnemyName.Grinfiend,Name.EnemyName.BlackSheep, + Name.EnemyName.DarkCloud,Name.EnemyName.Mushroom}, 1.0f }, }; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs index 4d354f72..ed23840c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs @@ -268,7 +268,7 @@ public class Grinfiend : MonoBehaviour IEnumerator JudgNextActionCoroutine() { - if (enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.sleep)) + if (enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.coma)) { } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Mushroom.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Mushroom.cs index d5b21ece..804f8b96 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Mushroom.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Mushroom.cs @@ -319,7 +319,7 @@ public class Mushroom : MonoBehaviour IEnumerator JudgNextActionCoroutine() { - if (enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.sleep)) + if (enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.coma)) { } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs index 2e2231e9..c64d0652 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs @@ -257,7 +257,7 @@ public class Polymaw : MonoBehaviour IEnumerator JudgNextActionCoroutine() { - if (enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.sleep)) + if (enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.coma)) { } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs index 2358d098..f771a2f4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs @@ -572,7 +572,7 @@ public class SettlementManager : Singleton Usermanager.Instance.RefreshPlayerBuffIcon(); GameManager.Instance.SyncColourCountUI(); - + EnemyManager.Instance.enemyRefreshEnemyBuffIcon(0); }