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

Assets/prefabs/ui/battle/battle_result_ui.prefab

@@ -372,10 +372,7 @@ RectTransform:
   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_Children: []
-  - {fileID: 4348915206582156153}
-  - {fileID: 1464885495388000228}
-  - {fileID: 8367408702786063450}
   m_Father: {fileID: 4843536593014367069}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6529,18 +6526,6 @@ MonoBehaviour:
     hashName: 1383773111
     objectType: 0
     gameObject: {fileID: 7774979664385344905}
-  - name: battle_result_ui.arena_node.spine_root.vfx_ui_arena_dan_1
-    hashName: 1363627474
-    objectType: 2
-    gameObject: {fileID: 4348915206582156152}
-  - name: battle_result_ui.arena_node.spine_root.vfx_ui_arena_dan_2
-    hashName: 1363627475
-    objectType: 2
-    gameObject: {fileID: 2136122399068717236}
-  - name: battle_result_ui.arena_node.spine_root.vfx_ui_arena_dan_3
-    hashName: 1363627476
-    objectType: 2
-    gameObject: {fileID: 8367408702786063451}
 --- !u!1 &8897498284405031625
 GameObject:
   m_ObjectHideFlags: 0
@@ -6821,220 +6806,6 @@ MonoBehaviour:
   m_FillDirection: 0
   m_Value: 1
   m_FillCenter: 1
---- !u!1001 &958279093009513355
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 9129893529080302107}
-    m_Modifications:
-    - target: {fileID: 1218634655091981119, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_Name
-      value: vfx_ui_arena_dan_2
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
---- !u!1 &2136122399068717236 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1218634655091981119, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-  m_PrefabInstance: {fileID: 958279093009513355}
-  m_PrefabAsset: {fileID: 0}
---- !u!224 &1464885495388000228 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1808244018731725935, guid: 8be02ef8fb70b89498be5fa9e76a78b1, type: 3}
-  m_PrefabInstance: {fileID: 958279093009513355}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &2666624981054237686
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 9129893529080302107}
-    m_Modifications:
-    - target: {fileID: 1827249907265966222, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_Name
-      value: vfx_ui_arena_dan_1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
---- !u!1 &4348915206582156152 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1827249907265966222, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-  m_PrefabInstance: {fileID: 2666624981054237686}
-  m_PrefabAsset: {fileID: 0}
---- !u!224 &4348915206582156153 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1827249907265966223, guid: 6cca45bd7029f7349b7983b6def8ae82, type: 3}
-  m_PrefabInstance: {fileID: 2666624981054237686}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2753676652289451360
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7146,113 +6917,6 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
   m_PrefabInstance: {fileID: 2753676652289451360}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &3288579358665657305
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 9129893529080302107}
-    m_Modifications:
-    - target: {fileID: 6466149135612479362, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_Name
-      value: vfx_ui_arena_dan_3
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
---- !u!1 &8367408702786063451 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6466149135612479362, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-  m_PrefabInstance: {fileID: 3288579358665657305}
-  m_PrefabAsset: {fileID: 0}
---- !u!224 &8367408702786063450 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6466149135612479363, guid: a659ce02ab9b9a04ebe27ad2558374e9, type: 3}
-  m_PrefabInstance: {fileID: 3288579358665657305}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4837857829111055852
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7358,16 +7022,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
---- !u!224 &7770004333418327666 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
-  m_PrefabInstance: {fileID: 4837857829111055852}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6379174579643197588 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
   m_PrefabInstance: {fileID: 4837857829111055852}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &7770004333418327666 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+  m_PrefabInstance: {fileID: 4837857829111055852}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8282062698798163606
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7604,16 +7268,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
---- !u!1 &2842982108316905967 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
-  m_PrefabInstance: {fileID: 8813075811754304613}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &6478638276743894065 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
   m_PrefabInstance: {fileID: 8813075811754304613}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2842982108316905967 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
+  m_PrefabInstance: {fileID: 8813075811754304613}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &4162544796182612831
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/prefabs/ui/battle/battle_ui.prefab

@@ -18677,6 +18677,10 @@ MonoBehaviour:
     hashName: 218945501
     objectType: 0
     gameObject: {fileID: 4530455641319431921}
+  - name: battle_ui.top_node.combo.bg
+    hashName: 2859341300
+    objectType: 0
+    gameObject: {fileID: 3944962995324791259}
 --- !u!114 &305814484176852896
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/prefabs/ui/battle/battle_ui_pvp.prefab

@@ -17959,6 +17959,10 @@ MonoBehaviour:
     hashName: 3336358960
     objectType: 0
     gameObject: {fileID: 5467121070129537994}
+  - name: battle_ui_pvp.battle_root.combo.bg
+    hashName: 3194931570
+    objectType: 0
+    gameObject: {fileID: 3944962995324791259}
 --- !u!114 &305814484176852896
 MonoBehaviour:
   m_ObjectHideFlags: 0