Skip to content

F
First_FKQCW
Commit 974f346c authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

修改场景代码

parent 58db5093
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 19 deletions
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ 974f346c
...@@ -7866,10 +7866,10 @@ RectTransform: ...@@ -7866,10 +7866,10 @@ RectTransform:
m_Father: {fileID: 300181109} m_Father: {fileID: 300181109}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 93.36, y: -45.84} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 126.72, y: 31.68} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &409306806 --- !u!114 &409306806
MonoBehaviour: MonoBehaviour:
...@@ -18196,13 +18196,8 @@ RectTransform: ...@@ -18196,13 +18196,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
<<<<<<< HEAD
m_AnchoredPosition: {x: -52, y: 4.9}
m_SizeDelta: {x: 143, y: 85}
=======
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 721, y: 714} m_SizeDelta: {x: 100, y: 100}
>>>>>>> 618344c (修改弹窗)
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &994295042 --- !u!114 &994295042
MonoBehaviour: MonoBehaviour:
...@@ -18223,11 +18218,7 @@ MonoBehaviour: ...@@ -18223,11 +18218,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
<<<<<<< HEAD m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 58bc6a8b3555b42fc9793e65d0a94420, type: 3}
=======
m_Sprite: {fileID: 21300000, guid: 758c629285ff1c94cb60efb1720ce65c, type: 3}
>>>>>>> 618344c (修改弹窗)
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -30973,10 +30964,10 @@ RectTransform: ...@@ -30973,10 +30964,10 @@ RectTransform:
m_Father: {fileID: 300181109} m_Father: {fileID: 300181109}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 30, y: -97.04} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30.720001} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1853878469 --- !u!114 &1853878469
MonoBehaviour: MonoBehaviour:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment