Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

@@ -118,7 +118,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 189.53296, y: -49.37755}
-  m_SizeDelta: {x: 0, y: 96.45}
+  m_SizeDelta: {x: 108, y: 96.45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5304083428607473890
 CanvasRenderer:

Assets/Res/UI/DivineSence/EventTipsPanel.prefab

@@ -576,6 +576,7 @@ GameObject:
   - component: {fileID: 5421788321130738453}
   - component: {fileID: 2202633219151363222}
   - component: {fileID: 2163618872983960680}
+  - component: {fileID: 6742206410792791432}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -645,6 +646,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u83B7\u53D6\u9014\u5F84"
+--- !u!114 &6742206410792791432
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4104686186366231313}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10258
 --- !u!1 &4622716660120266263
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/ItemDetailsPanel/ItemSourcePanel.prefab

@@ -656,6 +656,7 @@ GameObject:
   - component: {fileID: 5421788321130738453}
   - component: {fileID: 2202633219151363222}
   - component: {fileID: 2163618872983960680}
+  - component: {fileID: 1914350867188905750}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -725,6 +726,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u83B7\u53D6\u9014\u5F84"
+--- !u!114 &1914350867188905750
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4104686186366231313}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10258
 --- !u!1 &4622716660120266263
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/XianTuLogPanel/EventLogMessageWidget.prefab

@@ -144,7 +144,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 373.62665, y: -0}
+  m_AnchoredPosition: {x: 373.62665, y: -43}
   m_SizeDelta: {x: 635.2533, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1334102890352701418

Assets/Res/UI/XianTuLogPanel/EventLogTitleWidget.prefab

@@ -103,7 +103,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 319.2211, y: -35.9431}
-  m_SizeDelta: {x: 187, y: 55.0878}
+  m_SizeDelta: {x: 0, y: 55.0878}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2341308512790474187
 CanvasRenderer: