Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/Scenes/cultivation_gem_island_slices.unity

@@ -7463,7 +7463,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 1
+  m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 6502a46c44125eb4bbfa0d11835adc2c, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

meng_yao/Assets/script/Manager/AnimatoinManager.cs

@@ -6,7 +6,7 @@ public class AnimatoinManager : MonoBehaviour
 {
     
     public float time=0f;
-    public List<GameObject> fi = new List<GameObject>();
+   
    
 
     // Start is called before the first frame update