增加鱼和鸡蛋

3D Fruit/Assets/#A2_Scripts/Battle/UI/BattleUI.cs

@@ -737,7 +737,7 @@ public class BattleUI : MonoBehaviour
                 }
                 else
                 {
-                    m_combo1EffectObj.transform.localScale = Vector3.one;
+                    m_combo1EffectObj.transform.localScale = Vector3.one * 1.5f;
                 }
                 GameServices.timerServices.Push(this, 1.0f, delegate
                 {
@@ -753,7 +753,7 @@ public class BattleUI : MonoBehaviour
                 }
                 else
                 {
-                    m_combo2EffectObj.transform.localScale = Vector3.one;
+                    m_combo2EffectObj.transform.localScale = Vector3.one * 1.5f;
                 }
                 GameServices.timerServices.Push(this, 1.0f, delegate
                 {
@@ -769,7 +769,7 @@ public class BattleUI : MonoBehaviour
                 }
                 else
                 {
-                    m_combo3EffectObj.transform.localScale = Vector3.one;
+                    m_combo3EffectObj.transform.localScale = Vector3.one * 1.5f;
                 }
                 GameServices.timerServices.Push(this, 1.0f, delegate
                 {
@@ -779,57 +779,51 @@ public class BattleUI : MonoBehaviour
         }
     }
     //设置表情符号
-    public void SetEmoji(int num)
+    public void SetEmoji(bool isGood,int num)
     {
         GameObject varEmojiObj;
-        if (num >= 1 && num <= 2)
+        if(!isGood)
         {
-            varEmojiObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.emojiSmileEffectObj);
-            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
+            if (num == 1)
             {
-                varEmojiObj.transform.localScale = Vector3.one * 0.5f;
+                varEmojiObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.emojiDisappointedEffectObj);
             }
             else
             {
-                varEmojiObj.transform.localScale = Vector3.one;
+                varEmojiObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.emojiCryEffectObj);
             }
-            GameServices.timerServices.Push(this, 2.0f, delegate
-            {
-                PoolManager.Instance.ReturnObjectToPool(varEmojiObj);
-            });
         }
-        else if (num > 2 && num <= 4)
+        else
         {
-            varEmojiObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.emojiHappyEffectObj);
-            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
+            if (num >= 1 && num <= 2)
             {
-                varEmojiObj.transform.localScale = Vector3.one * 0.5f;
+                varEmojiObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.emojiSmileEffectObj);
             }
-            else
+            else if (num > 2 && num <= 4)
             {
-                varEmojiObj.transform.localScale = Vector3.one;
+                varEmojiObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.emojiHappyEffectObj);
             }
-            GameServices.timerServices.Push(this, 2.0f, delegate
+            else
             {
-                PoolManager.Instance.ReturnObjectToPool(varEmojiObj);
-            });
+                varEmojiObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.emojiDroolEffectObj);
+            }
+        }
+        Vector3 varPos = varEmojiObj.transform.localPosition;
+        varPos.x = UnityEngine.Random.Range(-0.6f, 0.6f);
+        varPos.y = UnityEngine.Random.Range(0, 0.6f);
+        varEmojiObj.transform.localPosition = varPos;
+        if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
+        {
+            varEmojiObj.transform.localScale = Vector3.one * 0.5f;
         }
         else
         {
-            varEmojiObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.emojiDroolEffectObj);
-            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
-            {
-                varEmojiObj.transform.localScale = Vector3.one * 0.5f;
-            }
-            else
-            {
-                varEmojiObj.transform.localScale = Vector3.one;
-            }
-            GameServices.timerServices.Push(this, 2.0f, delegate
-            {
-                PoolManager.Instance.ReturnObjectToPool(varEmojiObj);
-            });
+            varEmojiObj.transform.localScale = Vector3.one * 0.5f;
         }
+        GameServices.timerServices.Push(this, 2.0f, delegate
+        {
+            PoolManager.Instance.ReturnObjectToPool(varEmojiObj);
+        });
     }
     //设置good表现
     public void SetGoodShow(int num)

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

@@ -7,6 +7,8 @@ public class GlassView : MonoBehaviour
     public Transform m_strawberry;//草莓
     public Transform m_lemon;//柠檬
     public Transform m_orange;//橙子
+    public Transform m_fish;//鱼
+    public Transform m_egg;//蛋
     public Transform m_effectPos;//特效位置
     public Transform m_maskTrans;//遮罩
     public Vector3 effectPos => m_effectPos.position;
@@ -14,10 +16,14 @@ public class GlassView : MonoBehaviour
     private float m_strawberryOffest;
     private float m_lemonOffest;
     private float m_orangeOffest;
+    private float m_fishOffest;
+    private float m_eggOffest;
 
     private float m_strawberryNum;
     private float m_lemonNum;
     private float m_orangeNum;
+    private float m_fishNum;
+    private float m_eggNum;
 
     //private float m_strawberryMaxNum = 10.0f;
     //private float m_lemonMaxNum = 10.0f;
@@ -50,6 +56,14 @@ public class GlassView : MonoBehaviour
         {
             m_orange.gameObject.SetActive(false);
         }
+        if(m_fish)
+        {
+            m_fish.gameObject.SetActive(false);
+        }
+        if(m_egg)
+        {
+            m_egg.gameObject.SetActive(false);
+        }
     }
     private void Start()
     {
@@ -73,9 +87,9 @@ public class GlassView : MonoBehaviour
         m_strawberryNum = num;
     }
     //水果数量
-    public void SetFruitNum(int num1,int num2,int num3)
+    public void SetFruitNum(int num1,int num2,int num3,int num4,int num5)
     {
-        m_fruitNum += num1 + num2 + num3;
+        m_fruitNum += num1 + num2 + num3 + num4 + num5;
         BattleCtrl.instance.levelManager.curLevel.progressFruitNum = (int)m_fruitNum;
         if (m_fruitNum >= GlobalConfig.ProgressFruitNumNeed)
         {
@@ -101,6 +115,16 @@ public class GlassView : MonoBehaviour
             m_orangeNum = GlobalConfig.ProgressFruitNumNeed;
             //BattleCtrl.instance.battleUI.SetOrangeState(true);
         }
+        m_fishNum += num4;
+        if(m_fishNum >= GlobalConfig.ProgressFruitNumNeed)
+        {
+            m_fishNum = GlobalConfig.ProgressFruitNumNeed;
+        }
+        m_eggNum += num5;
+        if (m_eggNum >= GlobalConfig.ProgressFruitNumNeed)
+        {
+            m_eggNum = GlobalConfig.ProgressFruitNumNeed;
+        }
         //BattleCtrl.instance.battleUI.SetStrawberryNum((int)m_strawberryNum);
         //BattleCtrl.instance.battleUI.SetLemonNum((int)m_lemonNum);
         //BattleCtrl.instance.battleUI.SetOrangeNum((int)m_orangeNum);
@@ -179,6 +203,21 @@ public class GlassView : MonoBehaviour
                     + m_lemon.localScale.y * m_power;
                 m_orange.localPosition = varOrangePos;
             }
+            if(m_fish)
+            {
+                Vector3 varFishPos = m_fish.localPosition;
+                varFishPos.y = m_startPos + m_strawberry.localScale.y * m_power
+                    + m_lemon.localScale.y * m_power + m_orange.localScale.y * m_power;
+                m_fish.localPosition = varFishPos;
+            }
+            if (m_egg)
+            {
+                Vector3 varEggPos = m_egg.localPosition;
+                varEggPos.y = m_startPos + m_strawberry.localScale.y * m_power
+                    + m_lemon.localScale.y * m_power + m_orange.localScale.y * m_power
+                    + m_fish.localScale.y * m_power;
+                m_egg.localPosition = varEggPos;
+            }
             //遮罩大小
             //Vector3 varMaskSize = m_maskTrans.localScale;
             //if (m_orange)
@@ -236,11 +275,63 @@ public class GlassView : MonoBehaviour
             varPos.y = m_startPos + m_strawberry.localScale.y * m_power
                 + m_lemon.localScale.y * m_power;
             m_orange.localPosition = varPos;
+            if (m_fish)
+            {
+                Vector3 varFishPos = m_fish.localPosition;
+                varFishPos.y = m_startPos + m_strawberry.localScale.y * m_power
+                    + m_lemon.localScale.y * m_power + m_orange.localScale.y * m_power;
+                m_fish.localPosition = varFishPos;
+            }
+            if (m_egg)
+            {
+                Vector3 varEggPos = m_egg.localPosition;
+                varEggPos.y = m_startPos + m_strawberry.localScale.y * m_power
+                    + m_lemon.localScale.y * m_power + m_orange.localScale.y * m_power
+                    + m_fish.localScale.y * m_power;
+                m_egg.localPosition = varEggPos;
+            }
             //遮罩大小
             //Vector3 varMaskSize = m_maskTrans.localScale;
             //varSize.y = m_strawberry.localScale.y + m_lemon.localScale.y + m_orange.localScale.y;
             //m_maskTrans.localScale = varSize;
         }
+        if (m_fishOffest < m_fishNum && m_fish)
+        {
+            m_fish.gameObject.SetActive(true);
+            m_fishOffest += Time.deltaTime * m_speed;
+
+            Vector3 varSize = m_fish.localScale;
+            varSize.y = m_fishOffest / (float)GlobalConfig.ProgressFruitNumNeed * 0.9f;
+            m_fish.localScale = varSize;
+
+            Vector3 varPos = m_fish.localPosition;
+            varPos.y = m_startPos + m_strawberry.localScale.y * m_power
+                + m_lemon.localScale.y * m_power + m_orange.localScale.y * m_power;
+            m_fish.localPosition = varPos;
+            if (m_egg)
+            {
+                Vector3 varEggPos = m_egg.localPosition;
+                varEggPos.y = m_startPos + m_strawberry.localScale.y * m_power
+                    + m_lemon.localScale.y * m_power + m_orange.localScale.y * m_power
+                    + m_fish.localScale.y * m_power;
+                m_egg.localPosition = varEggPos;
+            }
+        }
+        if (m_eggOffest < m_eggNum && m_egg)
+        {
+            m_egg.gameObject.SetActive(true);
+            m_eggOffest += Time.deltaTime * m_speed;
+
+            Vector3 varSize = m_egg.localScale;
+            varSize.y = m_eggOffest / (float)GlobalConfig.ProgressFruitNumNeed * 0.9f;
+            m_egg.localScale = varSize;
+
+            Vector3 varPos = m_egg.localPosition;
+            varPos.y = m_startPos + m_strawberry.localScale.y * m_power
+                + m_lemon.localScale.y * m_power + m_orange.localScale.y * m_power
+                + m_fish.localScale.y * m_power;
+            m_egg.localPosition = varPos;
+        }
         if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
         {
             //if(m_strawberryOffest >= m_strawberryNum && m_lemonOffest >= m_lemonNum)
@@ -254,7 +345,7 @@ public class GlassView : MonoBehaviour
             //    //BattleCtrl.instance.levelManager.curLevel.CalculateStar();
             //    BattleCtrl.instance.OnBattleWin();
             //}
-            if ((m_strawberryOffest + m_lemonOffest + m_orangeOffest) >= 10.0f
+            if ((m_strawberryOffest + m_orangeOffest + m_fishOffest + m_eggOffest) >= 10.0f
                 && m_bTop)
             {
                 m_bTop = false;

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

@@ -14,6 +14,10 @@ public class CacheManager : MonoBehaviour
     [SerializeField]
     private GameObject m_StrawberryObj;//草莓
     [SerializeField]
+    private GameObject m_FishObj;//鱼
+    [SerializeField]
+    private GameObject m_EggObj;//蛋
+    [SerializeField]
     private GameObject m_FootBallObj;//足球
     [SerializeField]
     private GameObject m_BasketBallObj;//篮球
@@ -34,6 +38,10 @@ public class CacheManager : MonoBehaviour
     [SerializeField]
     private GameObject m_OrangeEffect2;//橙子爆汁特效2
     [SerializeField]
+    private GameObject m_FishEffect;//鱼爆汁特效
+    [SerializeField]
+    private GameObject m_EggEffect;//蛋爆汁特效
+    [SerializeField]
     private GameObject m_StarwberryDropEffect;//草莓流体特效
     [SerializeField]
     private GameObject m_LemonDropEffect;//柠檬流体特效
@@ -62,6 +70,10 @@ public class CacheManager : MonoBehaviour
     [SerializeField]
     private Transform m_waterOrangeParentObj;//水插件橙子
     [SerializeField]
+    private Transform m_waterFishParentObj;//水插件鱼
+    [SerializeField]
+    private Transform m_waterEggParentObj;//水插件蛋
+    [SerializeField]
     private GameObject m_emojiSmileEffectObj;//表情微笑
     [SerializeField]
     private GameObject m_emojiHappyEffectObj;//表情大笑
@@ -75,6 +87,8 @@ public class CacheManager : MonoBehaviour
     public GameObject LemonObj => m_LemonObj;
     public GameObject OrangeObj => m_OrangeObj;
     public GameObject StrawberryObj => m_StrawberryObj;
+    public GameObject FishObj => m_FishObj;
+    public GameObject EggObj => m_EggObj;
     public GameObject FootBallObj => m_FootBallObj;
     public GameObject BasketBallObj => m_BasketBallObj;
     public GameObject VolleyBallObj => m_VolleyBallObj;
@@ -85,6 +99,8 @@ public class CacheManager : MonoBehaviour
     public GameObject LemonEffect2 => m_LemonEffect2;
     public GameObject OrangeEffect1 => m_OrangeEffect1;
     public GameObject OrangeEffect2 => m_OrangeEffect2;
+    public GameObject FishEffect => m_FishEffect;
+    public GameObject EggEffect => m_EggEffect;
     public GameObject StarwberryDropEffect => m_StarwberryDropEffect;
     public GameObject LemonDropEffect => m_LemonDropEffect;
     public GameObject OrangeDropEffect => m_OrangeDropEffect;
@@ -104,12 +120,18 @@ public class CacheManager : MonoBehaviour
     public static CacheManager Instance = null;
     private Water2D_Spawner[] m_strawberryArrayObj;
     private Water2D_Spawner[] m_orangeArrayObj;
+    private Water2D_Spawner[] m_fishArrayObj;
+    private Water2D_Spawner[] m_eggArrayObj;
     public Water2D_Spawner[] strawberryArrayObj => m_strawberryArrayObj;
     public Water2D_Spawner[] orangeArrayObj => m_orangeArrayObj;
+    public Water2D_Spawner[] fishArrayObj => m_fishArrayObj;
+    public Water2D_Spawner[] eggArrayObj => m_eggArrayObj;
     void Awake()
     {
         Instance = this;
         m_strawberryArrayObj = m_waterStarwberryParentObj.GetComponentsInChildren<Water2D_Spawner>();
         m_orangeArrayObj = m_waterOrangeParentObj.GetComponentsInChildren<Water2D_Spawner>();
+        m_fishArrayObj = m_waterFishParentObj.GetComponentsInChildren<Water2D_Spawner>();
+        m_eggArrayObj = m_waterEggParentObj.GetComponentsInChildren<Water2D_Spawner>();
     }
 }

3D Fruit/Assets/#A3_Prefabs/FruitFrags/Egg_frags.asset.meta

+fileFormatVersion: 2
+guid: 385172c76dd7d1d409cb1e7c3001263d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitFrags/Egg_sh_1_frags.asset.meta

+fileFormatVersion: 2
+guid: ca199b37d8faeb1478313814bb2fc6b2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitFrags/Egg_sh_2_frags.asset.meta

+fileFormatVersion: 2
+guid: c5e39d5f0a8a6ea40a2203bade8dec0f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitFrags/Egg_sh_3_frags.asset.meta

+fileFormatVersion: 2
+guid: 2cbc213a8ed8bb146bacc22f50f1f3c5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitFrags/Egg_sh_4_frags.asset.meta

+fileFormatVersion: 2
+guid: 68fcf9ac0797a2545a36487bd576e097
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitFrags/Fish_frags.asset.meta

+fileFormatVersion: 2
+guid: 7ea3e7c08805e144e827038629449b8c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitFrags/Fish_sh_1_frags.asset.meta

+fileFormatVersion: 2
+guid: 2cb96a664a672c444aaa66de8db6e85f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitFrags/Fish_sh_2_frags.asset.meta

+fileFormatVersion: 2
+guid: 30dee0b3c9a80c9488d981eac6895835
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitFrags/Fish_sh_3_frags.asset.meta

+fileFormatVersion: 2
+guid: c0da0f91c8ce5964a9d65f97987b6b76
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitFrags/Fish_sh_4_frags.asset.meta

+fileFormatVersion: 2
+guid: af04208296e4ff94fb1272aae11f7ffc
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitFrags/Fish_sh_5_frags.asset.meta

+fileFormatVersion: 2
+guid: 37ebfdbcaed0c1742b65007555546619
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitFrags/Fish_sh_6_frags.asset.meta

+fileFormatVersion: 2
+guid: e046ca6d2439a2a448661bfc2dac785e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitPrefab/BasketBall.prefab

@@ -108,7 +108,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9ce0afadfd77b3b40bf16a06353f4b73, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_type: 6
+  m_type: 8
   m_effect: {fileID: 5127399644486055594}
 --- !u!54 &8066507626458920324
 Rigidbody:

3D Fruit/Assets/#A3_Prefabs/FruitPrefab/Egg.prefab.meta

+fileFormatVersion: 2
+guid: f2305750786932346b84d5e526ae282a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitPrefab/Fish.prefab.meta

+fileFormatVersion: 2
+guid: 7fe4fd13fbd9fee478a4d1b7746fe4d5
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/FruitPrefab/FootBall.prefab

@@ -108,7 +108,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9ce0afadfd77b3b40bf16a06353f4b73, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_type: 5
+  m_type: 7
   m_effect: {fileID: 979885718349282238}
 --- !u!54 &8057892266802050875
 Rigidbody:

3D Fruit/Assets/#A3_Prefabs/FruitPrefab/Stone.prefab

@@ -124,7 +124,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9ce0afadfd77b3b40bf16a06353f4b73, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_type: 8
+  m_type: 10
   m_effect: {fileID: 3603993478180647943}
 --- !u!64 &3617706319613521397
 MeshCollider:

3D Fruit/Assets/#A3_Prefabs/FruitPrefab/VolleyBall.prefab

@@ -108,7 +108,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9ce0afadfd77b3b40bf16a06353f4b73, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_type: 7
+  m_type: 9
   m_effect: {fileID: 3287626112739133964}
 --- !u!54 &8164197497318543124
 Rigidbody:

3D Fruit/Assets/#C1_Models/Item/Egg.fbx.meta

@@ -36,7 +36,7 @@ ModelImporter:
     extraExposedTransformPaths: []
     extraUserProperties: []
     clipAnimations: []
-    isReadable: 0
+    isReadable: 1
   meshes:
     lODScreenPercentages: []
     globalScale: 1

3D Fruit/Assets/#C1_Models/Item/Fish.FBX.meta

@@ -36,7 +36,7 @@ ModelImporter:
     extraExposedTransformPaths: []
     extraUserProperties: []
     clipAnimations: []
-    isReadable: 0
+    isReadable: 1
   meshes:
     lODScreenPercentages: []
     globalScale: 1

3D Fruit/Assets/#C3_Materials/Juiceshader/Material/Egg.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Egg
+  m_Shader: {fileID: 4800000, guid: 6bb6ee299aa625849b8c3e69e1ca3b85, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 5213afac9c2f7db4d93ca1bffb9c4cdb, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaRange: -0.03
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Height: 0.55
+    - _LiquidHeight: 0.03
+    - _LiquidRimRange: 1.6
+    - _LiquidRimScale: 0.3
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Raduis: 0.08
+    - _RimRange: 0.08
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _WaveHeight: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _CameraOffset: {r: 0.2, g: 0, b: 0, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _FoamColor: {r: 0.54901963, g: 0.6039216, b: 0.6039216, a: 1}
+    - _ForceDir: {r: 0, g: 0, b: 0, a: 0}
+    - _LiquidCameraOffset: {r: 0.1, g: 0.1, b: 0.1, a: 0.1}
+    - _LiquidRimColor: {r: 1, g: 1, b: 1, a: 1}
+    - _RimColor: {r: 1, g: 1, b: 1, a: 1}
+    - _SectionColor: {r: 0.54901963, g: 0.6039216, b: 0.6039216, a: 1}
+    - _WaterColor: {r: 0.54901963, g: 0.6039216, b: 0.6039216, a: 1}

3D Fruit/Assets/#C3_Materials/Juiceshader/Material/Egg.mat.meta

+fileFormatVersion: 2
+guid: 9c953f8fe3d2f6d42af8886cebab8943
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#C3_Materials/Juiceshader/Material/Fish.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Fish
+  m_Shader: {fileID: 4800000, guid: 6bb6ee299aa625849b8c3e69e1ca3b85, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 5213afac9c2f7db4d93ca1bffb9c4cdb, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaRange: -0.03
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Height: 0.55
+    - _LiquidHeight: 0.03
+    - _LiquidRimRange: 1.6
+    - _LiquidRimScale: 0.3
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Raduis: 0.08
+    - _RimRange: 0.08
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _WaveHeight: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _CameraOffset: {r: 0.2, g: 0, b: 0, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _FoamColor: {r: 0.32941177, g: 0.61960787, b: 0.8784314, a: 1}
+    - _ForceDir: {r: 0, g: 0, b: 0, a: 0}
+    - _LiquidCameraOffset: {r: 0.1, g: 0.1, b: 0.1, a: 0.1}
+    - _LiquidRimColor: {r: 1, g: 1, b: 1, a: 1}
+    - _RimColor: {r: 1, g: 1, b: 1, a: 1}
+    - _SectionColor: {r: 0.32941177, g: 0.61960787, b: 0.8784314, a: 1}
+    - _WaterColor: {r: 0.32941177, g: 0.61960787, b: 0.8784314, a: 1}

3D Fruit/Assets/#C3_Materials/Juiceshader/Material/Fish.mat.meta

+fileFormatVersion: 2
+guid: 7501f022b05baf748a8cb9ebbc926a5a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#D1_Effects/Epic Toon FX/Prefabs/Combat/Blood/Red/BloodExplosionEgg.prefab.meta

+fileFormatVersion: 2
+guid: f5b4ded2fab0505409a42eaabf8efe94
+timeCreated: 1551967939
+licenseType: Store
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#D1_Effects/Epic Toon FX/Prefabs/Combat/Blood/Red/BloodExplosionFish.prefab.meta

+fileFormatVersion: 2
+guid: 68b8bfa8cab49d34f8b2815de631f528
+timeCreated: 1551967939
+licenseType: Store
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/Res/Levels/Level1.prefab

@@ -285,6 +285,36 @@ Transform:
   m_Father: {fileID: 6776441352706118465}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -21.026001}
+--- !u!1 &184800881748430266
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2084873888083434921}
+  m_Layer: 0
+  m_Name: BallParentNode
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2084873888083434921
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 184800881748430266}
+  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_Children: []
+  m_Father: {fileID: 2073360469839470708}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &244624431984592229
 GameObject:
   m_ObjectHideFlags: 0
@@ -2102,7 +2132,7 @@ Transform:
   m_Children:
   - {fileID: 719647900616576112}
   - {fileID: 2420115242379401310}
-  m_Father: {fileID: 2419814894692253840}
+  m_Father: {fileID: 2073360469839470708}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2257942441687038545
@@ -2528,7 +2558,7 @@ Transform:
   m_Children:
   - {fileID: 6664447788583718008}
   - {fileID: 3965101062226154160}
-  m_Father: {fileID: 2419814894692253840}
+  m_Father: {fileID: 2073360469839470708}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2419814893974238160
@@ -2599,6 +2629,8 @@ MonoBehaviour:
   m_collider2dView: {fileID: 0}
   m_cupWaterTrans: {fileID: 4850848273374308825}
   m_cheeseView: {fileID: 9043597689013836524}
+  m_sceneTrans: {fileID: 2073360469839470708}
+  m_parentNode: {fileID: 2084873888083434921}
 --- !u!1 &2419814894139061658
 GameObject:
   m_ObjectHideFlags: 0
@@ -2781,13 +2813,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2419814894542974149}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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_Children:
   - {fileID: 3225012261793090407}
   - {fileID: 1567781549190624595}
-  m_Father: {fileID: 2419814894692253840}
+  m_Father: {fileID: 2073360469839470708}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2419814894656923383
@@ -2813,7 +2845,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2419814894656923383}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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_Children:
@@ -2821,7 +2853,7 @@ Transform:
   - {fileID: 2798060234000266256}
   - {fileID: 3963924358340537383}
   - {fileID: 3099000446353230472}
-  m_Father: {fileID: 2419814894692253840}
+  m_Father: {fileID: 2073360469839470708}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2419814894692253841
@@ -2851,10 +2883,7 @@ Transform:
   m_LocalPosition: {x: 0, y: -0.14, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 6319510659133812683}
-  - {fileID: 2419814894542974148}
-  - {fileID: 2419814893835863036}
-  - {fileID: 2419814894656923382}
+  - {fileID: 2073360469839470708}
   - {fileID: 3082749503678602019}
   m_Father: {fileID: 2419814893974238167}
   m_RootOrder: 1
@@ -3680,8 +3709,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3579617453667791303}
   m_LocalRotation: {x: -0.08715578, y: -0, z: -0, w: 0.9961947}
-  m_LocalPosition: {x: 0, y: 0.33, z: 0.65}
-  m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
+  m_LocalPosition: {x: 0, y: 0.3300001, z: 0.65000004}
+  m_LocalScale: {x: 0.9, y: 0.90000015, z: 0.90000015}
   m_Children:
   - {fileID: 8053216236304487048}
   - {fileID: 3922333315094758114}
@@ -5197,6 +5226,8 @@ MonoBehaviour:
   m_strawberry: {fileID: 8053216236304487048}
   m_lemon: {fileID: 3922333315094758114}
   m_orange: {fileID: 2197235679629580728}
+  m_fish: {fileID: 0}
+  m_egg: {fileID: 0}
   m_effectPos: {fileID: 0}
   m_maskTrans: {fileID: 8220649301570761060}
 --- !u!1 &4758281453930290115
@@ -5762,7 +5793,7 @@ Transform:
   - {fileID: 8457516498781606797}
   - {fileID: 5853691760387570993}
   m_Father: {fileID: 2419814894692253840}
-  m_RootOrder: 4
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &9043597689013836524
 MonoBehaviour:
@@ -7380,6 +7411,41 @@ Transform:
   m_Father: {fileID: 8457516498781606797}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7957790574052248879
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2073360469839470708}
+  m_Layer: 0
+  m_Name: Scene
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2073360469839470708
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7957790574052248879}
+  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_Children:
+  - {fileID: 6319510659133812683}
+  - {fileID: 2419814894542974148}
+  - {fileID: 2419814893835863036}
+  - {fileID: 2419814894656923382}
+  - {fileID: 2084873888083434921}
+  m_Father: {fileID: 2419814894692253840}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8224206948486482618
 GameObject:
   m_ObjectHideFlags: 0
@@ -9016,18 +9082,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8ef0da07da6132c428e891f36503e977, type: 3}
---- !u!1 &8882207789937095801 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -7872133085688272115, guid: 8ef0da07da6132c428e891f36503e977,
-    type: 3}
-  m_PrefabInstance: {fileID: 7603026451685384052}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &3240855091594572910 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 8ef0da07da6132c428e891f36503e977,
     type: 3}
   m_PrefabInstance: {fileID: 7603026451685384052}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8882207789937095801 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -7872133085688272115, guid: 8ef0da07da6132c428e891f36503e977,
+    type: 3}
+  m_PrefabInstance: {fileID: 7603026451685384052}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7694169144062974165
 PrefabInstance:
   m_ObjectHideFlags: 0