fix after merge

Assets/PerfectWorld/Prefab/UI/Canvas_Skill.prefab

@@ -9,6 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1608209508545832950}
+  - component: {fileID: 7339434961787820866}
   m_Layer: 5
   m_Name: CDlgQuickBar
   m_TagString: Untagged
@@ -36,6 +37,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7339434961787820866
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 926956983674453509}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1257634218941f746ada30ba51402249, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_aSkillImage:
+  - {fileID: 5871903045205723058}
+  m_aSkillButton:
+  - {fileID: 8901855160472089467}
+  AUIImagePictureList:
+  - {fileID: 473551792621656190}
 --- !u!1 &2176128486288214388
 GameObject:
   m_ObjectHideFlags: 0
@@ -45,6 +64,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7646065705685923996}
+  - component: {fileID: 473551792621656190}
   - component: {fileID: 3119408872112532259}
   - component: {fileID: 805536043562757986}
   - component: {fileID: 8901855160472089467}
@@ -72,9 +92,21 @@ RectTransform:
   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: 314, y: -427}
+  m_AnchoredPosition: {x: 318, y: -235}
   m_SizeDelta: {x: 160, y: 155.1223}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &473551792621656190
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2176128486288214388}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67fd391520cbfd44f84a1c6bb57673c0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!222 &3119408872112532259
 CanvasRenderer:
   m_ObjectHideFlags: 0

Assets/Scenes/a61.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7d0fd6c4c20c35ec45df119ae8a39315d7b1d7cadb09a0c7fbbc42fc964d253
-size 530350786
+oid sha256:2d439a088ea594e078f058e7b9a5b7cf5abf5ece3d5dc5814297bd305cc271dc
+size 530355587