第二关卡足球切割逻辑修改

3D Fruit/Assets/#A1_Scenes/DemoScenes.unity

@@ -149,7 +149,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 1407519428234319374}
+  - {fileID: 2074253017468380731}
   m_Father: {fileID: 707446924}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -168,7 +168,7 @@ MonoBehaviour:
   levelPrefs:
   - {fileID: 8692181047053733938, guid: 90ed022fa9d48a64f910aad15b7faa2d, type: 3}
   - {fileID: 9081069388829900105, guid: 50002a8d201ddd64bb5b240aa652c3fa, type: 3}
-  m_selectLevel: {fileID: 792022048246168148}
+  m_selectLevel: {fileID: 413322415370619489}
 --- !u!1 &543166196
 GameObject:
   m_ObjectHideFlags: 0
@@ -472,11 +472,19 @@ MonoBehaviour:
     type: 3}
   m_OrangeDropEffect: {fileID: 8063522464624626971, guid: 139ee3314cd4d8b40a510b1007094ba7,
     type: 3}
---- !u!114 &792022048246168148 stripped
+  m_PlayerCameraRenderObj: {fileID: 93651439415487147, guid: 52ada8d829a8c8a4dac1c0e2d0b14733,
+    type: 3}
+  m_SmallBasketBallObj: {fileID: 2759814074459972332, guid: 1dcae436273d0244b86db8435e0b640e,
+    type: 3}
+  m_SmallFootBallObj: {fileID: 2759814074459972332, guid: b448b7fce5824dd43bbd1ec0e080cf32,
+    type: 3}
+  m_SmallVolleyBallObj: {fileID: 2759814074459972332, guid: 3ffb25378852c4840ba186a4144f55aa,
+    type: 3}
+--- !u!114 &413322415370619489 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 792022048260572742, guid: 7d089c5160dcdad4da62d25e38201967,
     type: 3}
-  m_PrefabInstance: {fileID: 1099363568593538087}
+  m_PrefabInstance: {fileID: 7711728870191611177}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
@@ -484,80 +492,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3a1cddb00bfc89f46a3cd60fae9f2fba, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1001 &1099363568593538087
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 186647395}
-    m_Modifications:
-    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8602880181674668592, guid: 7d089c5160dcdad4da62d25e38201967,
-        type: 3}
-      propertyPath: m_Name
-      value: SelectLevel
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 7d089c5160dcdad4da62d25e38201967, type: 3}
---- !u!4 &1407519428234319374 stripped
+--- !u!4 &2074253017468380731 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
     type: 3}
-  m_PrefabInstance: {fileID: 1099363568593538087}
+  m_PrefabInstance: {fileID: 7711728870191611177}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5254786120546215221
 PrefabInstance:
@@ -678,6 +617,75 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
+--- !u!1001 &7711728870191611177
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 186647395}
+    m_Modifications:
+    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407519428018055708, guid: 7d089c5160dcdad4da62d25e38201967,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8602880181674668592, guid: 7d089c5160dcdad4da62d25e38201967,
+        type: 3}
+      propertyPath: m_Name
+      value: SelectLevel
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7d089c5160dcdad4da62d25e38201967, type: 3}
 --- !u!114 &8947215104598825877 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 6064464677632144694, guid: 919382978f5e2684ba83e6daf6491458,

3D Fruit/Assets/#A2_Scripts/Battle/BattleCtrl.cs

@@ -152,7 +152,8 @@ public class BattleCtrl : MonoBehaviour
         {
             LocalRecord.SetIntRecord(levelManager.CurLevelIndex.ToString(), varCurStar);
         }
-        Invoke("DelayChangeToSelectScene", 2.0f);
+        //Invoke("DelayChangeToSelectScene", 2.0f);
+        battleUI.SetOkBtnState(true);
     }
 
     //延迟切换场景

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

@@ -61,6 +61,9 @@ public class BattleUI : MonoBehaviour
     public Image m_fadeMaskImage;//淡入淡出image
     public GameObject m_fruitTypeObj;//水果icon
     public GameObject m_SportTypeObj;//运动icon
+    public Button m_okBtn;//ok按钮
+    public Text m_fruitNeedDesText;//需要水果文字描述
+    public GameObject m_playerRawImageObj;
     public Action onStartBtn;
     public Action onPosUpBtn;
     public Action onPosDownBtn;
@@ -84,6 +87,7 @@ public class BattleUI : MonoBehaviour
     private bool m_bfadeState = false;
     private bool m_bLoadSceneFinish = false;//场景是否加载完成
     private int m_startIndex = 0;//点击开始次数
+    private GameObject m_cameraRenderObj;
 
     //线的处理
     private Stack<GameObject> m_objStack = new Stack<GameObject>();
@@ -107,6 +111,7 @@ public class BattleUI : MonoBehaviour
         m_tryAgain.onClick.AddListener(TryAgainLevel);
         m_startBtn.onClick.AddListener(StartBtn);
         m_settingBtn.onClick.AddListener(SettingBtn);
+        m_okBtn.onClick.AddListener(OkBtn);
         //m_posUpBtn.onClick.AddListener(PosUpBtn);
         //m_posDownBtn.onClick.AddListener(PosDownBtn);
         //m_fieldFarBtn.onClick.AddListener(FieldFarBtn);
@@ -175,10 +180,21 @@ public class BattleUI : MonoBehaviour
     {
         m_settingPanel.SetActive(!m_settingPanel.activeSelf);
     }
+    //ok
+    void OkBtn()
+    {
+        SetOkBtnState(false);
+        ChangeMainToSelectScene();
+    }
+    //ok按钮状态
+    public void SetOkBtnState(bool value)
+    {
+        m_okBtn.gameObject.SetActive(value);
+    }
     //设置按钮状态
     public void SettingBtnState(bool bool_)
     {
-        m_settingBtn.gameObject.SetActive(bool_);
+        //m_settingBtn.gameObject.SetActive(bool_);
     }
     //镜头拉上
     public void PosUpBtn()
@@ -287,6 +303,14 @@ public class BattleUI : MonoBehaviour
         m_progressCombo.fillAmount = (float)varComboPro / GlobalConfig.ProgressComboNeed;
         m_progressFruitNum.fillAmount = (float)varFruitNumPro / GlobalConfig.ProgressFruitNumNeed;
         m_progressNoOther.fillAmount = varNoOtherPro == 0 ? 1 : 0;
+        if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
+        {
+            m_fruitNeedDesText.text = string.Format("Fruit{0:d}", GlobalConfig.ProgressFruitNumNeed);
+        }
+        else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
+        {
+            m_fruitNeedDesText.text = string.Format("Sport{0:d}", GlobalConfig.ProgressFruitNumNeed);
+        }
     }
     //失败
     public void OnBattleFail()
@@ -636,6 +660,15 @@ public class BattleUI : MonoBehaviour
         m_bSelectToMain = false;
         m_bfadeState = false;
     }
+    //播放相机角色大笑
+    public void PlayCameraLaugh()
+    {
+        CameraRender varCam = m_cameraRenderObj.GetComponent<CameraRender>();
+        if(varCam)
+        {
+            varCam.Laugh();
+        }
+    }
     void Update()
     {
         //控制透明值变化
@@ -653,6 +686,7 @@ public class BattleUI : MonoBehaviour
                     BattleCtrl.instance.levelManager.SetSelectLevelState(false);
                     //m_fruitTypeObj.SetActive(m_startIndex % 2 == 0 ? true : false);
                     //m_SportTypeObj.SetActive(m_startIndex % 2 == 0 ? false : true);
+
                     if (m_startIndex == 1)
                     {
                         BattleCtrl.instance.LoadLevel(0);
@@ -661,6 +695,14 @@ public class BattleUI : MonoBehaviour
                     {
                         BattleCtrl.instance.levelManager.LoadNextLevel();
                     }
+                    m_cameraRenderObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.PlayerCameraRenderObj);
+                    CameraRender varCam = m_cameraRenderObj.GetComponent<CameraRender>();
+                    if (varCam)
+                    {
+                        varCam.ShowState();
+                    }
+                    //m_playerRawImageObj.SetActive(false);
+                    //m_playerRawImageObj.SetActive(true);
                 }
             }
             else
@@ -691,6 +733,8 @@ public class BattleUI : MonoBehaviour
                     GlobalConfig.SetActiveFruitState(false);
                     BattleCtrl.instance.levelManager.HideCurLevel();
                     BattleCtrl.instance.levelManager.SetSelectLevelState(true);
+                    PoolManager.Instance.ReturnObjectToPool(m_cameraRenderObj);
+                    BattleCtrl.instance.levelManager.curLevel.fruitView.RecycleSmallBall();
                 }
             }
             else

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

@@ -23,20 +23,31 @@ public class FruitItemView : MonoBehaviour
     private Vector3 m_liquidStartPos;
     private Quaternion m_liquidStartQua;
     private Vector3 m_liquidStartScale;
+
     private void Awake()
     {
         m_size = transform.localScale;
         m_meshRender = GetComponent<MeshRenderer>();
         //m_meshRender.sortingLayerID = 1;
         //m_meshRender.sortingOrder = 1;
-        m_childObj = transform.GetChild(0).gameObject;
+        if(transform.childCount > 0)
+        {
+            Transform varTransChild = transform.GetChild(0);
+            if (varTransChild)
+            {
+                m_childObj = varTransChild.gameObject;
+                if (m_childObj)
+                {
                     m_fragTrans = m_childObj.GetComponentsInChildren<MeshRenderer>();
-        for(int i = 0;i<m_fragTrans.Length;i++)
+                    for (int i = 0; i < m_fragTrans.Length; i++)
                     {
                         Transform varTrans = m_fragTrans[i].transform;
                         m_fragPos.Add(varTrans.localPosition);
                         m_fragQua.Add(varTrans.localRotation);
                     }
+                }
+            }
+        }
         //if (m_container)
         //{
         //    m_liquidContainer = m_container.gameObject.GetComponent<LiquidContainer>();
@@ -167,11 +178,14 @@ public class FruitItemView : MonoBehaviour
         {
             m_childObj.SetActive(false);
         }
+        if(m_fragTrans != null)
+        {
             for (int i = 0; i < m_fragTrans.Length; i++)
             {
                 m_fragTrans[i].transform.localPosition = m_fragPos[i];
                 m_fragTrans[i].transform.localRotation = m_fragQua[i];
             }
+        }
         //if (m_effect)
         //{
         //    m_effect.SetActive(false);

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

@@ -40,6 +40,10 @@ public class FruitView : MonoBehaviour
     private int m_lemonTotalNum;
     private int m_orangeTotalNum;
     private int m_comboNum;
+
+    //小球处理
+    private List<GameObject> m_smallBallLst = new List<GameObject>();
+    private List<Vector3> m_smallBallPosLst = new List<Vector3>();
     private void Awake()
     {
         //if (m_animator)
@@ -103,6 +107,51 @@ public class FruitView : MonoBehaviour
         }
         return false;
     }
+    //小球处理
+    void CreateSmallBall(FruitItemView view)
+    {
+        if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
+        {
+            GameObject varGo = null;
+            if (view.type == FruitType.BasketBall)
+            {
+                varGo = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.SmallBasketBallObj);
+            }
+            else if(view.type == FruitType.FootBall)
+            {
+                varGo = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.SmallFootBallObj);
+            }
+            else if (view.type == FruitType.VolleyBall)
+            {
+                varGo = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.SmallVolleyBallObj);
+            }
+            MeshRenderer[] varMesh = varGo.GetComponentsInChildren<MeshRenderer>();
+            for (int i = 0; i < varMesh.Length; i++)
+            {
+                m_smallBallPosLst.Add(varMesh[i].transform.localPosition);
+            }
+            varGo.transform.position = view.transform.position;
+            varGo.transform.rotation = Quaternion.identity;
+            m_smallBallLst.Add(varGo);
+        }
+    }
+    //小球回收
+    public void RecycleSmallBall()
+    {
+        if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
+        {
+            for (int i = 0; i < m_smallBallLst.Count; i++)
+            {
+                PoolManager.Instance.ReturnObjectToPool(m_smallBallLst[i]);
+                MeshRenderer[] varMesh = m_smallBallLst[i].GetComponentsInChildren<MeshRenderer>();
+                for (int m = 0; m < varMesh.Length; m++)
+                {
+                    varMesh[m].transform.localPosition = m_smallBallPosLst[m];
+                }
+            }
+            m_smallBallLst.Clear();
+        }
+    }
     // 抬起回调
     void OnTouchUp()
     {
@@ -137,6 +186,7 @@ public class FruitView : MonoBehaviour
         }
         if(m_selectLst.Count > 0)
         {
+            BattleCtrl.instance.battleUI.PlayCameraLaugh();
             m_moveNum--;
             BattleCtrl.instance.battleUI.SetMoveNum(m_moveNum);
             if(m_moveNum <= 0)
@@ -152,6 +202,10 @@ public class FruitView : MonoBehaviour
         for (int i = 0; i < m_selectLst.Count; i++)
         {
             m_selectLst[i].SetFrag();
+            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
+            {
+                CreateSmallBall(m_selectLst[i]);
+            }
             //m_selectLst[i].SetLiquidEffect();
             //播放爆汁特效
             GameObject varEffectObj = null;
@@ -334,10 +388,10 @@ public class FruitView : MonoBehaviour
         }
         else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
         {
-            m_strawberryEffect.SetActive(false);
-            m_strawberryEffect.SetActive(varFootBallNum > 0 || varBasketBallNum > 0 || varVolleyBallNum > 0);
-            m_lemonEffect.SetActive(false);
-            m_orangeEffect.SetActive(false);
+            //m_strawberryEffect.SetActive(false);
+            //m_strawberryEffect.SetActive(varFootBallNum > 0 || varBasketBallNum > 0 || varVolleyBallNum > 0);
+            //m_lemonEffect.SetActive(false);
+            //m_orangeEffect.SetActive(false);
         }
         GameServices.timerServices.Push(this, 1.0f, delegate
         {

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

@@ -54,11 +54,13 @@ public class GlassView : MonoBehaviour
     public void SetSportNum(int num1, int num2, int num3)
     {
         m_sportNum += num1 + num2 + num3;
+        BattleCtrl.instance.levelManager.curLevel.progressFruitNum = (int)m_sportNum;
         if (m_sportNum >= GlobalConfig.ProgressFruitNumNeed)
         {
             m_sportNum = GlobalConfig.ProgressFruitNumNeed;
+            BattleCtrl.instance.levelManager.curLevel.CalculateStar();
+            BattleCtrl.instance.OnBattleWin();
         }
-        BattleCtrl.instance.levelManager.curLevel.progressFruitNum = (int)m_sportNum;
     }
     //水果数量
     public void SetFruitNum(int num1,int num2,int num3)
@@ -116,25 +118,25 @@ public class GlassView : MonoBehaviour
             varSize.y = m_strawberry.localScale.y;
             m_maskTrans.localScale = varSize;
         }
-        if (m_strawberryOffest < m_sportNum)
-        {
-            m_strawberry.gameObject.SetActive(true);
-            m_strawberryOffest += Time.deltaTime * m_speed;
+        //if (m_strawberryOffest < m_sportNum)
+        //{
+        //    m_strawberry.gameObject.SetActive(true);
+        //    m_strawberryOffest += Time.deltaTime * m_speed;
 
-            Vector3 varSize = m_strawberry.localScale;
-            varSize.y = m_strawberryOffest / (float)GlobalConfig.ProgressFruitNumNeed * 0.9f;
-            m_strawberry.localScale = varSize;
+        //    Vector3 varSize = m_strawberry.localScale;
+        //    varSize.y = m_strawberryOffest / (float)GlobalConfig.ProgressFruitNumNeed * 0.9f;
+        //    m_strawberry.localScale = varSize;
 
-            //草莓位置
-            Vector3 varPosStrawberry = m_strawberry.localPosition;
-            varPosStrawberry.y = m_startPos;
-            m_strawberry.localPosition = varPosStrawberry;
+        //    //草莓位置
+        //    Vector3 varPosStrawberry = m_strawberry.localPosition;
+        //    varPosStrawberry.y = m_startPos;
+        //    m_strawberry.localPosition = varPosStrawberry;
 
-            //遮罩大小
-            Vector3 varMaskSize = m_maskTrans.localScale;
-            varSize.y = m_strawberry.localScale.y;
-            m_maskTrans.localScale = varSize;
-        }
+        //    //遮罩大小
+        //    Vector3 varMaskSize = m_maskTrans.localScale;
+        //    varSize.y = m_strawberry.localScale.y;
+        //    m_maskTrans.localScale = varSize;
+        //}
         //if (m_strawberryOffest < m_strawberryNum)
         //{
         //    m_strawberry.gameObject.SetActive(true);

3D Fruit/Assets/#A2_Scripts/Camera/CameraRender.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CameraRender : MonoBehaviour
+{
+    public Animator m_boyAni;
+    public Animator m_girlAni;
+
+    //private string m_idle = "TK_idle1";
+    //private string m_laugh = "TK_laugh";
+    // Start is called before the first frame update
+    void Start()
+    {
+        PlayBoyAnim(0);
+        PlayGirlAnim(0);
+    }
+    void PlayBoyAnim(int value, string argName = "value")
+    {
+        if (m_boyAni && m_boyAni.GetInteger(argName) != value)
+        {
+            m_boyAni.SetInteger(argName, value);
+        }
+    }
+    void PlayGirlAnim(int value, string argName = "value")
+    {
+        if (m_girlAni && m_girlAni.GetInteger(argName) != value)
+        {
+            m_girlAni.SetInteger(argName, value);
+        }
+    }
+    //设置显示状态
+    public void ShowState()
+    {
+        PlayBoyAnim(0);
+        PlayGirlAnim(0);
+        if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
+        {
+            m_girlAni.gameObject.SetActive(true);
+            m_boyAni.gameObject.SetActive(false);
+        }
+        else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
+        {
+            m_girlAni.gameObject.SetActive(false);
+            m_boyAni.gameObject.SetActive(true);
+        }
+    }
+    //高兴
+    public void Laugh()
+    {
+        if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
+        {
+            PlayGirlAnim(3);
+        }
+        else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
+        {
+            PlayBoyAnim(3);
+        }
+        Invoke("DelayIdle", 1.2f);
+    }
+    //延迟待机
+    void DelayIdle()
+    {
+        if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
+        {
+            PlayGirlAnim(0);
+        }
+        else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
+        {
+            PlayBoyAnim(0);
+        }
+    }
+}

3D Fruit/Assets/#A2_Scripts/Camera/CameraRender.cs.meta

+fileFormatVersion: 2
+guid: de1ab4ceff1adb94393c1f5a2ba46d55
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A2_Scripts/Level/SelectLevelCtrl.cs

@@ -8,7 +8,8 @@ public class SelectLevelCtrl : MonoBehaviour
 {
     public Animator m_boyAni;
     public Animator m_girlAni;
-    public GameObject m_effectObj;
+    public GameObject m_fruitEffectObj;
+    public GameObject m_sportEffectObj;
 
     private Transform m_boyTrans;
     private Vector3 m_boyStartPos;
@@ -18,9 +19,9 @@ public class SelectLevelCtrl : MonoBehaviour
     private Vector3 m_girlStartPos;
     private Quaternion m_girlStartRotation;
 
-    private string m_idle1 = "TK_idle1";
-    private string m_idle3 = "TK_idle3";
-    private string m_walk = "TK_walk1";
+    //private string m_idle1 = "TK_idle1";
+    //private string m_idle3 = "TK_idle3";
+    //private string m_walk = "TK_walk1";
 
     private Sequence m_sq;
     public Action onMoveFinish;
@@ -31,8 +32,8 @@ public class SelectLevelCtrl : MonoBehaviour
         m_boyTrans = m_boyAni.transform;
         m_boyStartPos = m_boyTrans.position;
         m_boyStartRotation = m_boyTrans.rotation;
-        m_boyAni.Play(m_idle1);
-        m_girlAni.Play(m_idle3);
+        PlayBoyAnim(0);
+        PlayGirlAnim(1);
 
         m_girlTrans = m_girlAni.transform;
         m_girlStartPos = m_girlTrans.position;
@@ -40,26 +41,41 @@ public class SelectLevelCtrl : MonoBehaviour
 
         BattleCtrl.instance.battleUI.onNextBtn += NextStart;
     }
+    void PlayBoyAnim(int value, string argName = "value")
+    {
+        if (m_boyAni && m_boyAni.GetInteger(argName) != value)
+        {
+            m_boyAni.SetInteger(argName, value);
+        }
+    }
+    void PlayGirlAnim(int value, string argName = "value")
+    {
+        if (m_girlAni && m_girlAni.GetInteger(argName) != value)
+        {
+            m_girlAni.SetInteger(argName, value);
+        }
+    }
     void NextStart()
     {
-        m_effectObj.SetActive(false);
         if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
         {
             m_girlTrans.DORotateQuaternion(Quaternion.Euler(0, 90, 0), 0.5f).onComplete = delegate () {
                 StartMove();
             };
+            m_fruitEffectObj.SetActive(false);
         }
         else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
         {
             m_boyTrans.DORotateQuaternion(Quaternion.Euler(0, 90, 0), 0.5f).onComplete = delegate () {
                 StartMove();
             };
+            m_sportEffectObj.SetActive(false);
         }
     }
     void StartMove()
     {
-        m_girlAni.Play(m_walk);
-        m_boyAni.Play(m_walk);
+        PlayBoyAnim(2);
+        PlayGirlAnim(2);
         if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
         {
             m_sq = DOTween.Sequence();
@@ -78,15 +94,15 @@ public class SelectLevelCtrl : MonoBehaviour
     //走完后
     void MoveFinish()
     {
-        m_effectObj.SetActive(true);
         if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
         {
-            m_boyAni.Play(m_idle3);
-            
+            m_sportEffectObj.SetActive(true);
+            PlayBoyAnim(1);
         }
         else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
         {
-            m_girlAni.Play(m_idle3);
+            m_fruitEffectObj.SetActive(true);
+            PlayGirlAnim(1);
         }
         onMoveFinish?.Invoke();
     }
@@ -99,8 +115,8 @@ public class SelectLevelCtrl : MonoBehaviour
             m_boyTrans.rotation = m_boyStartRotation;
             m_girlTrans.position = m_girlStartPos;
             m_girlTrans.rotation = m_girlStartRotation;
-            m_boyAni.Play(m_idle1);
-            m_girlAni.Play(m_idle3);
+            PlayBoyAnim(0);
+            PlayGirlAnim(1);
         }
         else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
         {
@@ -108,8 +124,8 @@ public class SelectLevelCtrl : MonoBehaviour
             m_boyTrans.rotation = m_girlStartRotation;
             m_girlTrans.position = m_boyStartPos;
             m_girlTrans.rotation = m_boyStartRotation;
-            m_boyAni.Play(m_idle3);
-            m_girlAni.Play(m_idle1);
+            PlayBoyAnim(1);
+            PlayGirlAnim(0);
         }
     }
     private void OnDestroy()

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

@@ -36,6 +36,14 @@ public class CacheManager : MonoBehaviour
     private GameObject m_LemonDropEffect;//柠檬流体特效
     [SerializeField]
     private GameObject m_OrangeDropEffect;//橙子流体特效
+    [SerializeField]
+    private GameObject m_PlayerCameraRenderObj;//角色相机渲染
+    [SerializeField]
+    private GameObject m_SmallBasketBallObj;//小篮球
+    [SerializeField]
+    private GameObject m_SmallFootBallObj;//小足球
+    [SerializeField]
+    private GameObject m_SmallVolleyBallObj;//小排球
     public GameObject lineObj => m_lineObj;
     public GameObject LemonObj => m_LemonObj;
     public GameObject OrangeObj => m_OrangeObj;
@@ -52,6 +60,10 @@ public class CacheManager : MonoBehaviour
     public GameObject StarwberryDropEffect => m_StarwberryDropEffect;
     public GameObject LemonDropEffect => m_LemonDropEffect;
     public GameObject OrangeDropEffect => m_OrangeDropEffect;
+    public GameObject PlayerCameraRenderObj => m_PlayerCameraRenderObj;
+    public GameObject SmallBasketBallObj => m_SmallBasketBallObj;
+    public GameObject SmallFootBallObj => m_SmallFootBallObj;
+    public GameObject SmallVolleyBallObj => m_SmallVolleyBallObj;
     public static CacheManager Instance = null;
     void Awake()
     {

3D Fruit/Assets/#A2_Scripts/Services/GlobalConfig.cs

@@ -45,12 +45,26 @@ public class GlobalConfig
     public static int ProgressComboNeed = 3;
     public static int ProgressFruitNumNeed = 10;
 
+    //动画
+    public static int Ani_Idle1 = 0;
+    public static int Ani_Idle3 = 1;
+    public static int Ani_Walk = 2;
+    public static int Ani_Laugh = 3;
+
     //设置水果随机数
     public static void SetFruitRandomNum()
     {
         StrawberryRandomNum = Random.Range(5, 16);
         LemonRandomNum = Random.Range(5, 16);
         OrangeRandomNum = Random.Range(5, 16);
+        if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
+        {
+            ProgressFruitNumNeed = 10;
+        }
+        else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
+        {
+            ProgressFruitNumNeed = 20;
+        }
     }
     //通过当前关卡返回总的数量
     public static int TotalNum()
@@ -190,11 +204,11 @@ public class GlobalConfig
         {
             int varRand = Random.Range(0, 4);
             GameObject varObj = null;
-            if (varRand == 3)
-            {
-                varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.FootBallObj);
-            }
-            else
+            //if (varRand == 3)
+            //{
+            //    varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.FootBallObj);
+            //}
+            //else
             {
                 varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
             }
@@ -206,11 +220,11 @@ public class GlobalConfig
         {
             int varRand = Random.Range(0, 4);
             GameObject varObj = null;
-            if (varRand == 3)
-            {
-                varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj);
-            }
-            else
+            //if (varRand == 3)
+            //{
+            //    varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj);
+            //}
+            //else
             {
                 varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.LemonObj);
             }
@@ -222,11 +236,11 @@ public class GlobalConfig
         {
             int varRand = Random.Range(0, 4);
             GameObject varObj = null;
-            if (varRand == 3)
-            {
-                varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.VolleyBallObj);
-            }
-            else
+            //if (varRand == 3)
+            //{
+            //    varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.VolleyBallObj);
+            //}
+            //else
             {
                 varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeObj);
             }
@@ -246,11 +260,11 @@ public class GlobalConfig
         {
             int varRand = Random.Range(0, 4);
             GameObject varObj = null;
-            if (varRand == 3)
-            {
-                varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
-            }
-            else
+            //if (varRand == 3)
+            //{
+            //    varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
+            //}
+            //else
             {
                 varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.FootBallObj);
             }
@@ -262,11 +276,11 @@ public class GlobalConfig
         {
             int varRand = Random.Range(0, 4);
             GameObject varObj = null;
-            if (varRand == 3)
-            {
-                varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.LemonObj);
-            }
-            else
+            //if (varRand == 3)
+            //{
+            //    varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.LemonObj);
+            //}
+            //else
             {
                 varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj);
             }
@@ -278,11 +292,11 @@ public class GlobalConfig
         {
             int varRand = Random.Range(0, 4);
             GameObject varObj = null;
-            if (varRand == 3)
-            {
-                varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeObj);
-            }
-            else
+            //if (varRand == 3)
+            //{
+            //    varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeObj);
+            //}
+            //else
             {
                 varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.VolleyBallObj);
             }
@@ -300,7 +314,7 @@ public class GlobalConfig
         float varZ = parent.localPosition.z;
         for (int i = 0; i < num; i++)
         {
-            int varRand = Random.Range(0, 9);
+            int varRand = Random.Range(0, 6);
             GameObject varObj = null;
             if (varRand >= 0 && varRand < 2)
             {
@@ -339,7 +353,7 @@ public class GlobalConfig
         float varZ = parent.localPosition.z;
         for (int i = 0; i < num; i++)
         {
-            int varRand = Random.Range(0, 9);
+            int varRand = Random.Range(0, 6);
             GameObject varObj = null;
             if (varRand >= 0 && varRand < 2)
             {

3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab

@@ -112,6 +112,124 @@ MonoBehaviour:
   m_imageLine: {fileID: 5802247626965266397}
   m_imageLineStart: {fileID: 1686706040}
   m_imageLineFinal: {fileID: 1695185051}
+--- !u!1 &358267859
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 358267860}
+  - component: {fileID: 358267863}
+  - component: {fileID: 358267862}
+  - component: {fileID: 358267861}
+  m_Layer: 5
+  m_Name: OkBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &358267860
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 358267859}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.7, y: 0.7, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6064464676328073067}
+  m_RootOrder: 20
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -230, y: 195}
+  m_SizeDelta: {x: 402, y: 183}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &358267863
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 358267859}
+  m_CullTransparentMesh: 0
+--- !u!114 &358267862
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 358267859}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 0c4236ca7190b1e4f8c9a156cd1bfd3f, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &358267861
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 358267859}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 358267862}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &583032563
 GameObject:
   m_ObjectHideFlags: 0
@@ -497,6 +615,77 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 01:00
+--- !u!1 &939118825
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 939118826}
+  - component: {fileID: 939118828}
+  - component: {fileID: 939118827}
+  m_Layer: 5
+  m_Name: RawImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &939118826
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 939118825}
+  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: 6064464676328073067}
+  m_RootOrder: 21
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -50, y: -50}
+  m_SizeDelta: {x: 200, y: 200}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &939118828
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 939118825}
+  m_CullTransparentMesh: 0
+--- !u!114 &939118827
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 939118825}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 8400000, guid: 6ecaf44a01dd17d4c8830d12a89e49e7, type: 2}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &1245888156
 GameObject:
   m_ObjectHideFlags: 0
@@ -846,7 +1035,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2041063828
 RectTransform:
   m_ObjectHideFlags: 0
@@ -11525,6 +11714,8 @@ RectTransform:
   - {fileID: 222345271}
   - {fileID: 1943817325600272766}
   - {fileID: 1703758830198460559}
+  - {fileID: 358267860}
+  - {fileID: 939118826}
   m_Father: {fileID: 6064464677632144690}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13651,6 +13842,9 @@ MonoBehaviour:
   m_fadeMaskImage: {fileID: 2919563273659343887}
   m_fruitTypeObj: {fileID: 6392981896808543426}
   m_SportTypeObj: {fileID: 315517067123174761}
+  m_okBtn: {fileID: 358267861}
+  m_fruitNeedDesText: {fileID: 115113365021055311}
+  m_playerRawImageObj: {fileID: 939118825}
 --- !u!114 &1995691973
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

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

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

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

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

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

3D Fruit/Assets/#A3_Prefabs/RenderTexture.meta

+fileFormatVersion: 2
+guid: 6e74d33ec745fd34dabe0303f21d3dcf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3D Fruit/Assets/#A3_Prefabs/RenderTexture/PlayerCamera.prefab.meta

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

3D Fruit/Assets/#A3_Prefabs/RenderTexture/PlayerRender.renderTexture.meta

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

3D Fruit/ProjectSettings/TagManager.asset

@@ -19,7 +19,7 @@ TagManager:
   - Lemon
   - Orange
   - Strawberry
-  - 
+  - SmallBall
   - 
   - 
   -