diff --git a/ColorlessWorld-2024-4-2/Assets/Image/Enemy_1.mat b/ColorlessWorld-2024-4-2/Assets/Image/Enemy_1.mat index a4e2c83c..1f3e7525 100644 --- a/ColorlessWorld-2024-4-2/Assets/Image/Enemy_1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Image/Enemy_1.mat @@ -40,7 +40,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} + m_Texture: {fileID: 2800000, guid: 36e303beef3b0d741b2f0fe8444ceae6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -64,7 +64,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} + m_Texture: {fileID: 2800000, guid: 36e303beef3b0d741b2f0fe8444ceae6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/spider.png b/ColorlessWorld-2024-4-2/Assets/Image/spider.png new file mode 100644 index 00000000..46d8b352 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/spider.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/spider.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/spider.png.meta new file mode 100644 index 00000000..5abf106c --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/spider.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 36e303beef3b0d741b2f0fe8444ceae6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index c9c393b2..5f543978 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -4048,8 +4048,8 @@ Transform: m_GameObject: {fileID: 260126008} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.48, y: 0.41, z: -3.53} - m_LocalScale: {x: 1, y: 1, z: 1.21} + m_LocalPosition: {x: -0.74, y: 0.41, z: -2.83} + m_LocalScale: {x: 1.052153, y: 1.1626, z: 0.85490113} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 534036242} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff.meta new file mode 100644 index 00000000..18b871a7 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39b649b4f522596478ef95da150e2260 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs new file mode 100644 index 00000000..a19105dc --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff +{ + public int value; + public virtual void Settle() + { + value --; + } + public virtual int CheckValue() + { + return value; + } + + public virtual void UIShow(GameObject buff, string key) + { + + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs.meta new file mode 100644 index 00000000..2431840e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d726f8a1c68407146b3fd9b36a5a0ba9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BanDrawCard.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BanDrawCard.cs new file mode 100644 index 00000000..902cc7aa --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BanDrawCard.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_BanDrawCard : Buff +{ + public override void Settle() + { + SettleBanDrawCard(); + base.Settle(); + + } + + public void SettleBanDrawCard() + { + + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "½û"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BanDrawCard.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BanDrawCard.cs.meta new file mode 100644 index 00000000..a9449f0d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BanDrawCard.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3e207186ebf11774f94e6be3f1dec3fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BanStepRange.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BanStepRange.cs new file mode 100644 index 00000000..97eb0be8 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BanStepRange.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_BanStepRange : Buff +{ + public override void Settle() + { + base.Settle(); + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "²ø"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BanStepRange.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BanStepRange.cs.meta new file mode 100644 index 00000000..99b11812 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BanStepRange.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6751ff38f33d2ca46b1ede78d748944b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownAnger.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownAnger.cs new file mode 100644 index 00000000..0e3d5384 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownAnger.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_DownAnger :Buff +{ + public override void Settle() + { + base.Settle(); + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "ËË"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownAnger.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownAnger.cs.meta new file mode 100644 index 00000000..c0c907df --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownAnger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 958a3134df084c946bbf496b6cfc1a09 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownShield.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownShield.cs new file mode 100644 index 00000000..4515909b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownShield.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_DownShield : Buff +{ + public override void Settle() + { + base.Settle(); + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "Èí"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownShield.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownShield.cs.meta new file mode 100644 index 00000000..01464f1e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownShield.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5430dd045f1d2b143a582abc17d7fca7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownStepRange.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownStepRange.cs new file mode 100644 index 00000000..2cd37ed3 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownStepRange.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_DownStepRange : Buff +{ + public override void Settle() + { + base.Settle(); + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "Âý"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownStepRange.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownStepRange.cs.meta new file mode 100644 index 00000000..6f361314 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownStepRange.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 311aac8cd0745bc46ad49fa76ec1723e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DrawCardNumber.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DrawCardNumber.cs new file mode 100644 index 00000000..80a00a8f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DrawCardNumber.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_DrawCardNumber : Buff +{ + public override void Settle() + { + SettleDrawCardNumber(); + base.Settle(); + } + + private void SettleDrawCardNumber() + { + Debug.Log("¶îÍâ³é¿¨ÊýÁ¿;" + value); + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "³é"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DrawCardNumber.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DrawCardNumber.cs.meta new file mode 100644 index 00000000..b494ff05 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DrawCardNumber.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 51e8e2cc00d1a4c44b65ea4238c5e88e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Firm.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Firm.cs new file mode 100644 index 00000000..48802bb2 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Firm.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_Firm : Buff +{ + public override void Settle() + { + base.Settle(); + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "¹Ì"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Firm.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Firm.cs.meta new file mode 100644 index 00000000..91b47fa0 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Firm.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fecb3b912744db141987341dda92ec1f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_MinusDrawCard.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_MinusDrawCard.cs new file mode 100644 index 00000000..e5848d53 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_MinusDrawCard.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_MinusDrawCard : Buff +{ + public override void Settle() + { + SettleMinDrawCard(); + base.Settle(); + + } + + public void SettleMinDrawCard() + { + + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "¼õ"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_MinusDrawCard.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_MinusDrawCard.cs.meta new file mode 100644 index 00000000..fbdaaa7f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_MinusDrawCard.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d243f78d194bb514682acb30f3c6a7e4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Posion.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Posion.cs new file mode 100644 index 00000000..6478ce48 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Posion.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_Posion : Buff +{ + public override void Settle() + { + SettlePosion(); + base.Settle(); + + } + + public void SettlePosion() + { + if (value > 0) + GameManager.Instance.playerState.currentHP -= value; + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "¶¾"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Posion.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Posion.cs.meta new file mode 100644 index 00000000..7e2babe0 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Posion.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 106e17594dc81214dae5e906a1e3c67d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperAnger.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperAnger.cs new file mode 100644 index 00000000..5e22de92 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperAnger.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_UpperAnger : Buff +{ + public override void Settle() + { + base.Settle(); + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "怒"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperAnger.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperAnger.cs.meta new file mode 100644 index 00000000..d1a51e13 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperAnger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 53a0e52799dcf61449c06b85f446e7a3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperShield.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperShield.cs new file mode 100644 index 00000000..97a65f04 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperShield.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_UpperShield : Buff +{ + public override void Settle() + { + base.Settle(); + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "¼á"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperShield.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperShield.cs.meta new file mode 100644 index 00000000..87bb0d28 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperShield.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9f9ee7fd8086ba4479cacd56223d24ff +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperStepRange.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperStepRange.cs new file mode 100644 index 00000000..ee229875 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperStepRange.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_UpperStepRange : Buff +{ + public override void Settle() + { + base.Settle(); + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "ËÙ"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperStepRange.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperStepRange.cs.meta new file mode 100644 index 00000000..3521f238 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_UpperStepRange.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 29afb0f14e67f9241b376fcfa9cdf8e2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Vulnerable.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Vulnerable.cs new file mode 100644 index 00000000..03f26231 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Vulnerable.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Buff_Vulnerable : Buff +{ + public override void Settle() + { + base.Settle(); + SettleVulnerable(); + } + + public void SettleVulnerable() + { + if (value > 0) + Usermanager.Instance.SufferDamageJudge(); + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "Ò×"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Vulnerable.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Vulnerable.cs.meta new file mode 100644 index 00000000..25fc963f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Vulnerable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 553b41e7bdbc7ff468b47b9eff2e79c8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Weak.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Weak.cs new file mode 100644 index 00000000..548d7d96 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Weak.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +public class Buff_Weak : Buff +{ + public override void Settle() + { + SettleWeak(); + base.Settle(); + + } + + public void SettleWeak() + { + + } + + public override void UIShow(GameObject buff, string key) + { + buff.transform.GetChild(0).GetComponent().text = "Ðé"; + buff.transform.GetChild(1).GetComponent().text = Usermanager.playerAbnormalCondition[key].value.ToString(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Weak.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Weak.cs.meta new file mode 100644 index 00000000..aaecd315 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Weak.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3a117a78565eaac48a8ec694eadf0360 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs index ac1c0308..941e8a96 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs @@ -45,13 +45,17 @@ public class TurnMaster : Singleton private void Update() { if (turn == Turn.playerTurnBegin) - { - //»Ö¸´ÌåÁ¦ - GameManager.Instance.playerState.currentStepRange = GameManager.Instance.playerState.maxStepRange; - restoreResource(0); + { //Ï´ÅÆ--³é¿¨ StartCoroutine(ShuffleWithLosingCards()); + //½áËãÍæ¼Òbuff + Usermanager.Instance.PlayerTurnSettle(); + + //»Ö¸´ÌåÁ¦ + GameManager.Instance.playerState.currentStepRange = GameManager.Instance.playerState.maxStepRange; + restoreResource(0); + //ÏÔʾµÐÈ˹¥»÷ÐéÏß EnemyManager.Instance.EnemyLine_Observer(); //»Ø¸´µÐÈËϵÊý @@ -62,8 +66,8 @@ public class TurnMaster : Singleton } if (turn == Turn.enemyTurnBegin) - { - //½áËãbuff + { + //½áËã¼¼ÄÜÀäÈ´ // EnemyManager.Instance.EnemySkillCoolDown_Observer(); EnemyManager.Instance.enemyTurnSettle(0); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs index c30ccfb6..fd4799b1 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs @@ -140,6 +140,7 @@ public class EnemyManager : Singleton { foreach (var observer in enemyObservers) { + if(observer .GetEnemyNode ().enemyType ==EnemyNode.EnemyType.enemy ) observer.AppearAimLine(); } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AbnormalCondition.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AbnormalCondition.cs index 4600b28e..d25e4037 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AbnormalCondition.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AbnormalCondition.cs @@ -18,4 +18,30 @@ public class AbnormalCondition : Singleton public const string bleed = "9"; //¾£¼¬ public const string thorn = "10"; + + //ºó¼ÓÍæ¼Ò·½ + //Å­»ðÌáÉýÉ˺¦- + public const string angerUpperDamage = "11"; + //Å­»ð½µµÍÉ˺¦- + public const string angerDownDamage = "12"; + //¼á¹Ì»ñµÃ»¤¶ÜÔöÒæ- + public const string shieldUpperValue = "13"; + //¼á¹Ì¸º½µµÍ»¤¶Ü- + public const string shieldDownValue = "14"; + //¼á¹Ì£¨»ØºÏ¿ªÊ¼²»µô»¤¶Ü£©- + public const string firm = "15"; + //¼ÓÅÆ- + public const string addDrawCard = "16"; + //¼õÅÆ- + public const string minusDrawCard = "17"; + //½ûÅÆ- + public const string banDrawCard = "18"; + //Ò×ÉË- + public const string vulnerable = "19"; + //¼ÓËÙ- + public const string upperSpeed = "20"; + //¼õËÙ- + public const string downSpeed = "21"; + //²øÈÆ- + public const string BanStep = "22"; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs index c581806a..549f9cb5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs @@ -34,14 +34,5 @@ public class CardFunction public const string dyeing = "14"; //Ôì³É³¡µØ²îÉ˺¦ public const string nodeDiffDamage = "15"; - - //ºó¼ÓÍæ¼Ò·½ - //Å­»ðÌáÉýÉ˺¦ - public const string angerUpperDamage = "16"; - //Å­»ð½µµÍÉ˺¦ - public const string angerDownDamage = "17"; - //¼á¹Ì»ñµÃ»¤¶ÜÔöÒæ - public const string shieldUpperValue = "18"; - //¼á¹Ì¸º½µµÍ»¤¶Ü - public const string shieldDownValue = "19"; + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyAimLine.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyAimLine.cs index 707361ab..c5f44a4a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyAimLine.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyAimLine.cs @@ -18,11 +18,12 @@ public class EnemyAimLine : MonoBehaviour [Header("Ä¿±ê")] public GameObject aimGamgObject; - private void Start() + private void OnEnable() { material = lineRenderer.material; aimGamgObject = GameManager.Instance.player.gameObject; } + void Update() { lineRenderer.SetPosition(0, this.transform.position); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs index 15412178..acc2df75 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs @@ -14,14 +14,24 @@ public class Usermanager : Singleton public int Shield { get => shield; set => shield = value; } [Header ("Buff״̬")] - public static Dictionary playerAbnormalCondition = new Dictionary();//Ò쳣״̬ + public static Dictionary playerAbnormalCondition = new Dictionary();//Ò쳣״̬ + [Header("Buff״̬UI×é¼þ")] public List buffIconList = new List(); public GameObject buffPanle; public GameObject buffIcon; [Header("Buff×´ÔöÒæ²ÎÊý")] - public float damagemultiply =1;//É˺¦±ÈÂÊ + //É˺¦±ÈÂÊ + public float damagemultiply =1; + //ÊÇ·ñÓÐÇ¿¹Ì + public bool firm; + //³é¿¨ÊýÁ¿³ËÂÊ + public float drawNubmerMultiply =1; + //Êܵ½É˺¦³ËÂÊ + public float sufferDamageMultiply = 1; + //Òƶ¯³ËÂÊ + public float stepRangeMultiply = 1; public Usermanager(int health) { @@ -37,91 +47,109 @@ public class Usermanager : Singleton totalCost = 4; } - public void AddPlayerAbnormalCondition() + #region BuffÊ©¼Óº¯Êý + public void AddPlayerAbnormalCondition_Posion(int value) { - SufferPlayerAbnormalCondition(CardFunction.posion, 4); - RefreshEnemyBuffIcon(); + Buff buff = new Buff_Posion (); + SufferPlayerAbnormalCondition(AbnormalCondition.posion, value,buff); + RefreshEnemyBuffIcon(); } - public void SufferPlayerAbnormalCondition(string condition, int value) - { - if(playerAbnormalCondition == null ) - { - playerAbnormalCondition.Add(condition, value); - } - else - { - if (playerAbnormalCondition.ContainsKey(condition)) - { - int beforeval = playerAbnormalCondition[condition]; - int afterval = beforeval + value; - playerAbnormalCondition[condition] = afterval; - } - else - { - playerAbnormalCondition.Add(condition, value); - //playerAbnormalCondition[condition] = value; - } - } - - + public void AddPlayerAbnormalCondition_Weak(int value) + { + Buff buff = new Buff_Weak(); + SufferPlayerAbnormalCondition(AbnormalCondition.weak, value, buff); + RefreshEnemyBuffIcon(); } - public void PlayerTurnSettle(int settleTurn) + public void AddPlayerAbnormalCondition_angerUpperDamage(int value) { - foreach (var key in playerAbnormalCondition.Keys.ToList()) - { - switch (key) - { - case AbnormalCondition.posion: - posionSettle(playerAbnormalCondition[key]); - break; - case AbnormalCondition.weak: - weakSettle(playerAbnormalCondition[key]); - break; - case AbnormalCondition.coma: - comaSettle(playerAbnormalCondition[key]); - break; - case AbnormalCondition.disarm: - disarmSettle(playerAbnormalCondition[key]); - break; - case AbnormalCondition.bleed: - //bleedSettle(EnemyState.abnormalCondition[key]); - break; - case AbnormalCondition.thorn: - thornSettle(playerAbnormalCondition[key]); - break; - } - //abnormalConditionEndCheck(); - } - + Buff buff = new Buff_UpperAnger(); + SufferPlayerAbnormalCondition(AbnormalCondition.angerUpperDamage, value, buff); + RefreshEnemyBuffIcon(); } - - private void thornSettle(object p) - { - playerAbnormalCondition[AbnormalCondition.thorn]--; + public void AddPlayerAbnormalCondition_angerDownDamage(int value) + { + Buff buff = new Buff_DownAnger(); + SufferPlayerAbnormalCondition(AbnormalCondition.angerDownDamage, value, buff); + RefreshEnemyBuffIcon(); + } + public void AddPlayerAbnormalCondition_shieldUpperValue(int value) + { + Buff buff = new Buff_UpperShield(); + SufferPlayerAbnormalCondition(AbnormalCondition.shieldUpperValue, value, buff); + RefreshEnemyBuffIcon(); + } + public void AddPlayerAbnormalCondition_shieldDownValue(int value) + { + Buff buff = new Buff_DownShield(); + SufferPlayerAbnormalCondition(AbnormalCondition.shieldDownValue, value, buff); + RefreshEnemyBuffIcon(); } - private void thornAdd(object p) + public void AddPlayerAbnormalCondition_firm(int value) { - playerAbnormalCondition[AbnormalCondition.thorn]--; + Buff buff = new Buff_Firm(); + SufferPlayerAbnormalCondition(AbnormalCondition.firm, value, buff); + RefreshEnemyBuffIcon(); } - private void disarmSettle(object p) + public void AddPlayerAbnormalCondition_addDrawCard(int value) { - playerAbnormalCondition[AbnormalCondition.disarm]--; + Buff buff = new Buff_DrawCardNumber(); + SufferPlayerAbnormalCondition(AbnormalCondition.addDrawCard, value, buff); + RefreshEnemyBuffIcon(); } + public void AddPlayerAbnormalCondition_minusDrawCard(int value) + { + Buff buff = new Buff_MinusDrawCard(); + SufferPlayerAbnormalCondition(AbnormalCondition.minusDrawCard , value, buff); + RefreshEnemyBuffIcon(); + } + public void AddPlayerAbnormalCondition_banDrawCard(int value) + { + Buff buff = new Buff_BanDrawCard(); + SufferPlayerAbnormalCondition(AbnormalCondition.banDrawCard, value, buff); + RefreshEnemyBuffIcon(); + } + #endregion - private void comaSettle(object p) + //BuffÊ©¼Ó + public void SufferPlayerAbnormalCondition(string condition, int value ,Buff buff) { - playerAbnormalCondition[AbnormalCondition.coma]--; + if (playerAbnormalCondition.ContainsKey(condition)) + { + int beforeval = playerAbnormalCondition[condition].value; + int afterval = beforeval + value; + playerAbnormalCondition[condition].value = afterval; + } + else + { + buff.value = value; + playerAbnormalCondition.Add(condition,buff); + } + } - private void weakSettle(object p) + //»ØºÏBuff½áËã + public void PlayerTurnSettle() { - playerAbnormalCondition[AbnormalCondition.weak]--; + foreach (var key in playerAbnormalCondition.Keys.ToList()) + { + playerAbnormalCondition[key].Settle(); + AbnormalConditionEndCheck(); + RefreshEnemyBuffIcon(); + } + } - private void posionSettle(object p) + //¼ì²éÒƳýÒѹéÁãbuff + public void AbnormalConditionEndCheck() { - playerAbnormalCondition[AbnormalCondition.posion]--; + foreach (var key in playerAbnormalCondition.Keys.ToList()) + { + if (playerAbnormalCondition[key].CheckValue() <= 0) + { + playerAbnormalCondition.Remove(key); + } + } } //Òì³£BuffÏÔʾ @@ -137,91 +165,34 @@ public class Usermanager : Singleton //ÔÙˢРforeach (var key in playerAbnormalCondition.Keys.ToList()) { - switch (key) + if (playerAbnormalCondition[key].value != 0) { - case AbnormalCondition.posion: - if (playerAbnormalCondition[key] != 0) - { - var posion = Instantiate(buffIcon, buffPanle.transform); - posion.transform.GetChild(0).GetComponent().text = "¶¾"; - posion.transform.GetChild(1).GetComponent().text = playerAbnormalCondition[key].ToString(); - buffIconList.Add(posion); - } - break; - case AbnormalCondition.weak: - if (playerAbnormalCondition[key] != 0) - { - var weak = Instantiate(buffIcon, buffPanle.transform); - weak.transform.GetChild(0).GetComponent().text = "Ðé"; - weak.transform.GetChild(1).GetComponent().text = playerAbnormalCondition[key].ToString(); - buffIconList.Add(weak); - } - break; - case AbnormalCondition.coma: - if (playerAbnormalCondition[key] != 0) - { - var coma = Instantiate(buffIcon, buffPanle.transform); - coma.transform.GetChild(0).GetComponent().text = "ÔÎ"; - coma.transform.GetChild(1).GetComponent().text = playerAbnormalCondition[key].ToString(); - buffIconList.Add(coma); - } - break; - case AbnormalCondition.disarm: - if (playerAbnormalCondition[key] != 0) - { - var disarm = Instantiate(buffIcon, buffPanle.transform); - disarm.transform.GetChild(0).GetComponent().text = "½É"; - disarm.transform.GetChild(1).GetComponent().text = playerAbnormalCondition[key].ToString(); - buffIconList.Add(disarm); - } - break; - case AbnormalCondition.sleep: - if (playerAbnormalCondition[key] != 0) - { - var sleep = Instantiate(buffIcon, buffPanle.transform); - sleep.transform.GetChild(0).GetComponent().text = "˯"; - sleep.transform.GetChild(1).GetComponent().text = playerAbnormalCondition[key].ToString(); - buffIconList.Add(sleep); - } - break; - case AbnormalCondition.bleed: - if (playerAbnormalCondition[key] != 0) - { - var bleed = Instantiate(buffIcon, buffPanle.transform); - bleed.transform.GetChild(0).GetComponent().text = "Á÷"; - bleed.transform.GetChild(1).GetComponent().text = playerAbnormalCondition[key].ToString(); - buffIconList.Add(bleed); - } - break; - case AbnormalCondition.thorn: - if (playerAbnormalCondition[key] != 0) - { - var thorn = Instantiate(buffIcon, buffPanle.transform); - thorn.transform.GetChild(0).GetComponent().text = "´Ì"; - thorn.transform.GetChild(1).GetComponent().text = playerAbnormalCondition[key].ToString(); - buffIconList.Add(thorn); - } - break; - } + var buff = Instantiate(buffIcon, buffPanle.transform); + playerAbnormalCondition[key].UIShow(buff, key); + buffIconList.Add(buff); + } } } + #region Buff½áË㺯Êý + //¼ÆË㺯Êý + //É˺¦¼ÆË㺯Êý public int DamageCalculation(int damage) { int angerUpperDamage=0, angerDownDamage=0; - if (playerAbnormalCondition .ContainsKey (CardFunction .angerUpperDamage )) + if (playerAbnormalCondition .ContainsKey (AbnormalCondition .angerUpperDamage )) { - angerUpperDamage = playerAbnormalCondition[CardFunction.angerUpperDamage]; + angerUpperDamage = playerAbnormalCondition[AbnormalCondition.angerUpperDamage].value; } - if(playerAbnormalCondition.ContainsKey(CardFunction.angerDownDamage )) + if(playerAbnormalCondition.ContainsKey(AbnormalCondition.angerDownDamage )) { - angerDownDamage = playerAbnormalCondition[CardFunction.angerDownDamage]; + angerDownDamage = playerAbnormalCondition[AbnormalCondition.angerDownDamage].value; } - if(playerAbnormalCondition.ContainsKey(CardFunction.weak)) + if(playerAbnormalCondition.ContainsKey(AbnormalCondition.weak)) { damagemultiply = 0.75f; }else @@ -231,22 +202,103 @@ public class Usermanager : Singleton damage = (int)((damage + angerUpperDamage - angerDownDamage) * damagemultiply); return damage; } + //»¤¶Ü¼ÆË㺯Êý public int ShieldCalculation(int shield) { int shieldValue = 0; - if (playerAbnormalCondition.ContainsKey(CardFunction.shieldUpperValue)) + if (playerAbnormalCondition.ContainsKey(AbnormalCondition.shieldUpperValue)) { - shieldValue += playerAbnormalCondition[CardFunction.shieldUpperValue]; + shieldValue += playerAbnormalCondition[AbnormalCondition.shieldUpperValue].value; } - if (playerAbnormalCondition.ContainsKey(CardFunction.shieldDownValue)) + if (playerAbnormalCondition.ContainsKey(AbnormalCondition.shieldDownValue)) { - shieldValue -= playerAbnormalCondition[CardFunction.shieldDownValue]; + shieldValue -= playerAbnormalCondition[AbnormalCondition.shieldDownValue].value; } shield += shieldValue; return shield; } + + //³éÅƼÆË㺯Êý + public int DrawCardCalculation(int drawNumber) + { + int addDrawNumber = 0; + + if (playerAbnormalCondition.ContainsKey(AbnormalCondition.addDrawCard)) + { + addDrawNumber += playerAbnormalCondition[AbnormalCondition.addDrawCard].value; + } + if (playerAbnormalCondition.ContainsKey(AbnormalCondition.minusDrawCard)) + { + addDrawNumber -= playerAbnormalCondition[AbnormalCondition.minusDrawCard].value; + } + if (playerAbnormalCondition.ContainsKey(AbnormalCondition.banDrawCard)) + { + drawNubmerMultiply =0; + } + else + { + drawNubmerMultiply = 1f; + } + drawNumber = (int)((drawNumber + addDrawNumber) * drawNubmerMultiply); + return drawNumber; + } + + //Òƶ¯Á¦¼ÆË㺯Êý + public int StepRangeCalculation(int stepRange) + { + int addStepRange =0; + + if (playerAbnormalCondition.ContainsKey(AbnormalCondition.upperSpeed)) + { + addStepRange += 1; + } + if (playerAbnormalCondition.ContainsKey(AbnormalCondition.downSpeed)) + { + addStepRange -= 1; + } + if (playerAbnormalCondition.ContainsKey(AbnormalCondition.BanStep)) + { + stepRangeMultiply = 0; + } + else + { + stepRangeMultiply = 1f; + } + stepRange = (int)((stepRange + addStepRange) *stepRangeMultiply); + return stepRange; + } + + //ÅжϺ¯Êý + + //Ò×ÉËÅÐ¶Ï + public void SufferDamageJudge() + { + if (playerAbnormalCondition.ContainsKey(AbnormalCondition.vulnerable)) + { + sufferDamageMultiply = 1.5f; + } + else + { + sufferDamageMultiply = 1f; + } + } + + //Ç¿¹ÌÅжϺ¯Êý + public bool FirmJudge() + { + if (playerAbnormalCondition.ContainsKey(AbnormalCondition.firm)) + { + firm = true; + } + else + { + firm = false; + } + return firm; + } + #endregion }