Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev

# Conflicts: # Assets/prefabs/ui/battle/battle_ui.prefab
2023-04-21 16:11:36 +08:00 · 2023-04-21 16:11:36 +08:00 · 9a5c8c38f9
commit 9a5c8c38f9
parent ff1da8c1b6 8ac46b5a63
24 changed files with 29528 additions and 299 deletions
--- a/Assets/arts/effects/material/battle/sfx_m10008_b01.meta
+++ b/Assets/arts/effects/material/battle/sfx_m10008_b01.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c2866cb70fa621a43b711a46869ccbca
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/effects/material/battle/sfx_m10008_b01/sfx_m10008_b01_01.mat
+++ b/Assets/arts/effects/material/battle/sfx_m10008_b01/sfx_m10008_b01_01.mat
@ -0,0 +1,106 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: sfx_m10008_b01_01
+  m_Shader: {fileID: 4800000, guid: 35c4043aca0de3b4ebc13b2a4b500c5b, type: 3}
+  m_ShaderKeywords: _MASK_UV_SPEED_CUSTOM
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _diss_tex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _tex:
+        m_Texture: {fileID: 2800000, guid: 9903c8552855f4240984f5dd7f34f848, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _tex_mask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _CULLENUM: 0
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _MASK_UV_SPEED_CUSTOM: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - _diss_alpha_clip: 0
+    - _diss_clip: 0.2
+    - _diss_edge_smoothness: 1.8
+    - _diss_edge_width: 0.01
+    - _diss_smoothness: 0.01
+    - _diss_tex_rotate: 0
+    - _tex_mask_rotate: 0
+    - _tex_rotate: 0
+    - _ztest_on: 4
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1}
+    - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0}
+    - _tex_color: {r: 0.8603976, g: 0.8603976, b: 0.8603976, a: 1}
+    - _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0}
+    - _tex_uv_speed: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
--- a/Assets/arts/effects/material/battle/sfx_m10008_b01/sfx_m10008_b01_01.mat.meta
+++ b/Assets/arts/effects/material/battle/sfx_m10008_b01/sfx_m10008_b01_01.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d39f336b2d8f0e245bcd5eff8c03fe5e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/effects/material/battle/sfx_m10008_b01/sfx_m10008_b01_02.mat
+++ b/Assets/arts/effects/material/battle/sfx_m10008_b01/sfx_m10008_b01_02.mat
@ -0,0 +1,106 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: sfx_m10008_b01_02
+  m_Shader: {fileID: 4800000, guid: 35c4043aca0de3b4ebc13b2a4b500c5b, type: 3}
+  m_ShaderKeywords: _MASK_UV_SPEED_CUSTOM
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _diss_tex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _tex:
+        m_Texture: {fileID: 2800000, guid: a878fed553c821f4984ad8df767c09a8, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _tex_mask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _CULLENUM: 0
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _MASK_UV_SPEED_CUSTOM: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - _diss_alpha_clip: 0
+    - _diss_clip: 0.2
+    - _diss_edge_smoothness: 1.8
+    - _diss_edge_width: 0.01
+    - _diss_smoothness: 0.01
+    - _diss_tex_rotate: 0
+    - _tex_mask_rotate: 0
+    - _tex_rotate: 0
+    - _ztest_on: 4
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1}
+    - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0}
+    - _tex_color: {r: 3.4352942, g: 3.4352942, b: 3.4352942, a: 1}
+    - _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0}
+    - _tex_uv_speed: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
--- a/Assets/arts/effects/material/battle/sfx_m10008_b01/sfx_m10008_b01_02.mat.meta
+++ b/Assets/arts/effects/material/battle/sfx_m10008_b01/sfx_m10008_b01_02.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7e45b08fb2584224d97ea34d95d4fff0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/lua/app/bf/unity/character_spine_object.lua.bytes
+++ b/Assets/lua/app/bf/unity/character_spine_object.lua.bytes
--- a/Assets/lua/app/global/global_const.lua.bytes
+++ b/Assets/lua/app/global/global_const.lua.bytes
--- a/Assets/lua/app/module/battle/battle_const.lua.bytes
+++ b/Assets/lua/app/module/battle/battle_const.lua.bytes
--- a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
+++ b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
--- a/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
+++ b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
--- a/Assets/lua/app/module/battle/helper/battle_helper.lua.bytes
+++ b/Assets/lua/app/module/battle/helper/battle_helper.lua.bytes
--- a/Assets/lua/app/module/battle/helper/battle_pool.lua.bytes
+++ b/Assets/lua/app/module/battle/helper/battle_pool.lua.bytes
--- a/Assets/lua/app/module/battle/helper/battle_pool.lua.bytes.meta
+++ b/Assets/lua/app/module/battle/helper/battle_pool.lua.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 11e6605d14a221a4782f61c93a03010e
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/lua/app/ui/battle/battle_ui.lua.bytes
+++ b/Assets/lua/app/ui/battle/battle_ui.lua.bytes
--- a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
+++ b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
--- a/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes
+++ b/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes
--- a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes
+++ b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes
--- a/Assets/prefabs/effects/battle/sfx_m10008_b01.prefab
+++ b/Assets/prefabs/effects/battle/sfx_m10008_b01.prefab
--- a/Assets/prefabs/effects/battle/sfx_m10008_b01.prefab.meta
+++ b/Assets/prefabs/effects/battle/sfx_m10008_b01.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b1255c716876b1444ad9f7c0bcea7a9f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/prefabs/effects/battle/sfx_m10008_b02.prefab
+++ b/Assets/prefabs/effects/battle/sfx_m10008_b02.prefab
--- a/Assets/prefabs/effects/battle/sfx_m10008_b02.prefab.meta
+++ b/Assets/prefabs/effects/battle/sfx_m10008_b02.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2c33ef52d2a5a2b4eaaad41220a73399
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/prefabs/effects/battle/sfx_m10008_b03.prefab
+++ b/Assets/prefabs/effects/battle/sfx_m10008_b03.prefab
--- a/Assets/prefabs/effects/battle/sfx_m10008_b03.prefab.meta
+++ b/Assets/prefabs/effects/battle/sfx_m10008_b03.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 63928b02e8ef82343b284b1d931a6cd4
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/prefabs/ui/battle/battle_ui.prefab
+++ b/Assets/prefabs/ui/battle/battle_ui.prefab
@ -771,7 +771,7 @@ RectTransform:
  - {fileID: 4106454344608963245}
  - {fileID: 1603915954017502330}
  m_Father: {fileID: 4165930251451731960}
-  m_RootOrder: 4
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
@ -1151,81 +1151,6 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &1001504556733480449
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7508170498438163181}
-  - component: {fileID: 4314803600049771290}
-  - component: {fileID: 6733759007162376368}
-  m_Layer: 5
-  m_Name: finger
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &7508170498438163181
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1001504556733480449}
-  m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 597725840717592184}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 68, y: 103}
-  m_Pivot: {x: 0.5000001, y: 0.061543096}
--- !u!222 &4314803600049771290
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1001504556733480449}
-  m_CullTransparentMesh: 1
--- !u!114 &6733759007162376368
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1001504556733480449}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 76b4356e609315a44bfdb2b26213f46b, 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!1 &1039420649164977667
 GameObject:
  m_ObjectHideFlags: 0
@ -1256,7 +1181,7 @@ RectTransform:
  - {fileID: 7945390112548214915}
  - {fileID: 5938755434983395188}
  m_Father: {fileID: 4165930251451731960}
-  m_RootOrder: 5
+  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -1350,87 +1275,6 @@ MonoBehaviour:
    hashName: 4168273501
    objectType: 0
    gameObject: {fileID: 7228068279838593592}
--- !u!1 &1210098518021164784
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 597725840717592184}
-  - component: {fileID: 8113315867684281958}
-  - component: {fileID: 5454337920962585083}
-  - component: {fileID: 5137085230414783640}
-  m_Layer: 5
-  m_Name: board_node
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &597725840717592184
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1210098518021164784}
-  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:
-  - {fileID: 7508170498438163181}
-  m_Father: {fileID: 1895901621511757752}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -206}
-  m_SizeDelta: {x: 702, y: 702}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8113315867684281958
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1210098518021164784}
-  m_CullTransparentMesh: 1
--- !u!223 &5454337920962585083
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1210098518021164784}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
--- !u!114 &5137085230414783640
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1210098518021164784}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  GroupOrder: 50
 --- !u!1 &1263933761723824088
 GameObject:
  m_ObjectHideFlags: 0
@ -3776,126 +3620,6 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  IsShowClickAnimation: 1
--- !u!1 &3960366305078432212
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1895901621511757752}
-  - component: {fileID: 8577149427972865840}
-  - component: {fileID: 7528357276001355758}
-  - component: {fileID: 5580711327079399233}
-  - component: {fileID: 4000650224686870579}
-  - component: {fileID: 628544781970665620}
-  m_Layer: 5
-  m_Name: tutorial_node
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1895901621511757752
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3960366305078432212}
-  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:
-  - {fileID: 597725840717592184}
-  m_Father: {fileID: 4165930251451731960}
-  m_RootOrder: 7
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &8577149427972865840
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3960366305078432212}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
--- !u!222 &7528357276001355758
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3960366305078432212}
-  m_CullTransparentMesh: 1
--- !u!114 &5580711327079399233
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3960366305078432212}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
--- !u!114 &4000650224686870579
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3960366305078432212}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  IsShowClickAnimation: 0
--- !u!114 &628544781970665620
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3960366305078432212}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
 --- !u!1 &3982218014616016904
 GameObject:
  m_ObjectHideFlags: 0
@ -5385,6 +5109,41 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Padding: {x: 0, y: 0, z: 0, w: 0}
  m_Softness: {x: 0, y: 0}
+--- !u!1 &5506336141550111868
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8767600639872220622}
+  m_Layer: 5
+  m_Name: batttle_fx_node
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8767600639872220622
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5506336141550111868}
+  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: 4165930251451731960}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 950}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5608342323733900253
 GameObject:
  m_ObjectHideFlags: 0
@ -8342,7 +8101,7 @@ RectTransform:
  - {fileID: 4292633816534545540}
  - {fileID: 6497301874867098174}
  m_Father: {fileID: 4165930251451731960}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
@ -9025,11 +8784,11 @@ RectTransform:
  - {fileID: 5198724544769838051}
  - {fileID: 766509631108997893}
  - {fileID: 5146938743224756479}
+  - {fileID: 8767600639872220622}
  - {fileID: 8367488913663849825}
  - {fileID: 1493758059695593667}
  - {fileID: 2868547218605158834}
  - {fileID: 8052032989142352168}
-  - {fileID: 1895901621511757752}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -9329,14 +9088,10 @@ MonoBehaviour:
    hashName: 4215141983
    objectType: 1
    gameObject: {fileID: 5822956687597775327}
-  - name: battle_ui.tutorial_node
-    hashName: 958166288
+  - name: battle_ui.batttle_fx_node
+    hashName: 659684139
    objectType: 0
-    gameObject: {fileID: 3960366305078432212}
-  - name: battle_ui.tutorial_node.board_node.finger
-    hashName: 235219870
-    objectType: 0
-    gameObject: {fileID: 1001504556733480449}
+    gameObject: {fileID: 5506336141550111868}
 --- !u!114 &305814484176852896
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -9354,7 +9109,6 @@ MonoBehaviour:
  - {fileID: 3446100497241661549}
  - {fileID: 2127627616384160167}
  - {fileID: 7449896261673731027}
-  - {fileID: 5137085230414783640}
  NotchScreenNodeList: []
 --- !u!1 &8943237623203786609
 GameObject:
@ -9577,7 +9331,7 @@ RectTransform:
  - {fileID: 3542903639894422700}
  - {fileID: 2367957692945644157}
  m_Father: {fileID: 4165930251451731960}
-  m_RootOrder: 6
+  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@ -9876,16 +9630,16 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
--- !u!1 &8568562378450594759 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 5351464385034910283}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &792115507450702866 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
  m_PrefabInstance: {fileID: 5351464385034910283}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &8568562378450594759 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 5351464385034910283}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5688246229370211124
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -10178,16 +9932,16 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
--- !u!1 &7746559084762877130 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 6281625263577488710}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1699757838083181343 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
  m_PrefabInstance: {fileID: 6281625263577488710}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &7746559084762877130 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 6281625263577488710}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7292576075314493597
 PrefabInstance:
  m_ObjectHideFlags: 0