修改场景预制体

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

@@ -167,6 +167,7 @@ MonoBehaviour:
   levelPrefs:
   - {fileID: 8692181047053733938, guid: 90ed022fa9d48a64f910aad15b7faa2d, type: 3}
   - {fileID: 8692181047053733938, guid: f7454de7619e58043bd3aad03242010a, type: 3}
+  - {fileID: 9081069388829900105, guid: 50002a8d201ddd64bb5b240aa652c3fa, type: 3}
 --- !u!1 &543166196
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -489,6 +489,8 @@ public class BattleUI : MonoBehaviour
     {
         for (int i = 0; i < m_lineLst.Count; i++)
         {
+            //LineUI varLine = m_lineLst[i].GetComponent<LineUI>();
+            //varLine.RecycleLine();
             ReturnObjectToPool(m_lineLst[i]);
         }
         m_lineLst.Clear();

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

@@ -8,6 +8,10 @@ public class LineUI : MonoBehaviour
     public Image m_imageLine;//线
     public Image m_imageLineStart;
     public Image m_imageLineFinal;
+
+    private Stack<GameObject> m_objStack = new Stack<GameObject>();
+    private List<GameObject> m_objList = new List<GameObject>();
+    private List<GameObject> m_lineLst = new List<GameObject>();
     public void DrawLine(Vector3 startP, Vector3 finalP)
     {
         Vector3 varStart = startP;
@@ -33,5 +37,61 @@ public class LineUI : MonoBehaviour
         m_imageLine.rectTransform.sizeDelta = varSize;
         m_imageLineStart.transform.localPosition = varStart;
         m_imageLineFinal.transform.localPosition = varFinal;
+
+
+        //Vector3 varDir = (varFinal - varStart).normalized;
+        //int varIndex = 0;
+        //for(int i = 0;i<3;i++)
+        //{
+        //    varIndex++;
+        //    GameObject varGo = GetPoolObject();
+        //    varGo.transform.localPosition = varStart + varDir * varIndex * (HalfLength / 4.0f);
+        //    m_lineLst.Add(varGo);
+        //}
+    }
+    GameObject GetPoolObject()
+    {
+        GameObject varGo = null;
+        if (m_objStack.Count > 0)
+        {
+            varGo = m_objStack.Pop();
+        }
+        else
+        {
+            varGo = GameObject.Instantiate(m_imageLineStart.gameObject);
+            m_objList.Add(varGo);
+        }
+        varGo.SetActive(true);
+        varGo.transform.SetParent(m_imageLineStart.transform.parent);
+        varGo.transform.localRotation = Quaternion.identity;
+        varGo.transform.localScale = Vector3.one;
+        return varGo;
+    }
+    void ReturnObjectToPool(GameObject go)
+    {
+        if (go)
+        {
+            m_objStack.Push(go);
+            go.SetActive(false);
+        }
+    }
+    //回收
+    public void RecycleLine()
+    {
+        for (int i = 0; i < m_lineLst.Count; i++)
+        {
+            ReturnObjectToPool(m_lineLst[i]);
+        }
+        m_lineLst.Clear();
+    }
+    private void OnDestroy()
+    {
+        for (int i = 0; i < m_objList.Count; i++)
+        {
+            GameObject.Destroy(m_objList[i]);
+        }
+        m_objList.Clear();
+        m_objList = null;
+        m_objStack = null;
     }
 }

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

@@ -10,6 +10,7 @@ public class FruitView : MonoBehaviour
     public Transform m_fruitParent;
     public HighlightingEffect m_highLightEffect;
     public Transform m_cutTrans;//旋转叶片
+    public float m_cutSpeed = 3.0f;//旋转速度
     private List<FruitItemView> m_selectLst = new List<FruitItemView>();//选中的水果
     private int m_lineIndex = 0;//线段计数
     private FruitItemView m_curSelectItem;//当前选中的
@@ -484,7 +485,7 @@ public class FruitView : MonoBehaviour
     {
         if(m_cutTrans)
         {
-            m_cutTrans.Rotate(Vector3.up*10.0f, Space.World);
+            m_cutTrans.Rotate(transform.up* m_cutSpeed, Space.Self);
         }
     }
     void Clicked()

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

@@ -6413,7 +6413,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: '?'
+  m_Text: 3
 --- !u!1 &5494452178133196282
 GameObject:
   m_ObjectHideFlags: 0
@@ -12464,7 +12464,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -12481,7 +12481,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6064464677159922112}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
@@ -12535,7 +12535,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6064464677159922112}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
   m_Name: 

3D Fruit/Assets/#C3_Materials/ORANGE-YELLOW 9.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: ORANGE-YELLOW
+  m_Name: ORANGE-YELLOW 9
   m_Shader: {fileID: 4800000, guid: 4609c28b77ae6c04689a8ba2b2fccba7, type: 3}
   m_ShaderKeywords: _EMISSION
   m_LightmapFlags: 1

3D Fruit/Assets/#C3_Materials/ORANGE-YELLOW.mat

@@ -77,7 +77,7 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.078431375, g: 0.454902, b: 0.06666667, a: 1}
+    - _Color: {r: 0.57283944, g: 0.5754717, b: 0.5727572, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _HColor: {r: 1, g: 1, b: 1, a: 1}
     - _SColor: {r: 0.3, g: 0.3, b: 0.3, a: 1}

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

@@ -3894,7 +3894,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 0859238b238f0fc4fbf2d6101cc36052, type: 2}
+  - {fileID: 2100000, guid: c7d1ea752094af7449153d5406cdc49b, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -4205,7 +4205,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: c3c7b3b6511d28544950378a5154c3df, type: 2}
+  - {fileID: 2100000, guid: 12d6fa75c9d97a44abfca1e447745da1, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

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

@@ -244,7 +244,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: db2e5e4cbf6edbf429b9015527422efe, type: 2}
+  - {fileID: 2100000, guid: 08e4817eee81f9b4185e7073c365e3f9, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -4147,7 +4147,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 0859238b238f0fc4fbf2d6101cc36052, type: 2}
+  - {fileID: 2100000, guid: c7d1ea752094af7449153d5406cdc49b, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -4444,7 +4444,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: c3c7b3b6511d28544950378a5154c3df, type: 2}
+  - {fileID: 2100000, guid: 12d6fa75c9d97a44abfca1e447745da1, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

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

@@ -387,7 +387,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &4449370048320699955
 Transform:
   m_ObjectHideFlags: 0
@@ -396,8 +396,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2067696383928025953}
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.48, z: 0}
-  m_LocalScale: {x: 1, y: 0.3, z: 1}
+  m_LocalPosition: {x: 0, y: 0.28, z: 0}
+  m_LocalScale: {x: 1, y: 0, z: 1}
   m_Children: []
   m_Father: {fileID: 7709660244097471772}
   m_RootOrder: 3
@@ -428,7 +428,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: db2e5e4cbf6edbf429b9015527422efe, type: 2}
+  - {fileID: 2100000, guid: 08e4817eee81f9b4185e7073c365e3f9, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -2735,7 +2735,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_fruitView: {fileID: 6588424727091633392}
-  curLevelIndex: 0
+  curLevelIndex: 2
 --- !u!114 &6588424727091633392
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2753,7 +2753,7 @@ MonoBehaviour:
   m_animator: {fileID: 5267264344385226013}
   m_fruitParent: {fileID: 6546680321722540291}
   m_highLightEffect: {fileID: 2824403711518518685}
-  m_cutTrans: {fileID: 0}
+  m_cutTrans: {fileID: 3382262855920509023}
 --- !u!1 &2824403712881052794
 GameObject:
   m_ObjectHideFlags: 0
@@ -3466,7 +3466,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: c3c7b3b6511d28544950378a5154c3df, type: 2}
+  - {fileID: 2100000, guid: 12d6fa75c9d97a44abfca1e447745da1, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -3545,7 +3545,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 0859238b238f0fc4fbf2d6101cc36052, type: 2}
+  - {fileID: 2100000, guid: c7d1ea752094af7449153d5406cdc49b, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -4600,7 +4600,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_strawberry: {fileID: 2015856793505018083}
   m_lemon: {fileID: 5924633981957863974}
-  m_orange: {fileID: 0}
+  m_orange: {fileID: 4449370048320699955}
   m_effectPos: {fileID: 3204162930766364847}
 --- !u!1001 &2824403712545409636
 PrefabInstance:
@@ -4814,6 +4814,26 @@ PrefabInstance:
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 7bccce116c59aad4898e212f87bca71a, type: 2}
+    - target: {fileID: 4852936836333619661, guid: 6f80a585426cf8749b2ed31e61717f4e,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4852936836333619661, guid: 6f80a585426cf8749b2ed31e61717f4e,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4852936836333619661, guid: 6f80a585426cf8749b2ed31e61717f4e,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4852936836333619661, guid: 6f80a585426cf8749b2ed31e61717f4e,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6f80a585426cf8749b2ed31e61717f4e, type: 3}
 --- !u!4 &2941865115838349960 stripped
@@ -4822,6 +4842,12 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 7901898092506589586}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &3382262855920509023 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4852936836333619661, guid: 6f80a585426cf8749b2ed31e61717f4e,
+    type: 3}
+  m_PrefabInstance: {fileID: 7901898092506589586}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &9066602223826847829
 PrefabInstance:
   m_ObjectHideFlags: 0

3D Fruit/ProjectSettings/ProjectSettings.asset

@@ -641,7 +641,7 @@ PlayerSettings:
     14: CROSS_PLATFORM_INPUT;MOBILE_INPUT
   platformArchitecture: {}
   scriptingBackend:
-    Android: 0
+    Android: 1
   il2cppCompilerConfiguration: {}
   managedStrippingLevel: {}
   incrementalIl2cppBuild: {}