<確認severworkscene無衝突>
This commit is contained in:
parent
772eb1e738
commit
343acf39be
@ -6055,7 +6055,6 @@ MonoBehaviour:
|
|||||||
m_TargetGraphic: {fileID: 1887351187}
|
m_TargetGraphic: {fileID: 1887351187}
|
||||||
m_HandleRect: {fileID: 1887351186}
|
m_HandleRect: {fileID: 1887351186}
|
||||||
m_Direction: 2
|
m_Direction: 2
|
||||||
<<<<<<< HEAD
|
|
||||||
m_Value: 1.0000005
|
m_Value: 1.0000005
|
||||||
m_Size: 0.79486334
|
m_Size: 0.79486334
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
@ -13947,7 +13946,6 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 994591509}
|
m_GameObject: {fileID: 994591509}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
--- !u!1 &1005195137
|
--- !u!1 &1005195137
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user