diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/DarkCloud.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/DarkCloud.asset index 7640884f..175b8ef9 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/DarkCloud.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/DarkCloud.asset @@ -21,7 +21,7 @@ MonoBehaviour: currentMoveCoolDown: 0 shieldValue: 0 upShieldValue: 7 - maxHP: 0 + maxHP: 25 currentHP: 25 sufferDamageMultiply: 1 colourType: 0 @@ -30,3 +30,4 @@ MonoBehaviour: damageMultiplier: 1 damage: 4 attackRange: 3 + aoeRange: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(95).png b/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(95).png new file mode 100644 index 00000000..37c6b259 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(95).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(95).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(95).png.meta new file mode 100644 index 00000000..12d55334 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(95).png.meta @@ -0,0 +1,150 @@ +fileFormatVersion: 2 +guid: ae02f7f10fca77048b3761d73b7caf01 +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: 2 + 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: "\u672A\u547D\u540D\u4F5C\u54C1(95)_0" + rect: + serializedVersion: 2 + x: 75 + y: 68 + width: 163 + height: 171 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3ee4484675712d94ab1173a442526d6f + internalID: -67020154 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u672A\u547D\u540D\u4F5C\u54C1(95)_0": -67020154 + "\u672A\u547D\u540D\u4F5C\u54C1(95)_1": 267767643 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(96).png b/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(96).png new file mode 100644 index 00000000..454c1b61 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(96).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(96).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(96).png.meta new file mode 100644 index 00000000..df8da0af --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(96).png.meta @@ -0,0 +1,174 @@ +fileFormatVersion: 2 +guid: f4b07260ff13fa449a46460fe998d9f0 +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: 2 + 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: "\u672A\u547D\u540D\u4F5C\u54C1(96)_1" + rect: + serializedVersion: 2 + x: 346 + y: 41 + width: 1690 + height: 1594 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 362483a3563674349a90ce9d0cb9545b + internalID: 1805441527 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(96)_4" + rect: + serializedVersion: 2 + x: 1074 + y: 36 + width: 7 + height: 38 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8ebce1663f6563c43b8b18c2d2517baf + internalID: 55801457 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u672A\u547D\u540D\u4F5C\u54C1(96)_0": 1319205419 + "\u672A\u547D\u540D\u4F5C\u54C1(96)_1": 1805441527 + "\u672A\u547D\u540D\u4F5C\u54C1(96)_2": -1750540145 + "\u672A\u547D\u540D\u4F5C\u54C1(96)_3": 190191677 + "\u672A\u547D\u540D\u4F5C\u54C1(96)_4": 55801457 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/BlackMap-1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/BlackMap-1.mat index 4f97f267..80528407 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/BlackMap-1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/BlackMap-1.mat @@ -120,7 +120,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-1.mat index df52bb44..8f8d8574 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-1.mat @@ -120,7 +120,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-2.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-2.mat index 86ce5a16..16d72473 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-2.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-2.mat @@ -120,7 +120,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3.mat index 066c18e9..01334e93 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3.mat @@ -120,7 +120,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-1.mat index dc2900c5..b20f4bc3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-1.mat @@ -107,7 +107,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-2.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-2.mat index a31867ce..8618165c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-2.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-2.mat @@ -107,7 +107,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-3.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-3.mat index 75d1ddf1..aa9912e8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-3.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-3.mat @@ -107,7 +107,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-4.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-4.mat index 8696571b..b4d7b498 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-4.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-4.mat @@ -107,7 +107,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5.mat index 031f2b41..3f08b3fc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5.mat @@ -107,7 +107,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/MapUnityHight.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/MapUnityHight.mat index 6b210fcc..097d643f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/MapUnityHight.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/MapUnityHight.mat @@ -117,7 +117,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-1.mat index 6d1b6f4c..6abfa1c4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-1.mat @@ -120,7 +120,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-2.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-2.mat index bcdf642b..dfc02736 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-2.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-2.mat @@ -120,7 +120,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BlackSheep.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BlackSheep.prefab index b053c3b6..4c94fa6a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BlackSheep.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BlackSheep.prefab @@ -79,6 +79,42 @@ MonoBehaviour: moveType: 0 rangePool: [] aoeRangePool: [] + jumpHeight: 1 + posCount: 7 + jumpSpeed: 25 + speedCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.00000032782555 + value: 1.0011742 + inSlope: -1.4465826 + outSlope: -1.4465826 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.7666647 + - serializedVersion: 3 + time: 0.49999422 + value: 0.700547 + inSlope: -0.011173545 + outSlope: -0.011173545 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0000062 + value: 1.0063303 + inSlope: 1.4297178 + outSlope: 1.4297178 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.36145905 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 enemyType: 0 enemyScript: 17 lineAim: {fileID: 7509110568895175458} @@ -144,6 +180,90 @@ RectTransform: m_AnchoredPosition: {x: -0.253, y: 0.245} m_SizeDelta: {x: 1.164, y: 0.6462} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7371518073400580404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6494013583369413442} + - component: {fileID: 190055425036644223} + m_Layer: 9 + m_Name: Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6494013583369413442 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7371518073400580404} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.000000029802319, z: 0.000000029802319, w: 1} + m_LocalPosition: {x: -0.25873265, y: -3.6226575, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 719232722191935980} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &190055425036644223 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7371518073400580404} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -696370157 + m_SortingLayer: 2 + m_SortingOrder: -2 + m_Sprite: {fileID: -1806168786, guid: c35a0018a5a9a0a43882902ae09033a5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &7509110568895175458 GameObject: m_ObjectHideFlags: 0 @@ -325,10 +445,11 @@ Transform: m_GameObject: {fileID: 8899859137843901848} serializedVersion: 2 m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494} - m_LocalPosition: {x: 0.182, y: 0.65, z: 0.138} + m_LocalPosition: {x: 0.21, y: 0.675, z: 0.215} m_LocalScale: {x: 0.13, y: 0.13, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6494013583369413442} m_Father: {fileID: 4276721484070507378} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5426754587987531663 @@ -369,9 +490,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 801241541 - m_SortingLayer: 3 - m_SortingOrder: 0 + m_SortingLayerID: -696370157 + m_SortingLayer: 2 + m_SortingOrder: -1 m_Sprite: {fileID: -1272889281, guid: 5b238b3b82e3f2847bc68e382cfc219e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/DarkCloud.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/DarkCloud.prefab index cc3d1f08..857e29ef 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/DarkCloud.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/DarkCloud.prefab @@ -79,6 +79,42 @@ MonoBehaviour: moveType: 0 rangePool: [] aoeRangePool: [] + jumpHeight: 1 + posCount: 7 + jumpSpeed: 25 + speedCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.00000032782555 + value: 1.0011742 + inSlope: -1.4465826 + outSlope: -1.4465826 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.7666647 + - serializedVersion: 3 + time: 0.49999422 + value: 0.700547 + inSlope: -0.011173545 + outSlope: -0.011173545 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0000062 + value: 1.0063303 + inSlope: 1.4297178 + outSlope: 1.4297178 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.36145905 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 enemyType: 0 enemyScript: 16 lineAim: {fileID: 7509110568895175458} @@ -134,11 +170,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1945546873160074475} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.12, y: 0.57, z: 0} + m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494} + m_LocalPosition: {x: 0.181, y: 0.575, z: 0.17} m_LocalScale: {x: 0.10000001, y: 0.10000001, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2175012525789110358} m_Father: {fileID: 4276721484070507378} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1594460450803631142 @@ -179,9 +216,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingLayerID: -696370157 + m_SortingLayer: 2 + m_SortingOrder: -1 m_Sprite: {fileID: -62640043, guid: c60f66dea2156744aa4704b4986d6064, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -241,6 +278,90 @@ RectTransform: m_AnchoredPosition: {x: -0.253, y: 0.245} m_SizeDelta: {x: 1.164, y: 0.6462} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5463236569930452906 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2175012525789110358} + - component: {fileID: 1457713534780802574} + m_Layer: 9 + m_Name: Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2175012525789110358 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5463236569930452906} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.000000029802319, z: 0.000000029802319, w: 1} + m_LocalPosition: {x: -0.25873265, y: -3.6226575, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9104698319283610832} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1457713534780802574 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5463236569930452906} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -696370157 + m_SortingLayer: 2 + m_SortingOrder: -2 + m_Sprite: {fileID: -1806168786, guid: c35a0018a5a9a0a43882902ae09033a5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &7509110568895175458 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Grinfiend.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Grinfiend.prefab index c0b0ce77..42c5571e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Grinfiend.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Grinfiend.prefab @@ -79,6 +79,42 @@ MonoBehaviour: moveType: 0 rangePool: [] aoeRangePool: [] + jumpHeight: 1 + posCount: 7 + jumpSpeed: 25 + speedCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.00000032782555 + value: 1.0011742 + inSlope: -1.4465826 + outSlope: -1.4465826 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.7666647 + - serializedVersion: 3 + time: 0.49999422 + value: 0.700547 + inSlope: -0.011173545 + outSlope: -0.011173545 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0000062 + value: 1.0063303 + inSlope: 1.4297178 + outSlope: 1.4297178 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.36145905 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 enemyType: 0 enemyScript: 18 lineAim: {fileID: 7509110568895175458} @@ -369,9 +405,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingLayerID: -696370157 + m_SortingLayer: 2 + m_SortingOrder: -1 m_Sprite: {fileID: 21300000, guid: 492edd81fcf969d46ab760634c0c1bc0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Mushroom.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Mushroom.prefab index c5f8be9d..ddacf286 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Mushroom.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Mushroom.prefab @@ -79,6 +79,42 @@ MonoBehaviour: moveType: 0 rangePool: [] aoeRangePool: [] + jumpHeight: 1 + posCount: 7 + jumpSpeed: 25 + speedCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.00000032782555 + value: 1.0011742 + inSlope: -1.4465826 + outSlope: -1.4465826 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.7666647 + - serializedVersion: 3 + time: 0.49999422 + value: 0.700547 + inSlope: -0.011173545 + outSlope: -0.011173545 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0000062 + value: 1.0063303 + inSlope: 1.4297178 + outSlope: 1.4297178 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.36145905 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 enemyType: 0 enemyScript: 20 lineAim: {fileID: 7509110568895175458} @@ -215,9 +251,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingLayerID: -696370157 + m_SortingLayer: 2 + m_SortingOrder: -1 m_Sprite: {fileID: 21300000, guid: 492edd81fcf969d46ab760634c0c1bc0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Polymaw.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Polymaw.prefab index 4972c9e4..de14f77d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Polymaw.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Polymaw.prefab @@ -79,6 +79,42 @@ MonoBehaviour: moveType: 0 rangePool: [] aoeRangePool: [] + jumpHeight: 1 + posCount: 7 + jumpSpeed: 25 + speedCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.00000032782555 + value: 1.0011742 + inSlope: -1.4465826 + outSlope: -1.4465826 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.7666647 + - serializedVersion: 3 + time: 0.49999422 + value: 0.700547 + inSlope: -0.011173545 + outSlope: -0.011173545 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0000062 + value: 1.0063303 + inSlope: 1.4297178 + outSlope: 1.4297178 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.36145905 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 enemyType: 0 enemyScript: 19 lineAim: {fileID: 7509110568895175458} @@ -215,9 +251,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingLayerID: -696370157 + m_SortingLayer: 2 + m_SortingOrder: -1 m_Sprite: {fileID: 21300000, guid: 492edd81fcf969d46ab760634c0c1bc0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 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 83e785f1..f6f8c1d8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab @@ -27,7 +27,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6855895506985558} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.00000008940697} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -241,8 +241,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 15 + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -575,8 +575,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -654,8 +654,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -693,7 +693,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2981692177663718319} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0199} + m_LocalPosition: {x: 0, y: 0, z: 0.02} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -702,8 +702,8 @@ RectTransform: 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: -0.341, y: 0.5012} - m_SizeDelta: {x: 0.1498, y: 0.2056} + m_AnchoredPosition: {x: -0.341, y: 0.0568} + m_SizeDelta: {x: 0.1498, y: 0.1526} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8234315634363532829 CanvasRenderer: @@ -726,14 +726,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 06846d39b2c9e8f40941c43d5e290f19, type: 3} + m_Sprite: {fileID: -1914403500, guid: 0a24c663bcd9db44d92d3f0503021081, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -809,8 +809,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -853,12 +853,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5385135044954651861} + - {fileID: 8933368953564356502} m_Father: {fileID: 3373168338813219461} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.1557, y: -0.34} - m_SizeDelta: {x: 0.9071, y: 0.15} + m_AnchoredPosition: {x: 0.31590015, y: -0.34000006} + m_SizeDelta: {x: 0.7469, y: 0.15} m_Pivot: {x: 0, y: 0} --- !u!222 &4042308034664519062 CanvasRenderer: @@ -881,14 +882,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1124749696, guid: 890a7f5ea355eb143b419d3437c88fb9, type: 3} + m_Sprite: {fileID: 909920594, guid: 3f776a58fba7d364f86a778196c2901f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -924,7 +925,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6786056847938472585} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0004} + m_LocalPosition: {x: 0, y: 0, z: -0.00039966218} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -932,8 +933,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.0593, y: -0.005} - m_SizeDelta: {x: -0.1591, y: 0} + m_AnchoredPosition: {x: 0.000000029802322, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1677312377797295195 CanvasRenderer: @@ -963,7 +964,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1416525321, guid: b13e87d3bf7fc6c469ce8764b396f79b, type: 3} + m_Sprite: {fileID: 909920594, guid: 3f776a58fba7d364f86a778196c2901f, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1122,7 +1123,7 @@ RectTransform: 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: -0.051, y: 0.2} + m_AnchoredPosition: {x: 0.03, y: -0.093} m_SizeDelta: {x: 0.8822, y: 0.147} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4822969728311449101 @@ -1320,3 +1321,78 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 5 +--- !u!1 &9092655873445084214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8933368953564356502} + - component: {fileID: 8523922617520028934} + - component: {fileID: 5215446616256467941} + m_Layer: 10 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8933368953564356502 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9092655873445084214} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000000007450581} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6660868405258448497} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.00000014901161, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8523922617520028934 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9092655873445084214} + m_CullTransparentMesh: 1 +--- !u!114 &5215446616256467941 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9092655873445084214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -991735160, guid: acc30136a29d77f40b9d0e453dc55604, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.meta b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.meta new file mode 100644 index 00000000..f6f47190 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93c9f7ca35aa9dd42884d46561abcef5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index d24aed4e..78dd8bda 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -37,7 +37,7 @@ RenderSettings: m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} + m_Sun: {fileID: 410087040} m_IndirectSpecularColor: {r: 0.1838837, g: 0.22895366, b: 0.30267456, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 @@ -97,7 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: 2c7db567320b9b7459292dcba9ccee4a, + type: 2} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -836,7 +837,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: -696370157 m_SortingLayer: 2 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: -446724613, guid: 148a2d2d0f79e5a45956a050630a28be, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1672,82 +1673,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 114174845} m_CullTransparentMesh: 1 ---- !u!1 &115507088 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 115507089} - - component: {fileID: 115507091} - - component: {fileID: 115507090} - m_Layer: 5 - m_Name: Heart - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &115507089 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115507088} - 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: - - {fileID: 1528011284} - m_Father: {fileID: 467535682} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -240.8, y: 0} - m_SizeDelta: {x: 100, y: 35} - m_Pivot: {x: 1, y: 0.5} ---- !u!114 &115507090 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115507088} - 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: 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_Sprite: {fileID: 1262904643, guid: 36643b2352754da40bbec564fe9aac02, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &115507091 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115507088} - m_CullTransparentMesh: 1 --- !u!1 &117499503 GameObject: m_ObjectHideFlags: 0 @@ -2756,6 +2681,15 @@ MonoBehaviour: moveType: 0 rangePool: [] aoeRangePool: [] + jumpHeight: 0 + posCount: 0 + jumpSpeed: 0 + speedCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 enemyType: 0 enemyScript: 0 lineAim: {fileID: 0} @@ -3134,7 +3068,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 413879017} - - {fileID: 467535682} m_Father: {fileID: 846544929} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -4369,7 +4302,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &281408863 Transform: m_ObjectHideFlags: 0 @@ -5349,7 +5282,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &329040649 Transform: m_ObjectHideFlags: 0 @@ -5438,7 +5371,7 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 1000 - field of view: 37 + field of view: 60.000004 orthographic: 0 orthographic size: 4.82 m_Depth: 0 @@ -5464,8 +5397,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0.41586682, y: 0.3218321, z: -0.16021952, w: 0.83534944} - m_LocalPosition: {x: -2.01, y: 9.14, z: -3} + m_LocalRotation: {x: 0.5735764, y: 0, z: 0, w: 0.8191521} + m_LocalPosition: {x: 4.23, y: 8.75, z: -0.44} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6750,7 +6683,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &395072432 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8574,82 +8507,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 465036638} m_CullTransparentMesh: 1 ---- !u!1 &467535681 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 467535682} - - component: {fileID: 467535684} - - component: {fileID: 467535683} - m_Layer: 5 - m_Name: Left Information Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &467535682 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 467535681} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.00000023132} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 115507089} - m_Father: {fileID: 197216736} - 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: -625.72, y: 59.000034} - m_SizeDelta: {x: 388.13, y: 65.11} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &467535683 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 467535681} - 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: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 594789301, guid: ea9f5ff9aa2e02441be79e3c668dc9dd, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &467535684 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 467535681} - m_CullTransparentMesh: 1 --- !u!1 &468997172 GameObject: m_ObjectHideFlags: 0 @@ -9605,6 +9462,15 @@ MonoBehaviour: moveType: 0 rangePool: [] aoeRangePool: [] + jumpHeight: 0 + posCount: 0 + jumpSpeed: 0 + speedCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 enemyType: 1 enemyScript: 0 lineAim: {fileID: 0} @@ -10387,7 +10253,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &515302568 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11218,13 +11084,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 560113992} - m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1302517661} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15} + 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: 0, y: -0} @@ -11807,7 +11673,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -12615,6 +12481,7 @@ RectTransform: m_Children: - {fileID: 743691081} - {fileID: 1322888254} + - {fileID: 1528011284} m_Father: {fileID: 1504140803} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -13982,7 +13849,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 0 - m_FillAmount: 1 + m_FillAmount: 0.478 m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 @@ -14784,7 +14651,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 806364676} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000000020861622} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} m_ConstrainProportionsScale: 1 m_Children: [] @@ -14792,7 +14659,7 @@ RectTransform: 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: -0.00000015646219, y: 0.0000005364418} + m_AnchoredPosition: {x: 0.165, y: 0} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &806364678 @@ -15435,7 +15302,7 @@ MonoBehaviour: m_IsGlobal: 1 priority: 0 blendDistance: 0 - weight: 1 + weight: 0.5 sharedProfile: {fileID: 11400000, guid: a6560a915ef98420e9faacc1c7438823, type: 2} --- !u!4 &832575519 Transform: @@ -17704,7 +17571,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!82 &992566369 AudioSource: m_ObjectHideFlags: 0 @@ -20266,7 +20133,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1143340466 RectTransform: m_ObjectHideFlags: 0 @@ -20300,7 +20167,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -20341,7 +20208,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1147870383 Transform: m_ObjectHideFlags: 0 @@ -21211,7 +21078,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1180006400 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21260,7 +21127,7 @@ Transform: m_GameObject: {fileID: 1180006399} serializedVersion: 2 m_LocalRotation: {x: 0.5735764, y: 0, z: 0, w: 0.8191521} - m_LocalPosition: {x: 5.8, y: 12, z: -1} + m_LocalPosition: {x: 4.23, y: 8.75, z: -0.44} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -23520,7 +23387,7 @@ MonoBehaviour: greenSun: {fileID: 557439306, guid: 1e8a70bc60f2fc4468c29f2f06a3c41c, type: 3} whiteSun: {fileID: 615819073, guid: d034f4ed4b90d384393351669f914ad6, type: 3} blueSun: {fileID: -281758944, guid: 382995de68f3ca248ac9203a043b9fa0, type: 3} - blackSun: {fileID: 0} + blackSun: {fileID: 1805441527, guid: f4b07260ff13fa449a46460fe998d9f0, type: 3} sunSpeed: 2 sunAnim: {fileID: 1313982821} cardRewardsRarityAdjustment: 0 @@ -23939,14 +23806,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1302517660} - m_LocalRotation: {x: 0, y: 0, z: 0.13052616, w: 0.9914449} + 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: - {fileID: 560113993} m_Father: {fileID: 1974423747} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 15} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0.239, y: 0.057} @@ -27429,16 +27296,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1528011283} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 115507089} + m_Father: {fileID: 669923022} 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: 31.03, y: 0} - m_SizeDelta: {x: 88.49, y: 30} + m_AnchoredPosition: {x: 30.3, y: 0} + m_SizeDelta: {x: 88.49, y: 41.185} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1528011285 MonoBehaviour: @@ -27453,7 +27320,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 @@ -27461,13 +27328,13 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -30284,7 +30151,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1690695889 MonoBehaviour: m_ObjectHideFlags: 0 @@ -31621,15 +31488,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 6 + m_Left: 14 m_Right: 0 - m_Top: 13 + m_Top: 7 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 40, y: 40} - m_Spacing: {x: 10, y: 15} + m_CellSize: {x: 50, y: 45} + m_Spacing: {x: 26, y: 15} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &1750187011 @@ -33264,10 +33131,6 @@ MonoBehaviour: lineOffSet: {x: 1, y: 0, z: 0} columnOffSet: {x: 0, y: 0, z: 0.865} enemyGenerateDataList: - - enemyPrefab: {fileID: 1253231568001379261, guid: e7af8b56c0915664585cb503433ecd3e, - type: 3} - locationX: 4 - locationY: 4 - enemyPrefab: {fileID: 1253231568001379261, guid: 16f2f07defe9c394fb4a5698554bc882, type: 3} locationX: 4 @@ -33276,14 +33139,18 @@ MonoBehaviour: type: 3} locationX: 4 locationY: 2 - - enemyPrefab: {fileID: 1253231568001379261, guid: 5215b7bf3c1792d44b7f72561a3051a1, + - enemyPrefab: {fileID: 1253231568001379261, guid: 3d83bb7c6cfaa71439ad6302d0dceb51, type: 3} locationX: 4 locationY: 1 - - enemyPrefab: {fileID: 1253231568001379261, guid: 3d83bb7c6cfaa71439ad6302d0dceb51, + - enemyPrefab: {fileID: 1253231568001379261, guid: e7af8b56c0915664585cb503433ecd3e, type: 3} locationX: 4 locationY: 0 + - enemyPrefab: {fileID: 1253231568001379261, guid: 5215b7bf3c1792d44b7f72561a3051a1, + type: 3} + locationX: 4 + locationY: 4 playerNameText: {fileID: 742474145} playerMoneyText: {fileID: 506890230} imagePath: BackGround @@ -34032,7 +33899,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1840237606} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -34046,7 +33913,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -41.859985, y: -69.28} + m_AnchoredPosition: {x: -41.899994, y: -65.8} m_SizeDelta: {x: 157.04, y: 173.67} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1840237608 @@ -34062,15 +33929,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 5 + m_Left: 10 m_Right: 0 - m_Top: 5 + m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 45, y: 50} - m_Spacing: {x: 5, y: 5} + m_CellSize: {x: 60, y: 60} + m_Spacing: {x: 15, y: 0} m_Constraint: 0 m_ConstraintCount: 2 --- !u!114 &1840237609 @@ -34086,7 +33953,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -37486,7 +37353,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &2068068678 MonoBehaviour: m_ObjectHideFlags: 0 @@ -37729,7 +37596,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2083389422} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000000020861627} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} m_ConstrainProportionsScale: 1 m_Children: [] @@ -37737,7 +37604,7 @@ RectTransform: 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: -0.00000090897083, y: -0.0000008791685} + m_AnchoredPosition: {x: -0.179, y: -0} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2083389424 @@ -38866,6 +38733,15 @@ MonoBehaviour: moveType: 0 rangePool: [] aoeRangePool: [] + jumpHeight: 0 + posCount: 0 + jumpSpeed: 0 + speedCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 enemyType: 0 enemyScript: 0 lineAim: {fileID: 0} @@ -40331,7 +40207,7 @@ Transform: m_Children: - {fileID: 1106738165605722254} m_Father: {fileID: 954998671865812244} - m_LocalEulerAnglesHint: {x: 89.98021, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 89.98022, y: 0, z: 0} --- !u!1 &8411744260510008984 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene/LightingData.asset b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene/LightingData.asset new file mode 100644 index 00000000..727067ce Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene/LightingData.asset differ diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene/LightingData.asset.meta b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene/LightingData.asset.meta new file mode 100644 index 00000000..48d0b99f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c7db567320b9b7459292dcba9ccee4a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene/ReflectionProbe-0.exr b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene/ReflectionProbe-0.exr new file mode 100644 index 00000000..c2a300a0 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene/ReflectionProbe-0.exr differ diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene/ReflectionProbe-0.exr.meta b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene/ReflectionProbe-0.exr.meta new file mode 100644 index 00000000..5159318d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene/ReflectionProbe-0.exr.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9159849e96af19f43bb03b24b09f018b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + 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: 100 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity index f1a6e0fd..3765a170 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity @@ -722,6 +722,60 @@ RectTransform: m_AnchoredPosition: {x: 2.5, y: 0} m_SizeDelta: {x: -5, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &485170431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 485170433} + - component: {fileID: 485170432} + m_Layer: 0 + m_Name: PlayerStatsManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &485170432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 485170431} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f47edfc6a4071b418c9f81b172bb82f, type: 3} + m_Name: + m_EditorClassIdentifier: + playerState: {fileID: 11400000, guid: afd7daa84e9985b45bd00c91505acb37, type: 2} + levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2} + cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2} + relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2} + commonCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, + type: 3} + legendaryCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, + type: 3} + rareCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, + type: 3} +--- !u!4 &485170433 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 485170431} + 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 &635178496 GameObject: m_ObjectHideFlags: 0 @@ -1235,6 +1289,94 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 +--- !u!1 &1164528880 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1164528882} + - component: {fileID: 1164528881} + m_Layer: 0 + m_Name: CardOriginalDataList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1164528881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164528880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 34479ee20dc78fb49927983a85316eb8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1164528882 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164528880} + 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 &1204729961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1204729963} + - component: {fileID: 1204729962} + m_Layer: 0 + m_Name: CardManager(Color) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1204729962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204729961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ca1e05724f689024392e0ea50533f6ad, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1204729963 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204729961} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6.160092, y: 2.9316888, z: 3.9849322} + 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 &1219748257 GameObject: m_ObjectHideFlags: 0 @@ -1271,6 +1413,152 @@ RectTransform: m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: -10, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1224874801 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1224874803} + - component: {fileID: 1224874802} + m_Layer: 0 + m_Name: ToolDontDestory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1224874802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1224874801} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6f23279cbd0f954ca899908598a8505, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1224874803 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1224874801} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.8241224, y: 1.0390644, z: 1.4156547} + 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 &1322208515 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1322208517} + - component: {fileID: 1322208516} + m_Layer: 0 + m_Name: CardResourcesManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1322208516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322208515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 813097672e0cbe3448085cac4e3c47da, type: 3} + m_Name: + m_EditorClassIdentifier: + redNodeImage: {fileID: 21300000, guid: 981748b12f9371548b9c69073d83825d, type: 3} + blueNodeImage: {fileID: 21300000, guid: 260856292e6be62478629aebcd8d10a9, type: 3} + greenNodeImage: {fileID: 21300000, guid: cc399ccd6a80e2348bd7fecba8788159, type: 3} + whiteNodeImage: {fileID: 21300000, guid: 9eb1fbe667c110142a3ea9eeb798e869, type: 3} + blackNodeImage: {fileID: 21300000, guid: 0974efc85d0f5e4499e4e8268b66cc08, type: 3} + attack: {fileID: 21300000, guid: 3bddb1e29933c8c4eac9f2f054ad43d1, type: 3} + shield: {fileID: 21300000, guid: f570dfeb705959d4d9551aadbb8817d4, type: 3} + step: {fileID: 21300000, guid: 5312c2d969ace5843abc2c7201679b9d, type: 3} + weak: {fileID: 262922594, guid: f9991f9de5deef7488a05908175569c3, type: 3} + imageInCondition: {fileID: 2948337350984551391, guid: f4c36c2c021e0954897974b7ad041903, + type: 3} + textInCondition: {fileID: 2195466461428280820, guid: ef66a5db78741da4d93f90fcdcb7176a, + type: 3} +--- !u!4 &1322208517 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322208515} + 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 &1571871170 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1571871172} + - component: {fileID: 1571871171} + m_Layer: 0 + m_Name: ServentStateManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1571871171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1571871170} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86c2fab3deda01e4fb16a6d8fbcda640, type: 3} + m_Name: + m_EditorClassIdentifier: + servantState: {fileID: 0} +--- !u!4 &1571871172 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1571871170} + 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 &1574058775 GameObject: m_ObjectHideFlags: 0 @@ -1346,6 +1634,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1574058775} m_CullTransparentMesh: 1 +--- !u!1 &1612287985 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1612287987} + - component: {fileID: 1612287986} + m_Layer: 0 + m_Name: CardManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1612287986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1612287985} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ca1e05724f689024392e0ea50533f6ad, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1612287987 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1612287985} + 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 &1621631698 GameObject: m_ObjectHideFlags: 0 @@ -1461,6 +1793,369 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1763913762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1763913767} + - component: {fileID: 1763913766} + - component: {fileID: 1763913765} + - component: {fileID: 1763913764} + - component: {fileID: 1763913763} + m_Layer: 0 + m_Name: AudioManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1763913763 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1763913762} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: ea163b0948a84ab4f929c4579a9105e7, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.75 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!82 &1763913764 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1763913762} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!82 &1763913765 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1763913762} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1763913766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1763913762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b2b8537b62d04d45ad201dafc853142, type: 3} + m_Name: + m_EditorClassIdentifier: + mainVoiceVolume: 1 + effectVoiceVolume: 1 + musicVoiceVolume: 1 + UIClick: {fileID: 8300000, guid: 90e7a416c58aeda47898e5c6bafa1703, type: 3} + menuOpenClip: {fileID: 8300000, guid: aa09967122165064693a43a3ee1ac3be, type: 3} + menuCloseClip: {fileID: 8300000, guid: e526247df8496df41823965b29bcf59e, type: 3} + AttackClips: + - {fileID: 8300000, guid: 7d0ed2b193dec034b9372a647211329c, type: 3} + - {fileID: 8300000, guid: bad8f72a868ea0f49a08f4839852274a, type: 3} + upShieldClip: {fileID: 8300000, guid: 05878b36e4cfec048bb24c2927d72ff3, type: 3} + downShieldClip: {fileID: 8300000, guid: 05878b36e4cfec048bb24c2927d72ff3, type: 3} + enemyHurtClip: {fileID: 8300000, guid: 32d4f8be35b20a0419ac2d6ac36e6a97, type: 3} + onePageClip: {fileID: 8300000, guid: 8d3ebc252a552e346aafb2b8da7b3717, type: 3} + amountPageClip: {fileID: 8300000, guid: 2f02670f32b7b1949859664e7ddd9667, type: 3} + oneDrawClip: {fileID: 8300000, guid: 53bbd3f6b67ce1349be6899419543471, type: 3} + amoutDrawClip: {fileID: 8300000, guid: a7c4b426f6488924ba4d8220940d553e, type: 3} + chooseClip: {fileID: 8300000, guid: b0a53ae3759f330419116d317aeb12f1, type: 3} + disChooseClip: {fileID: 8300000, guid: f15e1aab9d3d92943902c03337517e9f, type: 3} + flipClip: {fileID: 8300000, guid: ba40307e688223e4d85ba5ad5749e73c, type: 3} + gainMoneyClip: {fileID: 8300000, guid: 4bdf1399abfddc549af7f38a8c9446d2, type: 3} + gainCardClip: {fileID: 8300000, guid: 2cba30942ef3c9a4181c67e0cad3fdaf, type: 3} + buyClip: {fileID: 8300000, guid: cd6237820d5c34d4c9ad4c59d45002e4, type: 3} + fightBGM: {fileID: 8300000, guid: ea163b0948a84ab4f929c4579a9105e7, type: 3} + shopBGM: {fileID: 8300000, guid: 6cd3e5a8ae3963446a483cb25f052163, type: 3} + startMenuBgm: {fileID: 8300000, guid: 51d48687a1d476c45828b13642627ac3, type: 3} + UIClickSource: {fileID: 1763913765} + ActionSource: {fileID: 1763913764} + BGMSoure: {fileID: 1763913763} +--- !u!4 &1763913767 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1763913762} + 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 &1795764009 GameObject: m_ObjectHideFlags: 0 @@ -2015,3 +2710,11 @@ SceneRoots: - {fileID: 1122200156} - {fileID: 1715060595} - {fileID: 315632828} + - {fileID: 1204729963} + - {fileID: 485170433} + - {fileID: 1164528882} + - {fileID: 1763913767} + - {fileID: 1571871172} + - {fileID: 1224874803} + - {fileID: 1612287987} + - {fileID: 1322208517} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs index 943eba1b..634f47a6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs @@ -2,18 +2,11 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Xml; -using TreeEditor; using Unity.VisualScripting; using UnityEngine; using UnityEngine.UI; -using UnityEngine.Windows; -using static Name; -using static UnityEngine.EventSystems.EventTrigger; -using static UnityEngine.InputSystem.Controls.DiscreteButtonControl; -using static UnityEngine.Rendering.DebugUI; + public class CardEntity : MonoBehaviour diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardSmall/CardSmall.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardSmall/CardSmall.cs index e7e75e41..de7732d5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardSmall/CardSmall.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardSmall/CardSmall.cs @@ -1,15 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Drawing; -using System.Net; -using System.Security.Cryptography; -using UnityEditor; -using UnityEditor.SceneManagement; using UnityEngine; -using UnityEngine.EventSystems; -using UnityEngine.InputSystem; -using UnityEngine.UI; public class CardSmall : MonoBehaviour { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlackSheep.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlackSheep.cs index e051904b..abb77ba3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlackSheep.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlackSheep.cs @@ -225,6 +225,7 @@ public class BlackSheep : MonoBehaviour enemyNode.positionX = disNode.locationX; enemyNode.positionY = disNode.locationY; disNode.enemyNode = enemyNode; + transform.SetParent(disNode.CylinderFloor.transform); yield return StartCoroutine(SkeletonArcherMoveCoroutine(disNode)); } @@ -250,19 +251,37 @@ public class BlackSheep : MonoBehaviour } IEnumerator SkeletonArcherMoveCoroutine(MapUnity endMapUnity)//ƶλ { - while (true) + Vector3 startPos = transform.position; + Vector3 endpos = new Vector3(endMapUnity.transform.position.x, transform.position.y, endMapUnity.transform.position.z); + Vector3 jumpCentre = new Vector3((startPos.x + endpos.x) / 2.0f, (startPos.y + endpos.y) / 2.0f + enemyNode.jumpHeight, (startPos.z + endpos.z) / 2.0f); + List linePath = new List(); + linePath = enemyNode.CalculatePath(linePath, enemyNode.posCount, startPos, jumpCentre, endpos); + bool move = true; + float time = 0; + Debug.Log("ʼ" + startPos + "" + endpos + "м" + jumpCentre); + for (int posIndex = 0; posIndex < linePath.Count; posIndex++) { - float dDistance = Vector3.Distance(this.gameObject.transform.position, endMapUnity.transform.position); - - if (dDistance < 0.1f) + time = 0; + move = true; + while (move) { - break; + if (posIndex == linePath.Count - 1) + { + transform.position = Vector3.Lerp(linePath[posIndex], endpos, time += Time.deltaTime * enemyNode.speedCurve.Evaluate(posIndex / enemyNode.posCount) * enemyNode.jumpSpeed); + } + else + { + transform.position = Vector3.Lerp(linePath[posIndex], linePath[posIndex + 1], time += Time.deltaTime * enemyNode.speedCurve.Evaluate(posIndex / enemyNode.posCount) * enemyNode.jumpSpeed); //time += Time.deltaTime * speedCurve.Evaluate(posIndex+1 /posCount )); + } + + if (time >= 1) + { + move = false; + } + yield return null; } - this.gameObject.transform.position = Vector3.Lerp(this.gameObject.transform.position, endMapUnity.transform.position, Time.deltaTime * moveSpeed); - yield return 0; } - //жϸʴ enemyNode.CorrodeRealize(endMapUnity); //жѪ diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs index 72d9140f..b21966c8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs @@ -232,6 +232,7 @@ public class DarkCloud : MonoBehaviour enemyNode.positionX = disNode.locationX; enemyNode.positionY = disNode.locationY; disNode.enemyNode = enemyNode; + transform.SetParent(disNode.CylinderFloor.transform); yield return StartCoroutine(SkeletonArcherMoveCoroutine(disNode)); } @@ -259,6 +260,42 @@ public class DarkCloud : MonoBehaviour } IEnumerator SkeletonArcherMoveCoroutine(MapUnity endMapUnity)//ƶλ { + Vector3 startPos = transform.position; + Vector3 endpos = new Vector3(endMapUnity.transform.position.x, transform.position.y, endMapUnity.transform.position.z); + Vector3 jumpCentre = new Vector3((startPos.x + endpos.x) / 2.0f, (startPos.y + endpos.y) / 2.0f + enemyNode.jumpHeight, (startPos.z + endpos.z) / 2.0f); + List linePath = new List(); + linePath = enemyNode. CalculatePath(linePath,enemyNode. posCount, startPos, jumpCentre, endpos); + bool move = true; + float time = 0; + Debug.Log("ʼ" + startPos + "" + endpos + "м" + jumpCentre); + for (int posIndex = 0; posIndex < linePath.Count; posIndex++) + { + time = 0; + move = true; + while (move) + { + if (posIndex == linePath.Count - 1) + { + transform.position = Vector3.Lerp(linePath[posIndex], endpos, time += Time.deltaTime * enemyNode.speedCurve.Evaluate(posIndex / enemyNode.posCount) * enemyNode.jumpSpeed); + } + else + { + transform.position = Vector3.Lerp(linePath[posIndex], linePath[posIndex + 1], time += Time.deltaTime * enemyNode.speedCurve.Evaluate(posIndex / enemyNode.posCount) * enemyNode.jumpSpeed); //time += Time.deltaTime * speedCurve.Evaluate(posIndex+1 /posCount )); + } + + if (time >= 1) + { + move = false; + } + yield return null; + } + + } + + + + /* + while (true) { float dDistance = Vector3.Distance(this.gameObject.transform.position, endMapUnity.transform.position); @@ -270,7 +307,7 @@ public class DarkCloud : MonoBehaviour this.gameObject.transform.position = Vector3.Lerp(this.gameObject.transform.position, endMapUnity.transform.position, Time.deltaTime * moveSpeed); yield return 0; - } + }*/ //жϸʴ enemyNode.CorrodeRealize(endMapUnity); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs index 31b70b34..b714fa67 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs @@ -27,7 +27,13 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver public List rangePool = new List();//ΧԤ public List aoeRangePool = new List();//ΧԤ - [Header("")] + [Header("·")] + public float jumpHeight; + public float posCount; + public float jumpSpeed; + public AnimationCurve speedCurve; + + [Header("")] public EnemyType enemyType; public EnemyScript enemyScript; @@ -1405,7 +1411,27 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver } - #endregion + #endregion + #region 㱴ߵϵ + public List CalculatePath(List linePath, float posCount, Vector3 lineStart, Vector3 lineMiddel, Vector3 lineEnd) + { + linePath.Clear(); + for (int i = 0; i < posCount; i++) + { + Vector3 currentPoint = CalculateBezierPoint(lineStart, lineMiddel, lineEnd, i / posCount); + linePath.Add(currentPoint); + Debug.Log("currentPoint" + currentPoint); + } + return linePath; + } + public Vector3 CalculateBezierPoint(Vector3 p0, Vector3 p1, Vector3 p2, float t) + { + Debug.Log("t" + t); + float u = 1 - t; + float tt = t * t; + return u * u * p0 + 2 * t * u * p1 + tt * p2; + } + #endregion } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs index 67d9ae21..b88e03c4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs @@ -54,13 +54,13 @@ public class EnemyPool : MonoBehaviour } return enemyPool.Keys.Last(); } - +#if UNITY_EDITOR public static List getEnemyPrefab(List enemyList) { - List enemyPrefabs= new List(); + List enemyPrefabs = new List(); foreach (var enemy in enemyList) { - GameObject prefab = AssetDatabase.LoadAssetAtPath("Assets/Prefab/EnemyPrefab/"+enemy+ ".prefab"); + GameObject prefab = AssetDatabase.LoadAssetAtPath("Assets/Prefab/EnemyPrefab/" + enemy + ".prefab"); enemyPrefabs.Add(prefab); } foreach (var enemy in enemyPrefabs) @@ -69,5 +69,5 @@ public class EnemyPool : MonoBehaviour } return enemyPrefabs; } - +#endif } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs index 5c33ab39..44beb26c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs @@ -253,6 +253,7 @@ public class Grinfiend : MonoBehaviour enemyNode.positionX = disNode.locationX; enemyNode.positionY = disNode.locationY; disNode.enemyNode = enemyNode; + transform.SetParent(disNode.CylinderFloor.transform); yield return StartCoroutine(SkeletonArcherMoveCoroutine(disNode)); } @@ -278,17 +279,36 @@ public class Grinfiend : MonoBehaviour } IEnumerator SkeletonArcherMoveCoroutine(MapUnity endMapUnity)//ƶλ { - while (true) + Vector3 startPos = transform.position; + Vector3 endpos = new Vector3(endMapUnity.transform.position.x, transform.position.y, endMapUnity.transform.position.z); + Vector3 jumpCentre = new Vector3((startPos.x + endpos.x) / 2.0f, (startPos.y + endpos.y) / 2.0f + enemyNode.jumpHeight, (startPos.z + endpos.z) / 2.0f); + List linePath = new List(); + linePath = enemyNode.CalculatePath(linePath, enemyNode.posCount, startPos, jumpCentre, endpos); + bool move = true; + float time = 0; + Debug.Log("ʼ" + startPos + "" + endpos + "м" + jumpCentre); + for (int posIndex = 0; posIndex < linePath.Count; posIndex++) { - float dDistance = Vector3.Distance(this.gameObject.transform.position, endMapUnity.transform.position); - - if (dDistance < 0.1f) + time = 0; + move = true; + while (move) { - break; + if (posIndex == linePath.Count - 1) + { + transform.position = Vector3.Lerp(linePath[posIndex], endpos, time += Time.deltaTime * enemyNode.speedCurve.Evaluate(posIndex / enemyNode.posCount) * enemyNode.jumpSpeed); + } + else + { + transform.position = Vector3.Lerp(linePath[posIndex], linePath[posIndex + 1], time += Time.deltaTime * enemyNode.speedCurve.Evaluate(posIndex / enemyNode.posCount) * enemyNode.jumpSpeed); //time += Time.deltaTime * speedCurve.Evaluate(posIndex+1 /posCount )); + } + + if (time >= 1) + { + move = false; + } + yield return null; } - this.gameObject.transform.position = Vector3.Lerp(this.gameObject.transform.position, endMapUnity.transform.position, Time.deltaTime * moveSpeed); - yield return 0; } //жϸʴ diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Mushroom.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Mushroom.cs index d45d18d8..7b2118c3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Mushroom.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Mushroom.cs @@ -304,6 +304,7 @@ public class Mushroom : MonoBehaviour enemyNode.positionX = disNode.locationX; enemyNode.positionY = disNode.locationY; disNode.enemyNode = enemyNode; + transform.SetParent(disNode.CylinderFloor.transform); yield return StartCoroutine(SkeletonArcherMoveCoroutine(disNode)); } @@ -329,17 +330,36 @@ public class Mushroom : MonoBehaviour } IEnumerator SkeletonArcherMoveCoroutine(MapUnity endMapUnity)//ƶλ { - while (true) + Vector3 startPos = transform.position; + Vector3 endpos = new Vector3(endMapUnity.transform.position.x, transform.position.y, endMapUnity.transform.position.z); + Vector3 jumpCentre = new Vector3((startPos.x + endpos.x) / 2.0f, (startPos.y + endpos.y) / 2.0f + enemyNode.jumpHeight, (startPos.z + endpos.z) / 2.0f); + List linePath = new List(); + linePath = enemyNode.CalculatePath(linePath, enemyNode.posCount, startPos, jumpCentre, endpos); + bool move = true; + float time = 0; + Debug.Log("ʼ" + startPos + "" + endpos + "м" + jumpCentre); + for (int posIndex = 0; posIndex < linePath.Count; posIndex++) { - float dDistance = Vector3.Distance(this.gameObject.transform.position, endMapUnity.transform.position); - - if (dDistance < 0.1f) + time = 0; + move = true; + while (move) { - break; + if (posIndex == linePath.Count - 1) + { + transform.position = Vector3.Lerp(linePath[posIndex], endpos, time += Time.deltaTime * enemyNode.speedCurve.Evaluate(posIndex / enemyNode.posCount) * enemyNode.jumpSpeed); + } + else + { + transform.position = Vector3.Lerp(linePath[posIndex], linePath[posIndex + 1], time += Time.deltaTime * enemyNode.speedCurve.Evaluate(posIndex / enemyNode.posCount) * enemyNode.jumpSpeed); //time += Time.deltaTime * speedCurve.Evaluate(posIndex+1 /posCount )); + } + + if (time >= 1) + { + move = false; + } + yield return null; } - this.gameObject.transform.position = Vector3.Lerp(this.gameObject.transform.position, endMapUnity.transform.position, Time.deltaTime * moveSpeed); - yield return 0; } //жϸʴ diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs index d5071b32..1a50d00a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs @@ -129,6 +129,7 @@ public class Polymaw : MonoBehaviour enemyNode.positionX = disNode.locationX; enemyNode.positionY = disNode.locationY; disNode.enemyNode = enemyNode; + transform.SetParent(disNode.CylinderFloor.transform); yield return StartCoroutine(SkeletonArcherMoveCoroutine(disNode)); } @@ -266,17 +267,36 @@ public class Polymaw : MonoBehaviour } IEnumerator SkeletonArcherMoveCoroutine(MapUnity endMapUnity)//ƶλ { - while (true) + Vector3 startPos = transform.position; + Vector3 endpos = new Vector3(endMapUnity.transform.position.x, transform.position.y, endMapUnity.transform.position.z); + Vector3 jumpCentre = new Vector3((startPos.x + endpos.x) / 2.0f, (startPos.y + endpos.y) / 2.0f + enemyNode.jumpHeight, (startPos.z + endpos.z) / 2.0f); + List linePath = new List(); + linePath = enemyNode.CalculatePath(linePath, enemyNode.posCount, startPos, jumpCentre, endpos); + bool move = true; + float time = 0; + Debug.Log("ʼ" + startPos + "" + endpos + "м" + jumpCentre); + for (int posIndex = 0; posIndex < linePath.Count; posIndex++) { - float dDistance = Vector3.Distance(this.gameObject.transform.position, endMapUnity.transform.position); - - if (dDistance < 0.1f) + time = 0; + move = true; + while (move) { - break; + if (posIndex == linePath.Count - 1) + { + transform.position = Vector3.Lerp(linePath[posIndex], endpos, time += Time.deltaTime * enemyNode.speedCurve.Evaluate(posIndex / enemyNode.posCount) * enemyNode.jumpSpeed); + } + else + { + transform.position = Vector3.Lerp(linePath[posIndex], linePath[posIndex + 1], time += Time.deltaTime * enemyNode.speedCurve.Evaluate(posIndex / enemyNode.posCount) * enemyNode.jumpSpeed); //time += Time.deltaTime * speedCurve.Evaluate(posIndex+1 /posCount )); + } + + if (time >= 1) + { + move = false; + } + yield return null; } - this.gameObject.transform.position = Vector3.Lerp(this.gameObject.transform.position, endMapUnity.transform.position, Time.deltaTime * moveSpeed); - yield return 0; } //жϸʴ diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs index f03d641e..4bf1d0b8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs @@ -219,7 +219,7 @@ public class GameManager : Singleton // float currentWhiteNodeCount = Mathf.Lerp(whiteNodeCountLatest, whiteNodeCount, Time.deltaTime * sunSpeed); blackNodeCountLatest = Mathf.Lerp(blackNodeCountLatest, blackNodeCount, Time.deltaTime * sunSpeed); - float totoalNode = redNodeCount + blueNodeCount + greenNodeCount + whiteNodeCount + blueNodeCount; + float totoalNode = redNodeCount + blueNodeCount + greenNodeCount + whiteNodeCount + blackNodeCount; //ɫ Red.fillAmount = redNodeCountLatest / totoalNode; Green.fillAmount = Red.fillAmount + greenNodeCountLatest / totoalNode; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_2.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_2.cs index b9c0a423..c5a73795 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_2.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_2.cs @@ -1,8 +1,5 @@ using System; -using System.Collections; using System.Collections.Generic; -using TreeEditor; -using UnityEditor.Experimental.GraphView; using UnityEngine; public class EffectRangeHandler8_2 : EffectRangeHandlerBase diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs index 7d659318..958574dc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs @@ -108,7 +108,10 @@ public class MapManager : Singleton while (listWithDisableNode) { listWithDisableNode = false; + +#if UNITY_EDITOR enemyListTest = EnemyPool.getEnemyPrefab(enemyList); +#endif mapSet = MathTool.GetRandomElements(getNodeTools.getAllNodesExceptEnemyAndPlayer(), enemyListTest.Count); mapList = new List(mapSet); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs index 4fdea8f9..bd63d563 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs @@ -1,9 +1,5 @@ using System.Collections; using System.Collections.Generic; -using UnityEditor.Experimental.GraphView; -using UnityEngine; -using UnityEngine.Rendering; - public static class Name { public static class Target diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs index e4bfe576..67a5186c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs @@ -1,13 +1,8 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Xml.Linq; using Unity.VisualScripting; -using UnityEditor.VersionControl; using UnityEngine; -using UnityEngine.UI; -using UnityEngine.UIElements; public class getNodeTools { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs index 54c14d47..5629437f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs @@ -1,8 +1,6 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Linq; -using UnityEditor.Experimental.GraphView; using UnityEngine; public class MapUnityManager : Singleton diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs index 6d36b592..f7e6c5af 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs @@ -1,10 +1,8 @@ using System.Collections; using System.Collections.Generic; -using System.Xml; using Unity.VisualScripting; -using UnityEditor.VersionControl; using UnityEngine; -using UnityEngine.Playables; + public class SettlementManager : Singleton { diff --git a/ColorlessWorld-2024-4-2/Assets/Settings/SampleSceneProfile.asset b/ColorlessWorld-2024-4-2/Assets/Settings/SampleSceneProfile.asset index 37e401d5..2b657165 100644 --- a/ColorlessWorld-2024-4-2/Assets/Settings/SampleSceneProfile.asset +++ b/ColorlessWorld-2024-4-2/Assets/Settings/SampleSceneProfile.asset @@ -12,46 +12,41 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3} m_Name: Bloom m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 + active: 0 + skipIterations: + m_OverrideState: 0 + m_Value: 1 threshold: m_OverrideState: 1 m_Value: 1 - min: 0 intensity: m_OverrideState: 1 m_Value: 1 - min: 0 scatter: m_OverrideState: 0 m_Value: 0.7 - min: 0 - max: 1 clamp: m_OverrideState: 0 m_Value: 65472 - min: 0 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 highQualityFiltering: m_OverrideState: 0 m_Value: 0 - skipIterations: + downscale: m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 16 + m_Value: 0 + maxIterations: + m_OverrideState: 0 + m_Value: 6 dirtTexture: m_OverrideState: 0 m_Value: {fileID: 0} + dimension: 1 dirtIntensity: m_OverrideState: 0 m_Value: 0 - min: 0 --- !u!114 &-7011558710299706105 MonoBehaviour: m_ObjectHideFlags: 3 @@ -65,26 +60,18 @@ MonoBehaviour: m_Name: Vignette m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 color: m_OverrideState: 0 m_Value: {r: 0, g: 0, b: 0, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 center: m_OverrideState: 0 m_Value: {x: 0.5, y: 0.5} intensity: m_OverrideState: 1 m_Value: 0.25 - min: 0 - max: 1 smoothness: m_OverrideState: 1 m_Value: 0.4 - min: 0.01 - max: 1 rounded: m_OverrideState: 0 m_Value: 0 @@ -117,7 +104,30 @@ MonoBehaviour: m_Name: Tonemapping m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 1 + neutralHDRRangeReductionMode: + m_OverrideState: 0 + m_Value: 2 + acesPreset: + m_OverrideState: 0 + m_Value: 3 + hueShiftAmount: + m_OverrideState: 0 + m_Value: 0 + detectPaperWhite: + m_OverrideState: 0 + m_Value: 0 + paperWhite: + m_OverrideState: 0 + m_Value: 300 + detectBrightnessLimits: + m_OverrideState: 0 + m_Value: 1 + minNits: + m_OverrideState: 0 + m_Value: 0.005 + maxNits: + m_OverrideState: 0 + m_Value: 1000 diff --git a/ColorlessWorld-2024-4-2/Assets/Settings/URP-Balanced.asset b/ColorlessWorld-2024-4-2/Assets/Settings/URP-Balanced.asset index 65bbfc82..aef05b84 100644 --- a/ColorlessWorld-2024-4-2/Assets/Settings/URP-Balanced.asset +++ b/ColorlessWorld-2024-4-2/Assets/Settings/URP-Balanced.asset @@ -82,33 +82,33 @@ MonoBehaviour: m_Textures: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterSSAODepthNormals: 0 + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 2 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterSSAODepthNormals: 1 m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOBlueNoise: 1 m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Settings/URP-HighFidelity.asset b/ColorlessWorld-2024-4-2/Assets/Settings/URP-HighFidelity.asset index eb03e9b4..ea42f3ed 100644 --- a/ColorlessWorld-2024-4-2/Assets/Settings/URP-HighFidelity.asset +++ b/ColorlessWorld-2024-4-2/Assets/Settings/URP-HighFidelity.asset @@ -82,33 +82,33 @@ MonoBehaviour: m_Textures: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 2 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 2 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Settings/URP-Performant.asset b/ColorlessWorld-2024-4-2/Assets/Settings/URP-Performant.asset index 8650b693..05bb7419 100644 --- a/ColorlessWorld-2024-4-2/Assets/Settings/URP-Performant.asset +++ b/ColorlessWorld-2024-4-2/Assets/Settings/URP-Performant.asset @@ -82,33 +82,33 @@ MonoBehaviour: m_Textures: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeMainLightShadows: 0 + m_PrefilteringModeAdditionalLight: 0 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/ColorlessWorld-2024-4-2/ProjectSettings/ProjectSettings.asset b/ColorlessWorld-2024-4-2/ProjectSettings/ProjectSettings.asset index 3a34c204..b64c3f1b 100644 --- a/ColorlessWorld-2024-4-2/ProjectSettings/ProjectSettings.asset +++ b/ColorlessWorld-2024-4-2/ProjectSettings/ProjectSettings.asset @@ -282,7 +282,14 @@ PlayerSettings: AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: 7400af91c44b889439f6daab9d5ff921, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: - m_BuildTarget: iPhone m_Icons: diff --git a/ColorlessWorld-2024-4-2/ProjectSettings/TimelineSettings.asset b/ColorlessWorld-2024-4-2/ProjectSettings/TimelineSettings.asset new file mode 100644 index 00000000..b21943ab --- /dev/null +++ b/ColorlessWorld-2024-4-2/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 + m_DefaultFrameRate: 60 diff --git a/ColorlessWorld-2024-4-2/ProjectSettings/UnityConnectSettings.asset b/ColorlessWorld-2024-4-2/ProjectSettings/UnityConnectSettings.asset index 28ae3eef..a4b74d6e 100644 --- a/ColorlessWorld-2024-4-2/ProjectSettings/UnityConnectSettings.asset +++ b/ColorlessWorld-2024-4-2/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events