Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/Prefabs/charatar/enemy/wood_min.prefab

@@ -330,7 +330,7 @@ MonoBehaviour:
   id: 0
   Name: 
   camp: 1
-  hp: 100
+  hp: 50
   dieIndex: 1
   Hpfiil: {fileID: 1566038940701374259}
   HpfiilYello: {fileID: 605146830908541898}
@@ -432,6 +432,7 @@ MonoBehaviour:
   hitIndex: 2
   normalIndex: 0
   isHit: 0
+  Tags: 0
   enemyId: 
   moveSpeed: 2
   harmNumber: 0

meng_yao/Assets/Resources/A_Fight/XuanYun.prefab

@@ -27,8 +27,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4390725593481264501}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1.63, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}

meng_yao/Assets/Resources/animation/A_fightin/Ftest/xuanyun.png.meta

@@ -67,7 +67,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1

meng_yao/Assets/Scenes/New/Scene_map_1.unity

@@ -5872,8 +5872,8 @@ MonoBehaviour:
   Enemys: []
   Prefab: {fileID: 4703411402065954783, guid: aac4ad2c72526a54691494dd54e115a6, type: 3}
   SpawnLocation: {fileID: 734893407}
-  GenerationInterval: 5
-  GenerationIntervalOfOne: 1
+  GenerationInterval: 15
+  GenerationIntervalOfOne: 2
   GenerateQuantityMax: 20
   GenerateQuantity: 5
   deadNumber: 0

meng_yao/Assets/common

@@ -1 +1 @@
-Subproject commit 88af3457adafcf39247f083ac305476b7b83a6e3
+Subproject commit 271fc92a75d3d961e9ae602063e64234e006f119