diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab index eaf41576..1101549c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab @@ -260,6 +260,7 @@ GameObject: - component: {fileID: 5545682449418996990} - component: {fileID: 7526181906643281268} - component: {fileID: 7619122435525404041} + - component: {fileID: 4250043912389478458} m_Layer: 5 m_Name: Card_v04-Common m_TagString: Card @@ -439,6 +440,20 @@ MonoBehaviour: originPoint: {x: 0, y: 0, z: 0} UpperOffset: {x: 0, y: 115, z: 0} originRotation: {x: 0, y: 0, z: 0} +--- !u!114 &4250043912389478458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf52735b52f0c10419bd75250fe9591a, type: 3} + m_Name: + m_EditorClassIdentifier: + inforBar: {fileID: 0} + offSet: {x: 0.4, y: 0, z: -0.3} --- !u!1 &4343990849769966524 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab index f6f8c1d8..e8b32a4f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab @@ -421,7 +421,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &8739798778191560965 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2_blue.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2blue.png similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2_blue.png rename to ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2blue.png diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2_blue.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2blue.png.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2_blue.png.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2blue.png.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2_green.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2green.png similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2_green.png rename to ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2green.png diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2_green.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2green.png.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2_green.png.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2green.png.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2_red.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2red.png similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2_red.png rename to ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2red.png diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2_red.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2red.png.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2_red.png.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2red.png.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2white.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2white.png new file mode 100644 index 00000000..8ce23089 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2white.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2white.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2white.png.meta new file mode 100644 index 00000000..74c8d745 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2white.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 8e93b15952e3dd04e902b81ed8d810cd +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/CardIcon/3_1white.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/3_1white.png new file mode 100644 index 00000000..f6d7b4c0 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/3_1white.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/3_1white.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/3_1white.png.meta new file mode 100644 index 00000000..beebb459 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/3_1white.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 6a343fb69357b5545b47ce3401c00672 +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/CardIcon/3_2white.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/3_2white.png new file mode 100644 index 00000000..4169985e Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/3_2white.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/3_2white.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/3_2white.png.meta new file mode 100644 index 00000000..91034661 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/3_2white.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: db0f0303133a90c4f859eebb01eeefec +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/CardIcon/4_1white.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/4_1white.png new file mode 100644 index 00000000..f550ef41 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/4_1white.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/4_1white.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/4_1white.png.meta new file mode 100644 index 00000000..529c7339 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/4_1white.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 7877673896d29b84ca845f40972c9357 +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/ChooseWeapon.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity index 5ea12a96..6a6e2927 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity @@ -21739,6 +21739,7 @@ MonoBehaviour: m_EditorClassIdentifier: levelPrefab: {fileID: 2776771565202051383, guid: 8b905c93e0100a840bdd4b09bd25384a, type: 3} + levelBossPrefab: {fileID: 0} levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2} generatorPoint: {fileID: 2085448060} lineOffset: 100 @@ -22109,20 +22110,20 @@ MonoBehaviour: cardGroupsInfor: - cardGroupFathers: {fileID: 56212781} cardIDGroup: - - 1010 - - 1010 - - 1010 - - 1010 + - 1001 + - 1001 + - 1001 + - 1001 - cardGroupFathers: {fileID: 1514211913} cardIDGroup: - - 1011 - - 1011 - - 1011 - - 1011 + - 1002 + - 1002 + - 1002 + - 1002 - cardGroupFathers: {fileID: 1424524448} cardIDGroup: - - 1012 - - 1012 + - 1003 + - 1004 cardGroup_1: [] cardGroup_2: [] cardGroup_3: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index b555c4e6..0c6c091d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -3185,6 +3185,7 @@ Transform: - {fileID: 469385439} - {fileID: 1504312509} - {fileID: 172253752} + - {fileID: 2140661235} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &197140185 @@ -11227,6 +11228,82 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -261.96262} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &569168380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 569168383} + - component: {fileID: 569168382} + - component: {fileID: 569168381} + m_Layer: 0 + m_Name: PlanPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &569168381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569168380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.2528302, g: 0.2528302, b: 0.2528302, a: 0.8509804} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 100 +--- !u!222 &569168382 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569168380} + m_CullTransparentMesh: 1 +--- !u!224 &569168383 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569168380} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0000040025} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1132344148} + m_Father: {fileID: 2140661235} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -115.93756, y: 14.21344} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: -0.06969196, y: 0.56556535} --- !u!1 &572219194 GameObject: m_ObjectHideFlags: 0 @@ -12062,6 +12139,53 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 628053997} m_CullTransparentMesh: 1 +--- !u!1 &628364365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 628364367} + - component: {fileID: 628364366} + m_Layer: 0 + m_Name: CardInforBarManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &628364366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 628364365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9f2f6a3e81a55a4e989158e3351d7ee, type: 3} + m_Name: + m_EditorClassIdentifier: + InforBar: {fileID: 569168380} + InforBarFather: {fileID: 0} + InforBarPrefab: {fileID: 0} +--- !u!4 &628364367 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 628364365} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &628805901 GameObject: m_ObjectHideFlags: 0 @@ -14242,7 +14366,7 @@ GameObject: - component: {fileID: 789990415} - component: {fileID: 789990418} m_Layer: 5 - m_Name: TipsCanves + m_Name: "TipsCanves(\u6253\u5305\u8BB0\u5F97\u5220\u6389)" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -19885,6 +20009,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1131398885} m_CullTransparentMesh: 1 +--- !u!1 &1132344147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1132344148} + - component: {fileID: 1132344150} + - component: {fileID: 1132344149} + m_Layer: 0 + m_Name: StateText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1132344148 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1132344147} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 569168383} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 3.3984985, y: -5.8679047} + m_SizeDelta: {x: 193.2031, y: 194.1321} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1132344149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1132344147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1132344150 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1132344147} + m_CullTransparentMesh: 1 --- !u!1 &1135477413 GameObject: m_ObjectHideFlags: 0 @@ -38197,6 +38400,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2132133211} m_CullTransparentMesh: 1 +--- !u!1 &2140661234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2140661235} + - component: {fileID: 2140661238} + - component: {fileID: 2140661237} + - component: {fileID: 2140661236} + m_Layer: 0 + m_Name: CardInfarBarCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2140661235 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2140661234} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 569168383} + m_Father: {fileID: 196188496} + m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &2140661236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2140661234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &2140661237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2140661234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0.5 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &2140661238 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2140661234} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 330585545} + m_PlaneDistance: 7 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 1637390125 + m_SortingOrder: 2 + m_TargetDisplay: 0 --- !u!4 &29249060631100806 Transform: m_ObjectHideFlags: 0 @@ -40026,5 +40331,6 @@ SceneRoots: - {fileID: 992566371} - {fileID: 395072433} - {fileID: 2068068679} + - {fileID: 628364367} - {fileID: 789990414} - {fileID: 1751203284} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity index ecb39a5b..99565cd3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity @@ -8968,7 +8968,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &791507508 RectTransform: m_ObjectHideFlags: 0 @@ -17988,6 +17988,7 @@ MonoBehaviour: m_EditorClassIdentifier: levelPrefab: {fileID: 2776771565202051383, guid: 8b905c93e0100a840bdd4b09bd25384a, type: 3} + levelBossPrefab: {fileID: 0} levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2} generatorPoint: {fileID: 1772093050} lineOffset: 100 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity index 1c9d5f87..397f3184 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity @@ -2275,15 +2275,15 @@ RectTransform: m_GameObject: {fileID: 238416521} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1080464289} m_Father: {fileID: 1872135081} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -415, y: 128} + m_AnchoredPosition: {x: -200.00002, y: 128} m_SizeDelta: {x: 320, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &238416523 @@ -3251,15 +3251,15 @@ RectTransform: m_GameObject: {fileID: 431178196} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 761789731} m_Father: {fileID: 1872135081} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -415, y: -30} + m_AnchoredPosition: {x: -200.00002, y: -30} m_SizeDelta: {x: 320, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &431178198 @@ -5729,15 +5729,15 @@ RectTransform: m_GameObject: {fileID: 721368313} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 201273014} m_Father: {fileID: 1872135081} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -415, y: 334} + m_AnchoredPosition: {x: -200, y: 334} m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &721368315 @@ -9911,15 +9911,15 @@ RectTransform: m_GameObject: {fileID: 1173798763} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 774346662} m_Father: {fileID: 1872135081} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -418, y: 54} + m_AnchoredPosition: {x: -203.00002, y: 54} m_SizeDelta: {x: 320, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1173798765 @@ -14405,6 +14405,7 @@ MonoBehaviour: m_EditorClassIdentifier: levelPrefab: {fileID: 2776771565202051383, guid: 8b905c93e0100a840bdd4b09bd25384a, type: 3} + levelBossPrefab: {fileID: 0} levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2} generatorPoint: {fileID: 815931251} lineOffset: 100 @@ -18039,15 +18040,15 @@ RectTransform: m_GameObject: {fileID: 2146457976} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 635178497} m_Father: {fileID: 1872135081} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -415, y: 217} + m_AnchoredPosition: {x: -200.00002, y: 217} m_SizeDelta: {x: 320, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2146457978 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar.meta new file mode 100644 index 00000000..b29c407b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bfb3d543dc32b1a4383cbbf3a0f6c757 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInforOnMouse.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInforOnMouse.cs new file mode 100644 index 00000000..1a3475fe --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInforOnMouse.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.InputSystem; +using UnityEngine.UIElements; + +public class CardInforOnMouse : MonoBehaviour,IPointerEnterHandler ,IPointerExitHandler +{ + bool isShow; + [Header("信息表")] + public GameObject inforBar; + [Header("偏移量")] + public Vector3 offSet; + public void OnPointerEnter(PointerEventData eventData) + { + isShow = true; + inforBar = CardInfroBarManager.Instance.InforBar; + inforBar.SetActive(true); + } + + public void OnPointerExit(PointerEventData eventData) + { + isShow = false; + inforBar.SetActive(false); + } + + private void Update() + { + if(isShow ) + { + //跟随 + // inforBar .transform .position = Mouse.current.position.value; + inforBar.transform.position = transform .position +offSet ; + } + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInforOnMouse.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInforOnMouse.cs.meta new file mode 100644 index 00000000..968d9d61 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInforOnMouse.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cf52735b52f0c10419bd75250fe9591a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInfroBarManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInfroBarManager.cs new file mode 100644 index 00000000..eb3467a7 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInfroBarManager.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CardInfroBarManager : Singleton +{ + public GameObject InforBar; + public Transform InforBarFather; + public GameObject InforBarPrefab; + void Start() + { + DontDestroyOnLoad(this.gameObject); + } + +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInfroBarManager.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInfroBarManager.cs.meta new file mode 100644 index 00000000..1eb9cea8 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInfroBarManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d9f2f6a3e81a55a4e989158e3351d7ee +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ChooseWeaponManaher.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ChooseWeaponManaher.cs index 5a99b286..8ef6f2f6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ChooseWeaponManaher.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ChooseWeaponManaher.cs @@ -159,5 +159,49 @@ public class ChooseWeaponManager : Singleton } } + + PlayerStatsManager.Instance.cardDeck .cardDeckList .Clear (); + if(newCardGroup_1 .Count >0) + { + for (int i = 0; i < newCardGroup_1.Count; i++) + { + PlayerStatsManager.Instance.cardDeck.cardDeckList.Add(newCardGroup_1[i].cardId); + } + } + else + { + for (int i = 0; i < cardGroup_1.Count; i++) + { + PlayerStatsManager.Instance.cardDeck.cardDeckList.Add(cardGroup_1[i].cardId); + } + } + if (newCardGroup_2.Count > 0) + { + for (int i = 0; i < newCardGroup_2.Count; i++) + { + PlayerStatsManager.Instance.cardDeck.cardDeckList.Add(newCardGroup_2[i].cardId); + } + } + else + { + for (int i = 0; i < cardGroup_2.Count; i++) + { + PlayerStatsManager.Instance.cardDeck.cardDeckList.Add(cardGroup_2[i].cardId); + } + } + if (newCardGroup_3.Count > 0) + { + for (int i = 0; i < newCardGroup_3.Count; i++) + { + PlayerStatsManager.Instance.cardDeck.cardDeckList.Add(newCardGroup_3[i].cardId); + } + } + else + { + for (int i = 0; i < cardGroup_3.Count; i++) + { + PlayerStatsManager.Instance.cardDeck.cardDeckList.Add(cardGroup_3[i].cardId); + } + } } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ColorSlot.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ColorSlot.cs index 4636ac39..c6ac51c0 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ColorSlot.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ColorSlot.cs @@ -61,7 +61,7 @@ public class ColorSlot : MonoBehaviour } string newcard; - newcard = CardManager.Instance.SwitchCardAllColor(cardEntity.cardId, cardEntity.cardOriginalData, newColor); + newcard = CardManager.Instance.switchColorAndAllCondition(cardEntity.cardId, cardEntity.cardOriginalData, newColor); return newcard; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs index 38f86d16..be042319 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs @@ -293,11 +293,17 @@ public class MapUnity : MonoBehaviour whoColourPlane.SetActive(true); break; case Name.NodeColor.Black: - var blackPartical = Instantiate(ParticalManager.Instance.blueParticleEffect, planePoint.position, ParticalManager.Instance.redParticleEffect.transform.rotation); + var blackPartical = Instantiate(ParticalManager.Instance.blueParticleEffect, planePoint.position, ParticalManager.Instance.blueParticleEffect.transform.rotation); blackPartical.transform.SetParent(transform); mapGameObject.SetActive(false); whoColourPlane.SetActive(true); break; + case Name.NodeColor.White: + var whitePartical = Instantiate(ParticalManager.Instance.blueParticleEffect, planePoint.position, ParticalManager.Instance.blueParticleEffect.transform.rotation); + whitePartical.transform.SetParent(transform); + mapGameObject.SetActive(true); + whoColourPlane.SetActive(false); + break; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs index 75c14956..866922e0 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs @@ -168,26 +168,6 @@ public class CardManager : Singleton return newCardId; } - public string SwitchCardAllColor(string orginalCardId, CardOriginalData cardOriginalData, string newColor) - { - //改条件 - for(int i=0;i(JsonConvert.SerializeObject(cardOriginalData)); - for (int i = 0; i < newCardOriginalData.nodesColor.Length; i++) - { - newCardOriginalData.nodesColor[i] = newColor; - } - string newCardImgPath = "CardIcon/" + cardOriginalData.EffectRange + newColor; - newCardOriginalData.ImgPath = newCardImgPath; - - string newCardId = AddElementToDictionary(CardOriginalDataList.Instance.existCardOriginalDataList, cardOriginalData.CardId, newCardOriginalData); - return newCardId; - } public static string AddElementToDictionary(Dictionary dictionary, string baseKey, CardOriginalData value) { string key = baseKey;