Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo

onepiece_demo_arena
wangzhenxing 2023-12-08 21:58:07 +08:00
commit 593dadb2b1
1 changed files with 7 additions and 7 deletions

View File

@ -1075,7 +1075,7 @@ 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: -5.9, y: 3.7}
m_AnchoredPosition: {x: -4, y: 3.7}
m_SizeDelta: {x: 183, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1356283803
@ -1106,7 +1106,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 71dbe391285f107449dbd36733c5a946, type: 3}
m_Sprite: {fileID: 21300000, guid: c4212d38b21abbc41aa781ad3a37c0c2, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1466,7 +1466,7 @@ 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: -7.4, y: 4.4}
m_AnchoredPosition: {x: 0, y: 4.4}
m_SizeDelta: {x: 175, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1619859928
@ -1497,7 +1497,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 47476438ae3b74d48be4f6d4fb0c3cd5, type: 3}
m_Sprite: {fileID: 21300000, guid: cdf535a6afebeb9418ebb4ad424ecb52, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1540,7 +1540,7 @@ 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: -12.2, y: 4.45}
m_AnchoredPosition: {x: 0, y: 4.45}
m_SizeDelta: {x: 159, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1653346925
@ -1571,7 +1571,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 1d0319f07020b7446a88cc1fea1a69fc, type: 3}
m_Sprite: {fileID: 21300000, guid: 366218bc204aaa9438b48d4b1e3a6eda, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -6480,7 +6480,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: a6e5c1ff36c0f484bac142a8a5122395, type: 3}
m_Sprite: {fileID: 21300000, guid: 87c237eaa6035604294adb12e4159e19, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1