buff添加

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:

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: 

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_LocalPosition: {x: -0.74, y: 0.41, z: -2.83}
-  m_LocalScale: {x: 1, y: 1, z: 1.21}
+  m_LocalScale: {x: 1.052153, y: 1.1626, z: 0.85490113}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 534036242}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 39b649b4f522596478ef95da150e2260
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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)
+    {
+
+    }
+}

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: 

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>().text = "½û";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "²ø";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "ËË";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "Èí";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "Âý";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "³é";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "¹Ì";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "¼õ";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "¶¾";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "怒";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "¼á";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "ËÙ";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "Ò×";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

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>().text = "Ðé";
+        buff.transform.GetChild(1).GetComponent<Text>().text = Usermanager.playerAbnormalCondition[key].value.ToString();
+    }
+}

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: 

ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs

@@ -46,11 +46,15 @@ public class TurnMaster : Singleton<TurnMaster>
     {
         if (turn == Turn.playerTurnBegin)
         {
+            //求탬--녜엥
+            StartCoroutine(ShuffleWithLosingCards());
+
+            //써炬鯤소buff
+            Usermanager.Instance.PlayerTurnSettle();
+
             //恢复体力
             GameManager.Instance.playerState.currentStepRange = GameManager.Instance.playerState.maxStepRange;
             restoreResource(0);         
-            //Ï´ÅÆ--³é¿¨
-            StartCoroutine(ShuffleWithLosingCards());
 
             //显示敌人攻击虚线
             EnemyManager.Instance.EnemyLine_Observer();
@@ -63,7 +67,7 @@ public class TurnMaster : Singleton<TurnMaster>
 
         if (turn == Turn.enemyTurnBegin)
         {           
-            //½áËãbuff
+
             //结算技能冷却
             // EnemyManager.Instance.EnemySkillCoolDown_Observer();
             EnemyManager.Instance.enemyTurnSettle(0);

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs

@@ -140,6 +140,7 @@ public class EnemyManager : Singleton<EnemyManager>
     {
         foreach (var observer in enemyObservers)
         {
+            if(observer .GetEnemyNode ().enemyType ==EnemyNode.EnemyType.enemy )
             observer.AppearAimLine();
         }
     }

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AbnormalCondition.cs

@@ -18,4 +18,30 @@ public class AbnormalCondition : Singleton<AbnormalCondition>
     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";
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs

@@ -35,13 +35,4 @@ public class CardFunction
     //造成场地差伤害
     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";
 }

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);

ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs

@@ -14,14 +14,24 @@ public class Usermanager : Singleton<Usermanager>
     public int Shield { get => shield; set => shield = value; }
 
     [Header ("Buff状态")]
-    public static Dictionary<string, int> playerAbnormalCondition = new Dictionary<string, int>();//Ò쳣״̬
+    public static Dictionary<string, Buff > playerAbnormalCondition = new Dictionary<string, Buff >();//异常状态
+
     [Header("Buff状态UI组件")]
     public List<GameObject> buffIconList = new List<GameObject>();
     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<Usermanager>
         totalCost = 4;
     }
 
-    public  void AddPlayerAbnormalCondition()
+    #region  Buff施加函数
+    public void AddPlayerAbnormalCondition_Posion(int value)
     {
-         SufferPlayerAbnormalCondition(CardFunction.posion, 4);
+        Buff buff = new Buff_Posion ();
-         RefreshEnemyBuffIcon();
+        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())
+        Buff buff = new Buff_UpperAnger();
-        {
+        SufferPlayerAbnormalCondition(AbnormalCondition.angerUpperDamage, value, buff);
-            switch (key)
+        RefreshEnemyBuffIcon();
-            {
-                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();
-        }
-
     }
-
+    public void AddPlayerAbnormalCondition_angerDownDamage(int value)
-    private void thornSettle(object p)
+    {
+        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)
     {
-        playerAbnormalCondition[AbnormalCondition.thorn]--;
+        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<Usermanager>
         //再刷新
         foreach (var key in playerAbnormalCondition.Keys.ToList())
         {
-            switch (key)
+            if (playerAbnormalCondition[key].value != 0)
             {
-                case AbnormalCondition.posion:
+                var buff = Instantiate(buffIcon, buffPanle.transform);
-                    if (playerAbnormalCondition[key] != 0)
+                playerAbnormalCondition[key].UIShow(buff, key);
-                    {
+                buffIconList.Add(buff);
-                        var posion = Instantiate(buffIcon, buffPanle.transform);
-                        posion.transform.GetChild(0).GetComponent<Text>().text = "¶¾";
-                        posion.transform.GetChild(1).GetComponent<Text>().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>().text = "Ðé";
-                        weak.transform.GetChild(1).GetComponent<Text>().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>().text = "ÔÎ";
-                        coma.transform.GetChild(1).GetComponent<Text>().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>().text = "½É";
-                        disarm.transform.GetChild(1).GetComponent<Text>().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>().text = "˯";
-                        sleep.transform.GetChild(1).GetComponent<Text>().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>().text = "Á÷";
-                        bleed.transform.GetChild(1).GetComponent<Text>().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>().text = "´Ì";
-                        thorn.transform.GetChild(1).GetComponent<Text>().text = playerAbnormalCondition[key].ToString();
-                        buffIconList.Add(thorn);
-                    }
-                    break;
             } 
 
         }
     }
 
 
+    #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<Usermanager>
         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
 }