修改流体数量

3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs

@@ -274,26 +274,34 @@ public class FruitView : MonoBehaviour
                 varVec.x += m_waterStarwberryLst[i].position.x;
                 varVec.y += m_waterStarwberryLst[i].position.y;
             }
+            varVec.x /= 2;
+            varVec.y /= 2;
             if (varVec.x < 0)
             {
-                varVec.x -= 1.0f;
+                varVec.x -= 0.5f;
             }
             else
             {
-                varVec.x += 1.0f;
+                varVec.x += 0.5f;
             }
             varVec.y += 1.0f;
-            GameObject varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberryObj);
+            GameObject varWaterEffect = null;
+            if(varStrawberryNum == 1)
+            {
+                varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberryObj);
+            }
+            else if(varStrawberryNum == 2)
+            {
+                varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry1Obj);
+            }
+            else
+            {
+                varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterStarwberry2Obj);
+            }
             varWaterEffect.transform.position = varVec;
             Water2D_Spawner varWater = varWaterEffect.GetComponent<Water2D_Spawner>();
             if (varWater)
             {
-                float varSize = 0.08f + 0.04f * (varStrawberryNum - 1);
-                if(varSize >= 0.16f)
-                {
-                    varSize = 0.16f;
-                }
-                varWater.size = varSize;
                 varWater.Spawn();
             }
             m_waterEffect.Add(varWaterEffect);
@@ -316,17 +324,23 @@ public class FruitView : MonoBehaviour
                 varVec.x += 1.0f;
             }
             varVec.y += 1.0f;
-            GameObject varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemonObj);
+            GameObject varWaterEffect = null;
+            if (varLemonNum == 1)
+            {
+                varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemonObj);
+            }
+            else if (varLemonNum == 2)
+            {
+                varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon1Obj);
+            }
+            else
+            {
+                varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterLemon2Obj);
+            }
             varWaterEffect.transform.position = varVec;
             Water2D_Spawner varWater = varWaterEffect.GetComponent<Water2D_Spawner>();
             if (varWater)
             {
-                float varSize = 0.08f + 0.04f * (varLemonNum - 1);
-                if (varSize >= 0.16f)
-                {
-                    varSize = 0.16f;
-                }
-                varWater.size = varSize;
                 varWater.Spawn();
             }
             m_waterEffect.Add(varWaterEffect);
@@ -349,17 +363,23 @@ public class FruitView : MonoBehaviour
                 varVec.x += 1.0f;
             }
             varVec.y += 1.0f;
-            GameObject varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrangeObj);
+            GameObject varWaterEffect = null;
+            if (varOrangeNum == 1)
+            {
+                varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrangeObj);
+            }
+            else if (varOrangeNum == 2)
+            {
+                varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange1Obj);
+            }
+            else
+            {
+                varWaterEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.waterOrange2Obj);
+            }
             varWaterEffect.transform.position = varVec;
             Water2D_Spawner varWater = varWaterEffect.GetComponent<Water2D_Spawner>();
             if (varWater)
             {
-                float varSize = 0.08f + 0.04f * (varOrangeNum - 1);
-                if (varSize >= 0.16f)
-                {
-                    varSize = 0.16f;
-                }
-                varWater.size = varSize;
                 varWater.Spawn();
             }
             m_waterEffect.Add(varWaterEffect);

3D Fruit/Assets/#A2_Scripts/Pool/CacheManager.cs

@@ -53,9 +53,21 @@ public class CacheManager : MonoBehaviour
     [SerializeField]
     private GameObject m_waterStarwberryObj;//水插件草莓
     [SerializeField]
+    private GameObject m_waterStarwberry1Obj;//水插件草莓
+    [SerializeField]
+    private GameObject m_waterStarwberry2Obj;//水插件草莓
+    [SerializeField]
     private GameObject m_waterLemonObj;//水插件柠檬
     [SerializeField]
+    private GameObject m_waterLemon1Obj;//水插件柠檬
+    [SerializeField]
+    private GameObject m_waterLemon2Obj;//水插件柠檬
+    [SerializeField]
     private GameObject m_waterOrangeObj;//水插件橙子
+    [SerializeField]
+    private GameObject m_waterOrange1Obj;//水插件橙子
+    [SerializeField]
+    private GameObject m_waterOrange2Obj;//水插件橙子
     public GameObject lineObj => m_lineObj;
     public GameObject LemonObj => m_LemonObj;
     public GameObject OrangeObj => m_OrangeObj;
@@ -80,8 +92,14 @@ public class CacheManager : MonoBehaviour
     public GameObject cmobo2EffectObj => m_cmobo2EffectObj;
     public GameObject cmobo3EffectObj => m_cmobo3EffectObj;
     public GameObject waterStarwberryObj => m_waterStarwberryObj;
+    public GameObject waterStarwberry1Obj => m_waterStarwberry1Obj;
+    public GameObject waterStarwberry2Obj => m_waterStarwberry2Obj;
     public GameObject waterLemonObj => m_waterLemonObj;
+    public GameObject waterLemon1Obj => m_waterLemon1Obj;
+    public GameObject waterLemon2Obj => m_waterLemon2Obj;
     public GameObject waterOrangeObj => m_waterOrangeObj;
+    public GameObject waterOrange1Obj => m_waterOrange1Obj;
+    public GameObject waterOrange2Obj => m_waterOrange2Obj;
     public static CacheManager Instance = null;
     void Awake()
     {