浏览代码

Fix scene merge. Move navigation test scene to separate development folder

/main
Luke Stampfli 4 年前
当前提交
14291b01
共有 10 个文件被更改,包括 152 次插入16 次删除
  1. 107
      Assets/BossRoom/Scenes/Dungeon.unity
  2. 45
      Assets/BossRoom/Scenes/DungeonTest.unity
  3. 8
      Assets/Development.meta
  4. 8
      Assets/Development/TestScenes.meta
  5. 0
      /Assets/Development/TestScenes/NavigationTestScene.meta
  6. 0
      /Assets/Development/TestScenes/NavigationTestScene.unity
  7. 0
      /Assets/Development/TestScenes/NavigationTestScene.unity.meta
  8. 0
      /Assets/Development/TestScenes/NavigationTestScene

107
Assets/BossRoom/Scenes/Dungeon.unity


m_LocalScale: {x: 10, y: 10, z: 10}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &103703716 stripped
Transform:

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &199191745
GameObject:

m_Modifications:
- target: {fileID: 980503672824983762, guid: 505d01b585f419049b92a396558c8d67, type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 980503672824983762, guid: 505d01b585f419049b92a396558c8d67, type: 3}
propertyPath: m_LocalScale.x

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &448788463
GameObject:

- {fileID: 1089497985}
- {fileID: 1598481599}
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}

- {fileID: 142253045}
- {fileID: 2112080071}
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &963904324 stripped
MonoBehaviour:

objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b0489566a1e4d7f4cabaf8e679c8e7af, type: 3}
--- !u!1 &1249311508
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1585113465}
m_Layer: 0
m_Name: Recovery GameObject (1585113465)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1258893463 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 436948544709635169, guid: 8d1ea35b4a70549429b3228d550bade4, type: 3}

m_Father: {fileID: 72904660}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1392973038
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1392973042}
- component: {fileID: 1392973039}
m_Layer: 7
m_Name: Ground
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!64 &1392973039
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1392973038}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1392973042
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1392973038}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 50, y: 0, z: 0}
m_LocalScale: {x: 25, y: 25, z: 25}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1395906171 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3900959617648232227, guid: 05cf66f359bcc014cae696fb96b2961c, type: 3}

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1585113465
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1249311508}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
--- !u!4 &1585113465 stripped
--- !u!4 &1585113466 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 1585113463}

m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1585113465}
- {fileID: 1585113466}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1676300098
GameObject:

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1717751563
GameObject:

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 43.3, y: 97.58, z: -16.98}
--- !u!1 &1760350912 stripped
GameObject:

m_Children:
- {fileID: 6788928098831319867}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1902535930
MonoBehaviour:

objectReference: {fileID: 0}
- target: {fileID: 281597675721526861, guid: 69d1ba255a412e04681ac5eec03e3976, type: 3}
propertyPath: m_RootOrder
value: 10
value: 11
objectReference: {fileID: 0}
- target: {fileID: 281597675721526861, guid: 69d1ba255a412e04681ac5eec03e3976, type: 3}
propertyPath: m_LocalPosition.x

m_Modifications:
- target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3}
propertyPath: m_LocalPosition.x

objectReference: {fileID: 0}
- target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_RootOrder
value: 12
value: 13
objectReference: {fileID: 0}
- target: {fileID: 4076098699203836966, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_LocalPosition.x

objectReference: {fileID: 0}
- target: {fileID: 8717212070702918872, guid: 35b116509b5818c479c65d5a60b41987, type: 3}
propertyPath: m_RootOrder
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8717212070702918872, guid: 35b116509b5818c479c65d5a60b41987, type: 3}
propertyPath: m_LocalPosition.x

45
Assets/BossRoom/Scenes/DungeonTest.unity


m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &1848848150
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1848848152}
- component: {fileID: 1848848151}
m_Layer: 7
m_Name: Ground
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!64 &1848848151
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1848848150}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1848848152
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1848848150}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 50, y: 0, z: 0}
m_LocalScale: {x: 25, y: 25, z: 25}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 28
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1864468174
PrefabInstance:
m_ObjectHideFlags: 0

8
Assets/Development.meta


fileFormatVersion: 2
guid: 8dcc08a18e08bc642bdf90fe7c139703
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Development/TestScenes.meta


fileFormatVersion: 2
guid: b6a4aa9f319adbe49b39f9d154285973
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

/Assets/BossRoom/Scenes/NavigationTestScene.meta → /Assets/Development/TestScenes/NavigationTestScene.meta

/Assets/BossRoom/Scenes/NavigationTestScene.unity → /Assets/Development/TestScenes/NavigationTestScene.unity

/Assets/BossRoom/Scenes/NavigationTestScene.unity.meta → /Assets/Development/TestScenes/NavigationTestScene.unity.meta

/Assets/BossRoom/Scenes/NavigationTestScene → /Assets/Development/TestScenes/NavigationTestScene

正在加载...
取消
保存