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/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.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index d24aed4e..0a6e7ddf 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -836,7 +836,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 @@ -2756,6 +2756,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} @@ -9605,6 +9614,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} @@ -11218,13 +11236,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 +11825,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 @@ -14784,7 +14802,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 +14810,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 @@ -20266,7 +20284,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 +20318,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 @@ -23520,7 +23538,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 +23957,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} @@ -33264,10 +33282,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 +33290,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 @@ -37729,7 +37747,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 +37755,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 +38884,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} 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/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;