Merge branch 'dev_hero' into dev_hero_2

Assets/arts/effects/material/ui/vfx_c1_chouka_bg/vfx_c1_chouka_bg_01.mat

@@ -9,8 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: vfx_c1_chouka_bg_01
   m_Shader: {fileID: 4800000, guid: 407dcf89d6aad74448e19b296db80487, type: 3}
-  m_ValidKeywords:
+  m_ValidKeywords: []
-  - _USE_UV_NOSIZE
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -70,7 +69,7 @@ Material:
         m_Scale: {x: 0.5, y: 1}
         m_Offset: {x: 0, y: 0}
     - _uv_nosize_tex:
-        m_Texture: {fileID: 2800000, guid: 06c28bb1d049d0443be1fab1dd86b2f1, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 0.5, y: 2}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
@@ -105,7 +104,7 @@ Material:
     - _tex_mask_rotate: 30
     - _tex_rotate: 41
     - _use_fnl: 0
-    - _use_uv_nosize: 1
+    - _use_uv_nosize: 0
     - _uv_nosize_strength: 0.05
     - _ztest_on: 4
     m_Colors:

Assets/arts/effects/material/ui/vfx_c1_chouka_bg/vfx_c1_chouka_bg_02.mat

@@ -9,8 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: vfx_c1_chouka_bg_02
   m_Shader: {fileID: 4800000, guid: 407dcf89d6aad74448e19b296db80487, type: 3}
-  m_ValidKeywords:
+  m_ValidKeywords: []
-  - _USE_UV_NOSIZE
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -70,7 +69,7 @@ Material:
         m_Scale: {x: 1, y: 2}
         m_Offset: {x: 0, y: 0}
     - _uv_nosize_tex:
-        m_Texture: {fileID: 2800000, guid: 06c28bb1d049d0443be1fab1dd86b2f1, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 0.5, y: 2}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
@@ -105,7 +104,7 @@ Material:
     - _tex_mask_rotate: 30
     - _tex_rotate: 18
     - _use_fnl: 0
-    - _use_uv_nosize: 1
+    - _use_uv_nosize: 0
     - _uv_nosize_strength: 0.05
     - _ztest_on: 4
     m_Colors:

Assets/prefabs/effects/ui/vfx_ui_hit_b02.prefab

@@ -674,7 +674,7 @@ ParticleSystem:
     donutRadius: 0.2
     m_Position: {x: 0, y: 0, z: 0}
     m_Rotation: {x: 0, y: 0, z: 0}
-    m_Scale: {x: 0, y: 25.5, z: 76.2}
+    m_Scale: {x: 0, y: 30, z: 85}
     placementMode: 0
     m_MeshMaterialIndex: 0
     m_MeshNormalOffset: 0
@@ -4880,7 +4880,7 @@ RectTransform:
   m_GameObject: {fileID: 3091301604240976874}
   m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6635725003939530068}
@@ -9791,7 +9791,7 @@ RectTransform:
   m_GameObject: {fileID: 5325603546219900009}
   m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6635725003939530068}

Assets/prefabs/effects/ui/vfx_ui_hit_b03.prefab

@@ -27,7 +27,7 @@ RectTransform:
   m_GameObject: {fileID: 3549986462628309871}
   m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6635725003939530068}
@@ -4938,7 +4938,7 @@ RectTransform:
   m_GameObject: {fileID: 4936593373531303197}
   m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6635725003939530068}
@@ -9848,7 +9848,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5240607526154030365}
   m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -9857,7 +9857,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -32.8, y: 8.899961}
+  m_AnchoredPosition: {x: -74.7, y: 8.899961}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!198 &2872330365988761212
@@ -10496,7 +10496,7 @@ ParticleSystem:
     donutRadius: 0.2
     m_Position: {x: 0, y: 0, z: 0}
     m_Rotation: {x: 0, y: 0, z: 0}
-    m_Scale: {x: 0, y: 17.1, z: 25.7}
+    m_Scale: {x: 0, y: 25, z: 35}
     placementMode: 0
     m_MeshMaterialIndex: 0
     m_MeshNormalOffset: 0
@@ -19744,7 +19744,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 1, g: 0.5391791, b: 0.11792451, a: 1}
+      maxColor: {r: 1, g: 0.45869142, b: 0.1745283, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -20190,7 +20190,7 @@ ParticleSystem:
     donutRadius: 0.2
     m_Position: {x: 0, y: 0, z: 0}
     m_Rotation: {x: 0, y: 0, z: 0}
-    m_Scale: {x: 0, y: 30.69, z: 113.4}
+    m_Scale: {x: 0, y: 40, z: 130}
     placementMode: 0
     m_MeshMaterialIndex: 0
     m_MeshNormalOffset: 0