merge
This commit is contained in:
@ -259,6 +259,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
navType: 1
|
||||
PointId: 0
|
||||
DeathAttr: 0
|
||||
EnemiesSeen: []
|
||||
--- !u!23 &140697607
|
||||
@ -353,6 +355,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
navType: 1
|
||||
PointId: 0
|
||||
DeathAttr: 0
|
||||
EnemiesSeen: []
|
||||
--- !u!23 &293522541
|
||||
@ -1315,6 +1319,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
navType: 1
|
||||
PointId: 0
|
||||
DeathAttr: 0
|
||||
EnemiesSeen: []
|
||||
--- !u!23 &1116745545
|
||||
@ -1477,7 +1483,7 @@ Mesh:
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: pb_Mesh17416
|
||||
m_Name: pb_Mesh16900
|
||||
serializedVersion: 10
|
||||
m_SubMeshes:
|
||||
- serializedVersion: 2
|
||||
@ -1763,6 +1769,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
navType: 1
|
||||
PointId: 0
|
||||
DeathAttr: 0
|
||||
EnemiesSeen: []
|
||||
--- !u!23 &1345085343
|
||||
@ -1857,6 +1865,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
navType: 1
|
||||
PointId: 0
|
||||
DeathAttr: 0
|
||||
EnemiesSeen: []
|
||||
--- !u!23 &1488699524
|
||||
@ -2077,6 +2087,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
navType: 1
|
||||
PointId: 0
|
||||
DeathAttr: 0
|
||||
EnemiesSeen: []
|
||||
--- !u!23 &1663305224
|
||||
@ -2141,6 +2153,7 @@ GameObject:
|
||||
- component: {fileID: 1858987090}
|
||||
- component: {fileID: 1858987088}
|
||||
- component: {fileID: 1858987085}
|
||||
- component: {fileID: 1858987091}
|
||||
m_Layer: 0
|
||||
m_Name: Game
|
||||
m_TagString: Untagged
|
||||
@ -2253,6 +2266,18 @@ MonoBehaviour:
|
||||
type: 3}
|
||||
PlayerPrefab: {fileID: 5245491127989480125, guid: 80f6c1c85e5daed4c96c70205ed5503d,
|
||||
type: 3}
|
||||
--- !u!114 &1858987091
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1858987083}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bf3fe86787bfb0c4b8751fe495148ede, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1871257865
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2506,6 +2531,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
navType: 1
|
||||
PointId: 0
|
||||
DeathAttr: 0
|
||||
EnemiesSeen: []
|
||||
--- !u!23 &2004854095
|
||||
|
Reference in New Issue
Block a user