diff --git a/ColorlessWorld-2024-4-2/Assets/Cartoon FX Pack/Demo/Demo.unity.meta b/ColorlessWorld-2024-4-2/Assets/Cartoon FX Pack/Demo/Demo.unity.meta index e89e64de..b6be7507 100644 --- a/ColorlessWorld-2024-4-2/Assets/Cartoon FX Pack/Demo/Demo.unity.meta +++ b/ColorlessWorld-2024-4-2/Assets/Cartoon FX Pack/Demo/Demo.unity.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:ColorlessWorld-2024-4-2/Assets/Cartoon FX Pack/Demo/Demo.unity.meta guid: a7221a41a458dc24dad8af87e4bc5cfb DefaultImporter: -======== -guid: b1a9861072b29ff4b986818e1a6e3b07 -PrefabImporter: ->>>>>>>> origin/dev-1217:ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ContaminatusImmortalis.prefab.meta externalObjects: {} userData: assetBundleName: diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset new file mode 100644 index 00000000..5c21be17 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 20f70984b262f8d4382bf5262dddb83e, type: 3} + m_Name: AcidRainCloud + m_EditorClassIdentifier: + enemyName: AcidRainCloud + enemyIcon: {fileID: 21300000, guid: bd8f3094e7ef01148bddd857e065ebc3, type: 3} + stepRange: 2 + stepRangeMultiplier: 1 + speed: 2 + maxMoveCoolDown: 0 + currentMoveCoolDown: 0 + shieldValue: 0 + upShieldValue: 0 + maxHP: 38 + currentHP: 38 + sufferDamageMultiply: 1 + colourType: 0 + maxSkillCoolDown: 3 + currentSkillCoolDown: 3 + damageMultiplier: 1 + damage: 7 + attackRange: 5 + aoeRange: 2 + maxNumberOfHits: 0 + currentNumberOfHits: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset.meta b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset.meta new file mode 100644 index 00000000..31665ea5 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5d77befe00f98245a906ec5f250baf1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset new file mode 100644 index 00000000..62391924 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 20f70984b262f8d4382bf5262dddb83e, type: 3} + m_Name: Climavista + m_EditorClassIdentifier: + enemyName: Climavista + enemyIcon: {fileID: 21300000, guid: bd8f3094e7ef01148bddd857e065ebc3, type: 3} + stepRange: 2 + stepRangeMultiplier: 1 + speed: 2 + maxMoveCoolDown: 0 + currentMoveCoolDown: 0 + shieldValue: 0 + upShieldValue: 0 + maxHP: 40 + currentHP: 40 + sufferDamageMultiply: 1 + colourType: 0 + maxSkillCoolDown: 3 + currentSkillCoolDown: 3 + damageMultiplier: 1 + damage: 0 + attackRange: 6 + aoeRange: 0 + maxNumberOfHits: 0 + currentNumberOfHits: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset.meta b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset.meta new file mode 100644 index 00000000..3b74f036 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1abe4a11be3b9564db29e30f26b553f0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/AcidRainCloud.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/AcidRainCloud.prefab new file mode 100644 index 00000000..7c8ab44e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/AcidRainCloud.prefab @@ -0,0 +1,578 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1253231568001379261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4276721484070507378} + - component: {fileID: 7989887375954300062} + - component: {fileID: 230642570694684005} + - component: {fileID: 4358100366385517192} + - component: {fileID: 8215840690744605514} + m_Layer: 9 + m_Name: AcidRainCloud + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4276721484070507378 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253231568001379261} + 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: + - {fileID: 719232722191935980} + - {fileID: 8888823514061126702} + - {fileID: 6503119109324506896} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &7989887375954300062 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253231568001379261} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.48 + m_Center: {x: 0, y: 0.3, z: 0} +--- !u!114 &230642570694684005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253231568001379261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b93e606dce1c400408bd059eaaa399b2, type: 3} + m_Name: + m_EditorClassIdentifier: + templateEnemyState: {fileID: 11400000, guid: a5d77befe00f98245a906ec5f250baf1, type: 2} + EnemyState: {fileID: 0} + positionX: 3 + positionY: 5 + pasth: [] + oppositePasth: [] + moveType: 0 + enemy: {fileID: 0} + rangePool: [] + aoeRangePool: [] + stateText: + 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} + canLineAppre: 1 + disableAttack: {fileID: 0} + enemyUIBar: {fileID: 0} + blockUIBar: {fileID: 0} + enemyUI: {fileID: 0} + followPoint: {fileID: 8888823514061126702} + bone: {fileID: 0} + bone_Re: {fileID: 0} + lasteHp: 0 + anim: {fileID: 4358100366385517192} + meleeAttackSpeed: 4 + meleeAttackSpeedCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + deathVfx: {fileID: 0} + deathParticle: {fileID: 0} + deathParticle_2: {fileID: 0} + canMove: 0 + planAction: 0 +--- !u!95 &4358100366385517192 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253231568001379261} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 68841ed7bed30c841bf31d58a61fa4e8, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &8215840690744605514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253231568001379261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d79ad6169a7e3249929c9b64a492eec, type: 3} + m_Name: + m_EditorClassIdentifier: + enemyNode: {fileID: 0} + aimNode: {fileID: 0} + layerMask: + serializedVersion: 2 + m_Bits: 0 + moveSpeed: 4 +--- !u!1 &2687402414900403258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8888823514061126702} + m_Layer: 0 + m_Name: FollowPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8888823514061126702 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2687402414900403258} + m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494} + m_LocalPosition: {x: 0, y: 0, z: -0.284} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4276721484070507378} + m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6503119109324506896} + - component: {fileID: 4532292198235687560} + - component: {fileID: 1857277813970574203} + m_Layer: 9 + m_Name: AimLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6503119109324506896 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509110568895175458} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4276721484070507378} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!120 &4532292198235687560 +LineRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509110568895175458} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 6dae87f6dbe79e34fb7adcae048807dd, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 6, y: 0, z: 1} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.0031585693 + value: 0.11028418 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MaskInteraction: 0 + m_UseWorldSpace: 1 + m_Loop: 0 + m_ApplyActiveColorSpace: 1 +--- !u!114 &1857277813970574203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509110568895175458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e85732096b0d414f9d6f9ea2e10f06f, type: 3} + m_Name: + m_EditorClassIdentifier: + lineRenderer: {fileID: 4532292198235687560} + density: 2 + speed: 0.005 + currentdisappearTime: 0 + aimGamgObject: {fileID: 0} +--- !u!1 &8899859137843901848 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 719232722191935980} + - component: {fileID: 5426754587987531663} + - component: {fileID: 8993153691267712734} + m_Layer: 9 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &719232722191935980 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8899859137843901848} + serializedVersion: 2 + m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494} + 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: + - {fileID: 6494013583369413442} + m_Father: {fileID: 4276721484070507378} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5426754587987531663 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8899859137843901848} + 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: -1 + m_Sprite: {fileID: -1272889281, guid: 5b238b3b82e3f2847bc68e382cfc219e, 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!114 &8993153691267712734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8899859137843901848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} + maxAnglesX: 0 + minAnglesX: 0 + maxAnglesY: 0 + minAnglesY: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/AcidRainCloud.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/AcidRainCloud.prefab.meta new file mode 100644 index 00000000..0157a7ea --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/AcidRainCloud.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 589ff9c9fe779f141b239dcae72b5b67 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Climavista.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Climavista.prefab new file mode 100644 index 00000000..e9352d01 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Climavista.prefab @@ -0,0 +1,578 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1253231568001379261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4276721484070507378} + - component: {fileID: 7989887375954300062} + - component: {fileID: 230642570694684005} + - component: {fileID: 4358100366385517192} + - component: {fileID: -6455832433523655302} + m_Layer: 9 + m_Name: Climavista + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4276721484070507378 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253231568001379261} + 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: + - {fileID: 719232722191935980} + - {fileID: 8888823514061126702} + - {fileID: 6503119109324506896} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &7989887375954300062 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253231568001379261} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.48 + m_Center: {x: 0, y: 0.3, z: 0} +--- !u!114 &230642570694684005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253231568001379261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b93e606dce1c400408bd059eaaa399b2, type: 3} + m_Name: + m_EditorClassIdentifier: + templateEnemyState: {fileID: 11400000, guid: 1abe4a11be3b9564db29e30f26b553f0, type: 2} + EnemyState: {fileID: 0} + positionX: 3 + positionY: 5 + pasth: [] + oppositePasth: [] + moveType: 0 + enemy: {fileID: 0} + rangePool: [] + aoeRangePool: [] + stateText: + 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} + canLineAppre: 1 + disableAttack: {fileID: 0} + enemyUIBar: {fileID: 0} + blockUIBar: {fileID: 0} + enemyUI: {fileID: 0} + followPoint: {fileID: 8888823514061126702} + bone: {fileID: 0} + bone_Re: {fileID: 0} + lasteHp: 0 + anim: {fileID: 4358100366385517192} + meleeAttackSpeed: 4 + meleeAttackSpeedCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + deathVfx: {fileID: 0} + deathParticle: {fileID: 0} + deathParticle_2: {fileID: 0} + canMove: 0 + planAction: 0 +--- !u!95 &4358100366385517192 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253231568001379261} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 68841ed7bed30c841bf31d58a61fa4e8, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &-6455832433523655302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253231568001379261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b46e9eb3a752a3e4eb4c052abe78f82a, type: 3} + m_Name: + m_EditorClassIdentifier: + enemyNode: {fileID: 0} + aimNode: {fileID: 0} + layerMask: + serializedVersion: 2 + m_Bits: 0 + moveSpeed: 4 +--- !u!1 &2687402414900403258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8888823514061126702} + m_Layer: 0 + m_Name: FollowPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8888823514061126702 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2687402414900403258} + m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494} + m_LocalPosition: {x: 0, y: 0, z: -0.284} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4276721484070507378} + m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6503119109324506896} + - component: {fileID: 4532292198235687560} + - component: {fileID: 1857277813970574203} + m_Layer: 9 + m_Name: AimLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6503119109324506896 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509110568895175458} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4276721484070507378} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!120 &4532292198235687560 +LineRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509110568895175458} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 6dae87f6dbe79e34fb7adcae048807dd, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 6, y: 0, z: 1} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.0031585693 + value: 0.11028418 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MaskInteraction: 0 + m_UseWorldSpace: 1 + m_Loop: 0 + m_ApplyActiveColorSpace: 1 +--- !u!114 &1857277813970574203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509110568895175458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e85732096b0d414f9d6f9ea2e10f06f, type: 3} + m_Name: + m_EditorClassIdentifier: + lineRenderer: {fileID: 4532292198235687560} + density: 2 + speed: 0.005 + currentdisappearTime: 0 + aimGamgObject: {fileID: 0} +--- !u!1 &8899859137843901848 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 719232722191935980} + - component: {fileID: 5426754587987531663} + - component: {fileID: 8993153691267712734} + m_Layer: 9 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &719232722191935980 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8899859137843901848} + serializedVersion: 2 + m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494} + 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: + - {fileID: 6494013583369413442} + m_Father: {fileID: 4276721484070507378} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5426754587987531663 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8899859137843901848} + 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: -1 + m_Sprite: {fileID: -1272889281, guid: 5b238b3b82e3f2847bc68e382cfc219e, 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!114 &8993153691267712734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8899859137843901848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} + maxAnglesX: 0 + minAnglesX: 0 + maxAnglesY: 0 + minAnglesY: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Climavista.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Climavista.prefab.meta new file mode 100644 index 00000000..2562826f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Climavista.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 58d538ffd37498c4b945bf5571921770 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ContaminatusImmortalis.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ContaminatusImmortalis.prefab.meta index 55b0171a..f2d0da68 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ContaminatusImmortalis.prefab.meta +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ContaminatusImmortalis.prefab.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:ColorlessWorld-2024-4-2/Assets/Cartoon FX Pack/Demo/Demo.unity.meta -guid: 74a2bbc22786c5343879260536533ed3 -DefaultImporter: -======== guid: b1a9861072b29ff4b986818e1a6e3b07 PrefabImporter: ->>>>>>>> origin/dev-1217:ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ContaminatusImmortalis.prefab.meta externalObjects: {} userData: assetBundleName: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs index 89766316..19e7b129 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs @@ -36,6 +36,10 @@ public class Buff } + public virtual void Use() + { + + } public virtual void UIShow(GameObject buff, string key) { if (icon != null) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_AcidRain.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_AcidRain.cs new file mode 100644 index 00000000..6e2cbcb3 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_AcidRain.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_AcidRain : Buff +{ + public override void Settle() + { + + } + + + + public override void SettleEnemy(EnemyNode enemyNode) + { + + + + } + + + public override Buff NewBuff(int value) + { + Buff buff = new Buff_AcidRain(); + buff.value = value; + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01"); + return buff; + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_AcidRain.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_AcidRain.cs.meta new file mode 100644 index 00000000..a042ca33 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_AcidRain.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 18ad1b67159b4de448bba9ada029dbc6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs index daa49b69..de0f68e5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs @@ -104,6 +104,7 @@ public class CardEntity : MonoBehaviour int lastCost; public int currentCost; public string currentCostType; + public bool tempIsDisposable=true; private void Start() { currentCost = cardOriginalData.Cost; @@ -1052,7 +1053,7 @@ public class CardEntity : MonoBehaviour StringBuilder sb = new StringBuilder(); - Name.CreateCardDescription(sb, cardOriginalData); + Name.CreateCardDescription(sb, cardOriginalData,this); Debug.Log("卡牌"+cardOriginalData.CardId+"描述是:" + sb); cardDescription.text = sb.ToString(); // cardDescription.text= Replace( sb.ToString()); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/AcidRainCloud.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/AcidRainCloud.cs new file mode 100644 index 00000000..8b543c3b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/AcidRainCloud.cs @@ -0,0 +1,138 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; + +public class AcidRainCloud : Enemy +{ + + + + private void Start() + { + enemyNode = GetComponent(); + actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.shootAndPollute), 0.4f); + actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.attack), 0.6f); + enemyNode.sufferAbnormalCondition(AbnormalCondition.acidRain, 1); + } + + private void Update() + { + + } + + private void OnEnable() + { + + + } + public override IEnumerator JudgeActionCoroutine()//等移动到位置就判断是否还能走 + { + Debug.Log("真正行动是:" + enemyAction); + switch (enemyAction) + { + case EnemyAction_ShootAndPollute: + yield return StartCoroutine(PolluteAction()); + break; + case EnemyActionAction_Attack: + yield return StartCoroutine(MeleeAttackAction()); + break; + } + + } + + public override IEnumerator MeleeAttackAction() + { + MapUnity currentNode = getNodeTools.LocationToGetNode(enemyNode.positionX, enemyNode.positionY); + HashSet targetSet=new HashSet { GameManager.Instance.playerOn }; + getNodeTools.getCircleNodeForEnemy(targetSet, 1); + if (getNodeTools.canRemoteAttack(currentNode, enemyNode.EnemyState.attackRange)) + { + if (!enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.disarm)) + { + yield return StartCoroutine(enemyNode.MeleeAttackAim()); + // enemyNode.anim.SetTrigger("MeleeAttack"); + // yield return new WaitForSeconds(0.5f); + AttackDamage(enemyNode.EnemyState.damage, 1); + RandomTurnHandCardTempIsDisposable(1); + } + } + else + { + yield return StartCoroutine(moveTowardsPlayer()); + yield return new WaitForSeconds(1); + currentNode = getNodeTools.LocationToGetNode(enemyNode.positionX, enemyNode.positionY); + if (getNodeTools.canRemoteAttack(currentNode, enemyNode.EnemyState.attackRange)) + { + if (!enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.disarm)) + { + yield return StartCoroutine(enemyNode.MeleeAttackAim()); + // enemyNode.anim.SetTrigger("MeleeAttack"); + // yield return new WaitForSeconds(0.5f); + AttackDamage(enemyNode.EnemyState.damage, 1); + RandomTurnHandCardTempIsDisposable(1); + } + } + } + } + + public void RandomTurnHandCardTempIsDisposable(int num) + { + HashSet < CardEntity > targetSet= MathTool.GetRandomElements(new HashSet(TurnMaster.Instance.handCard.cardEntityList), num); + foreach(CardEntity cardEntity in targetSet) + { + cardEntity.tempIsDisposable = false; + } + } + public IEnumerator ThrowAttackAction(int count) + { + int range = 2; + MapUnity currentNode = getNodeTools.LocationToGetNode(enemyNode.positionX, enemyNode.positionY); + if (currentNode.whoColour == Name.NodeColor.Black) + { + range = 3; + } + if (!enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.disarm)) + { + //yield return StartCoroutine(enemyNode.MeleeAttackAim()); + // enemyNode.anim.SetTrigger("MeleeAttack"); + // yield return new WaitForSeconds(0.5f); + AoeDamage(getNodeTools.getNodesCount(Name.Color.Black), count, GameManager.Instance.playerOn, range); + } + yield return null; + } + + + public IEnumerator PolluteAction() + { + AttackDamage(5,1); + RandomPollute(getNodeTools.getAllNotBlackNodes(), 6); + yield return new WaitForSeconds(0.5f); + } + + + + + + + + + + + + + + + + + + + + + + + + + +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/AcidRainCloud.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/AcidRainCloud.cs.meta new file mode 100644 index 00000000..a252ff9b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/AcidRainCloud.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0d79ad6169a7e3249929c9b64a492eec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Climavista.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Climavista.cs new file mode 100644 index 00000000..b998f326 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Climavista.cs @@ -0,0 +1,128 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.UIElements; + +public class Climavista : Enemy +{ + + + + private void Start() + { + actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.shield), 0.7f); + actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.random), 0.3f); + } + + private void Update() + { + + } + + private void OnEnable() + { + + + } + public override IEnumerator JudgeActionCoroutine()//等移动到位置就判断是否还能走 + { + Debug.Log("真正行动是:" + enemyAction); + switch (enemyAction) + { + case EnemyActionAction_Shield: + yield return StartCoroutine(ShieldAction()); + break; + case EnemyActionAction_Random: + yield return StartCoroutine(SummonAction()); + break; + } + + } + + public override IEnumerator ShieldAction() + { + int minHp = 100; + int index = 0; + for (int i = 0; i < EnemyManager.Instance.enemySpeedSortingList.Count; i++) + { + if ((int)EnemyManager.Instance.enemySpeedSortingList[i].EnemyState.currentHP < minHp) + { + minHp = (int)EnemyManager.Instance.enemySpeedSortingList[i].EnemyState.currentHP; + index = i; + } + } + EnemyManager.Instance.enemySpeedSortingList[index].EnemyState.shieldValue += EnemyManager.Instance.enemySpeedSortingList[index].ShieldCalculation(15); + yield return new WaitForSeconds(0.5f); + } + + public void RandomTurnHandCardTempIsDisposable(int num) + { + HashSet < CardEntity > targetSet= MathTool.GetRandomElements(new HashSet(TurnMaster.Instance.handCard.cardEntityList), num); + foreach(CardEntity cardEntity in targetSet) + { + cardEntity.tempIsDisposable = false; + } + } + public IEnumerator SummonAction() + { + GameObject target= null; + MapUnity currentNode = getNodeTools.LocationToGetNode(enemyNode.positionX, enemyNode.positionY); + HashSet set = new HashSet { GameManager.Instance.playerOn }; + getNodeTools.getCircleNode(set, 1); + HashSet targetSet = MathTool.GetRandomElements(set,1); + MapUnity enemyMapunity=targetSet.ElementAt(0); + for (int i = 0; i < EnemyManager.Instance.enemySpeedSortingList.Count; i++) + { + if (EnemyManager.Instance.enemySpeedSortingList[i].enemyScript==EnemyNode.EnemyScript.AcidRainCloud) + { + target = EnemyManager.Instance.enemySpeedSortingList[i].GetComponent(); + } + } + if (target == null||enemyMapunity==null) + { + yield return null; + } + var currentenemy = Instantiate(target, this.transform.position, this.transform.rotation); + EnemyNode newEnemyNode = currentenemy.GetComponent(); + newEnemyNode.positionX = enemyMapunity.locationX; + newEnemyNode.positionY = enemyMapunity.locationY; + MapUnity newNode = getNodeTools.LocationToGetNode(newEnemyNode.positionX, newEnemyNode.positionY); + newNode.enemyNode = newEnemyNode; + yield return null; + } + + + public IEnumerator PolluteAction() + { + AttackDamage(5,1); + RandomPollute(getNodeTools.getAllNotBlackNodes(), 6); + yield return new WaitForSeconds(0.5f); + } + + + + + + + + + + + + + + + + + + + + + + + + + +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Climavista.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Climavista.cs.meta new file mode 100644 index 00000000..85d9a197 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Climavista.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b46e9eb3a752a3e4eb4c052abe78f82a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs index 5c7a0aa7..0bf9a3a7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs @@ -100,7 +100,9 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver Pollutinel, ContaminatusImmortalis, Leviathan, - StonePillar + StonePillar, + AcidRainCloud, + Climavista } [Header("意图行动")] @@ -796,6 +798,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver public virtual void OnDeath() { DeathVfxCal(); + enemyReward(); //enemy.OnDeath();dev-1217保留 if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.boomAndPollute)) @@ -853,6 +856,40 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver } } + + //逃跑 + public virtual void RunAway() + { + DeathVfxCal(); + + + switch (enemyType) + { + case EnemyType.enemy: + currentActionScript.FadeAttackRangeAll(this); + rangePool.Clear(); + EnemyManager.Instance.statePanel.SetActive(false); + RewardManager.Instance.JudgeEnemyOver(); + Destroy(this.gameObject); + break; + case EnemyType.block: + GetComponent().OnDeath(); + break; + } + + } + + public void enemyReward() + { + if (enemyScript == EnemyScript.Pharmacist) + { + + } + if (enemyScript == EnemyScript.Thief) + { + + } + } //死亡特效 public void DeathVfxCal() { @@ -1199,6 +1236,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver thornCal(); } bleedRealize(); + acidRainRealize(); int trueDamage = SufferDamageCalculation(damageVal); if (trueDamage > EnemyState.shieldValue) { @@ -1287,6 +1325,14 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver } } + public void acidRainRealize() + { + if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.acidRain)) + { + enemy.RandomPollute(getNodeTools.getAllNotBlackNodes(), 3); + } + + } public void bleedRealize() { if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.bleed)) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs index c1cbf5dd..67f89167 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs @@ -25,10 +25,11 @@ public class EnemyPool : MonoBehaviour public static Dictionary, float> eliteEnemyPool = new Dictionary, float>() { - { new List { Name.EnemyName.Pollutinel,Name.EnemyName.Pollutinel, Name.EnemyName.ContaminatusImmortalis}, 0.25f }, - { new List { Name.EnemyName.Gravitus,Name.EnemyName.PollutionSpreader, Name.EnemyName.PollutionSpreader}, 0.25f }, - { new List { Name.EnemyName.Twinbee,Name.EnemyName.ReconnaissanceBee, Name.EnemyName.ReconnaissanceBee, Name.EnemyName.Thief}, 0.25f }, - { new List { Name.EnemyName.ContaminatusImmortalis, Name.EnemyName.ContaminatusImmortalis, Name.EnemyName.PrismReflector}, 0.25f } + { new List { Name.EnemyName.Pollutinel,Name.EnemyName.Pollutinel, Name.EnemyName.ContaminatusImmortalis}, 0.2f }, + { new List { Name.EnemyName.Gravitus,Name.EnemyName.PollutionSpreader, Name.EnemyName.PollutionSpreader}, 0.2f }, + { new List { Name.EnemyName.Twinbee,Name.EnemyName.ReconnaissanceBee, Name.EnemyName.ReconnaissanceBee, Name.EnemyName.Thief}, 0.2f }, + { new List { Name.EnemyName.Climavista, Name.EnemyName.AcidRainCloud, Name.EnemyName.AcidRainCloud}, 0.2f }, + { new List { Name.EnemyName.ContaminatusImmortalis, Name.EnemyName.ContaminatusImmortalis, Name.EnemyName.PrismReflector}, 0.2f } }; public static Dictionary, float> bossEnemyPool = new Dictionary, float>() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Thief.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Thief.cs index 8f4ead78..303aba53 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Thief.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Thief.cs @@ -31,8 +31,7 @@ public class Thief : Enemy { if (aliveCount == 3) { - actionPool.Clear(); - actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.nothing), 1.0f); + enemyNode.RunAway(); } } public override IEnumerator JudgeActionCoroutine()//等移动到位置就判断是否还能走 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs index 9562417f..e91c87f0 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs @@ -54,17 +54,17 @@ public class PlayerStatsManager : Singleton //选项效果==加一个同步UI的订阅系统 public void EffectFunction(int functionIndex, string amount) { - switch (functionIndex) + switch (functionIndex.ToString()) { //加钱 - case 1: + case Name.Reward.Money: gainMoney(int.Parse ( amount)); BroadCastSyncMoneyText();//同步UI //声音 AudioManager.Instance.GainMoneyVoicePlayer(); break; //加血 - case 2: + case Name.Reward.Hp: playerState.currentHP += int.Parse(amount); if (playerState.currentHP > playerState.maxHP) { @@ -73,42 +73,42 @@ public class PlayerStatsManager : Singleton break; //加牌-非战斗中 - case 3: + case Name.Reward.Card: cardDeck.cardDeckList.Add(amount); Debug.Log("获得卡牌:" + amount); break; //加遗物 - case 4: + case Name.Reward.LegacyNode: LegacyManager.Instance.CreateLegacyClassAsNew(amount); Debug.Log("获得遗物:" + amount); break; //随机加遗物 - case 5: + case Name.Reward.RandomLegacyNode: string className = LegacyManager.Instance.getRandomRelicForCommon(int.Parse(amount)).ElementAt(0); LegacyManager.Instance.CreateLegacyClassAsNew(className) ; Debug.Log("获得遗物:" + className); break; //打印tips - case 6: + case Name.Reward.Tip: TipManager.Instance.SendTip(amount); break; //加锻造点 - case 7: + case Name.Reward.ForgingPoint: playerState .forgingPoint += int.Parse(amount); Debug.Log("获得锻造点:" + amount); break; //加移动力 - case 8: + case Name.Reward.CurrentStepRange: playerState.currentStepRange += int.Parse(amount); Debug.Log("获得移动力:" + amount); break; //加费用 - case 9: + case Name.Reward.CurrentCost: playerState.currentCost += int.Parse(amount); Debug.Log("获得费用:" + amount); break; //加药水 - case 10: + case Name.Reward.Potion: potionList.potionList.Add(amount); PotionManager.Instance.ReflashPotionFromHaven(); Debug.Log("获得药水:" + amount); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AbnormalCondition.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AbnormalCondition.cs index 9281cec5..273d3ecf 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AbnormalCondition.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AbnormalCondition.cs @@ -111,6 +111,8 @@ public class AbnormalCondition : Singleton public const string Invisible = "96"; //石肤 public const string stoneSkin = "97"; + //酸雨 + public const string acidRain = "98"; public static readonly List canNegativeNumberList = new List { angerUpperDamage, shieldUpperValue, addDrawCard }; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/MathTool.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/MathTool.cs index 03e3bc98..2e4261ca 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/MathTool.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/MathTool.cs @@ -298,6 +298,16 @@ public class MathTool return new HashSet(set.OrderBy(x => rand.Next()).Take(a)); } + public static HashSet GetRandomElements(HashSet set, int a) + { + System.Random rand = new System.Random(); + if (a >= set.Count) + { + return new HashSet(set); + } + return new HashSet(set.OrderBy(x => rand.Next()).Take(a)); + } + public static HashSet GetRandomElements(HashSet set, int a) { System.Random rand = new System.Random(); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs index 7147d4f2..56696fdf 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs @@ -39,6 +39,8 @@ public static class Name public const string ContaminatusImmortalis = "ContaminatusImmortalis"; public const string Leviathan = "Leviathan"; public const string StonePillar = "StonePillar"; + public const string Climavista = "Climavista"; + public const string AcidRainCloud = "AcidRainCloud"; } public const string value = "value"; @@ -94,7 +96,20 @@ public static class Name } - public static void CreateCardDescription(StringBuilder sb,CardOriginalData cardOriginalData) + public static class Reward + { + public const string Money = "1"; + public const string Hp = "2"; + public const string Card = "3"; + public const string LegacyNode = "4"; + public const string RandomLegacyNode = "5"; + public const string Tip = "6"; + public const string ForgingPoint = "7"; + public const string CurrentStepRange = "8"; + public const string CurrentCost = "9"; + public const string Potion = "10"; + } + public static void CreateCardDescription(StringBuilder sb,CardOriginalData cardOriginalData,CardEntity cardEntity) { bool isFirst = true; foreach (KeyValuePair kvp in cardOriginalData.commonFunctionVal) @@ -113,6 +128,11 @@ public static class Name } getSingleDescription(sb, kvp); } + if(!cardEntity.tempIsDisposable||!cardOriginalData + .IsDisposable) + { + sb.Append(",消耗"); + } /*foreach (KeyValuePair> kvp in cardOriginalData.conditionAndFunctionVal) { if (!kvp.Key.Equals(none)) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs index c792be99..9f7b1487 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs @@ -58,6 +58,7 @@ public class BuffDataManager : Singleton abnormalCondition.Add("93", new Buff_Calm()); abnormalCondition.Add("96", new Buff_Invisible()); abnormalCondition.Add("97", new Buff_StoneSkin()); + abnormalCondition.Add("98", new Buff_AcidRain()); abnormalCondition.Add("106", new Buff_flashPoint()); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs index 4fd7b4ad..4cb6ad6f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs @@ -12,7 +12,7 @@ public class DestructionManager : Singleton // Start is called before the first frame update public IEnumerator destoryAndUseCard(GameObject target, CardOriginalData cardOriginalData, HashSet influencePreviewPool, int cardIndex,MapUnity targetNode) { - if (!cardOriginalData.IsDisposable) + if (!cardOriginalData.IsDisposable&&!target.GetComponent().tempIsDisposable) { TurnMaster.Instance.usedCard.usedCardList.Add(target.GetComponent().CardId); }